From 4918b844bbe5b183907c8cfa0f9a3dabf8401352 Mon Sep 17 00:00:00 2001
From: indi <1334@shadowproject.net>
Date: Tue, 22 Jan 2013 18:20:04 +0100
Subject: [PATCH 0001/1587] add reqr to expand to require_relative

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 0500aaa13..b09148854 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -28,6 +28,8 @@ snippet beg
 
 snippet req require
 	require "${1}"${2}
+snippet reqr
+	require_relative "${1}"${2}
 snippet #
 	# =>
 snippet end

From c3ae804a82912e318f6c20281bd9b68c84a6bf63 Mon Sep 17 00:00:00 2001
From: Oliver Andrich <oliver.andrich@me.com>
Date: Sun, 27 Jan 2013 20:13:33 +0100
Subject: [PATCH 0002/1587] A more complete property snippet for python.

This snippet is inspired by the snippet provided by Sublime Text. The
current snippet in the upstream repository is missing at least two
lines:

    return locals()
$1 = property(**$1())
---
 snippets/python.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index dd2e8123d..508a51b0a 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -51,6 +51,10 @@ snippet property
 			${3:return self._$1}
 		def fset(self, value):
 			${4:self._$1 = value}
+		def fdel(self):
+			${5:del self._$1}
+		return locals()
+	$1 = property(**$1())
 # Ifs
 snippet if
 	if ${1:condition}:

From 2773a13c332035b2612616389c195c095e645243 Mon Sep 17 00:00:00 2001
From: Oliver Andrich <oliver.andrich@me.com>
Date: Sun, 27 Jan 2013 20:55:13 +0100
Subject: [PATCH 0003/1587] Added elif snippet to htmldjango.

---
 snippets/htmldjango.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/htmldjango.snippets b/snippets/htmldjango.snippets
index 38f836bf8..c19e8773a 100644
--- a/snippets/htmldjango.snippets
+++ b/snippets/htmldjango.snippets
@@ -50,6 +50,9 @@ snippet if
 snippet else
 	{% else %}
 		${1}
+snippet elif
+	{% elif ${1} %}
+		${2}
 snippet ifchanged
 	{% ifchanged %}${1}{% endifchanged %}
 snippet ifequal

From 664c3dd6840c26c8469a36f4e4db933fe4db0e6c Mon Sep 17 00:00:00 2001
From: Josh Matthews <jmatth@nbcs.rutgers.edu>
Date: Mon, 28 Jan 2013 19:36:36 -0500
Subject: [PATCH 0004/1587] Fixing numbering in html snippets.

---
 snippets/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 0f75efd08..d547f1a54 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -556,7 +556,7 @@ snippet link
 snippet link:atom
 	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml" />${2}
 snippet link:css
-	<link rel="stylesheet" href="${2:style.css}" type="text/css" media="${3:all}" />${4}
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />${3}
 snippet link:favicon
 	<link rel="shortcut icon" href="${1:favicon.ico}" type="image/x-icon" />${2}
 snippet link:rss

From 576063eb676d8c75e35f37971ca9affc821121bf Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Tue, 5 Feb 2013 10:02:29 -0300
Subject: [PATCH 0005/1587] Add more rspec snippets.

---
 snippets/ruby.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 0500aaa13..a93b23958 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -910,6 +910,8 @@ snippet it
 snippet itp
 	it "${1:spec_name}"
 	${2}
+snippet its
+	its(:${1:method}) { should ${2} }
 snippet desc
 	describe ${1:class_name} do
 		${2}
@@ -926,3 +928,9 @@ snippet aft
 	after :${1:each} do
 		${2}
 	end
+snippet let
+	let(:${1:method}) { ${2} }
+snippet subj
+	subject { ${1} }
+snippet spec
+	specify { subject.${1} }

From d2337af7bbd954bf09ea85a545d6b86d85a0e955 Mon Sep 17 00:00:00 2001
From: Oliver Andrich <oliver.andrich@me.com>
Date: Tue, 5 Feb 2013 21:57:41 +0100
Subject: [PATCH 0006/1587] =?UTF-8?q?Fixed=20the=20{%=20with=20%}=C2=A0tem?=
 =?UTF-8?q?plate=20tag=20from=20htmldjango.snippets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snippets/htmldjango.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/htmldjango.snippets b/snippets/htmldjango.snippets
index c19e8773a..09cf98ecb 100644
--- a/snippets/htmldjango.snippets
+++ b/snippets/htmldjango.snippets
@@ -83,6 +83,8 @@ snippet widthratio
 	{% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
 snippet with
 	{% with ${1} as ${2} %}
+		${3}
+	{% endwith %}
 
 # Template Filters
 

From cd8f5e19c48ee94ff0a44163aea9073927445cda Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 7 Feb 2013 12:56:54 +0100
Subject: [PATCH 0007/1587] document renaming of branch

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a242eca19..c1cc3a64a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ However today there are at least 3 plugins which can make use of this snippet re
 2) [Shougo's neosnippet][5] has a compatible mode allowing
   to reuse most snippets.
 
-3) [ultisnip][6] (experimental, mind the branch snipmate-merge)
+3) [ultisnip][6] (stable enough to be used, branch master previously snipmate-merge)
   This code is subject to change. Take it as preview. That branch
   has additional notes for Snipmate users. at the bottom.
   In the long run ultisnip will have its own set of snippets, because it is

From 4036a5339ba9c13a19fb98576de06f65e6e03273 Mon Sep 17 00:00:00 2001
From: Andreas Krennmair <ak@synflood.at>
Date: Fri, 8 Feb 2013 20:21:40 +0100
Subject: [PATCH 0008/1587] go: type os.Error became built-in type error after
 go r60.

---
 snippets/go.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 0e4fe61d0..372fb57e9 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -126,12 +126,12 @@ snippet fr
 	}
 # function simple 
 snippet fun
-	func ${1:funcName}(${2}) ${3:os.Error} {
+	func ${1:funcName}(${2}) ${3:error} {
 		${4:/* code */}
 	}
 # function on receiver 
 snippet fum
-	func (self ${1:type}) ${2:funcName}(${3}) ${4:os.Error} {
+	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
 		${5:/* code */}
 	}
 # make

From dfcb7ce519d11d1d46c943dcf17f1d169c7ce088 Mon Sep 17 00:00:00 2001
From: Fatih Arslan <ftharsln@gmail.com>
Date: Tue, 12 Feb 2013 01:12:58 -0800
Subject: [PATCH 0009/1587] Fix go functions

---
 snippets/go.snippets | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 372fb57e9..e737da6f0 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -67,7 +67,7 @@ snippet i
 snippet im
 	import (
 		"${1:package}" 
-	)
+	)${2}
 # interface 
 snippet in
 	interface{}
@@ -80,12 +80,12 @@ snippet inf
 snippet if
 	if ${1:/* condition */} {
 		${2:/* code */}
-	}
+	}${2}
 # else snippet
 snippet el
 	else {
 		${1}
-	}
+	}${2}
 # error snippet
 snippet ir
 	if err != nil {
@@ -114,21 +114,25 @@ snippet ie
 	} else {
 		${3}
 	}
+	${4}
 # for loop
 snippet fo
 	for ${2:i} = 0; $2 < ${1:count}; $2${3:++} {
 		${4:/* code */}
 	}
+	${5}
 # for range loop
 snippet fr
 	for ${1:k}, ${2:v} := range ${3} {
 		${4:/* code */}
 	}
+	${5}
 # function simple 
 snippet fun
 	func ${1:funcName}(${2}) ${3:error} {
 		${4:/* code */}
 	}
+	${5}
 # function on receiver 
 snippet fum
 	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
@@ -145,6 +149,7 @@ snippet main
 	func main() {
 		${1:/* code */}
 	}
+	${2}
 # new
 snippet nw
 	new(${1:type})
@@ -180,7 +185,8 @@ snippet sr
 snippet st
 	struct ${1:name} {
 		${2:/* data */}
-	}${4}
+	}
+	${3}
 # switch 
 snippet sw
 	switch ${1:var} {

From 4c6cc10d54c474d9f3830ef54851400804a3d619 Mon Sep 17 00:00:00 2001
From: Fatih Arslan <ftharsln@gmail.com>
Date: Tue, 12 Feb 2013 01:23:36 -0800
Subject: [PATCH 0010/1587] Add log.Printf and Println to go snippets with
 fixes

---
 snippets/go.snippets | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index e737da6f0..d02aa8fdf 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -138,6 +138,13 @@ snippet fum
 	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
 		${5:/* code */}
 	}
+	${6}
+# log printf
+snippet lf
+	log.Printf("%${1:s}", ${2:var})${3}
+# log printf
+snippet lp
+	log.Println("${1}")${2}
 # make
 snippet mk
 	make(${1:[]string}, ${2:0})
@@ -158,7 +165,7 @@ snippet pn
 	panic("${1:msg}")
 # print
 snippet pr
-	fmt.Printf("${1:%s}\n", ${2:var})${3}
+	fmt.Printf("%${1:s}\n", ${2:var})${3}
 # range 
 snippet rn
 	range ${1}
@@ -198,7 +205,7 @@ snippet sw
 		${6:/* code */}
 	}
 snippet sp
-	fmt.Sprintf("${1:%s}", ${2:var})${3}
+	fmt.Sprintf("%${1:s}", ${2:var})${3}
 # true 
 snippet t
 	true

From 74e132730243d93e3c07434f0e063898e8571463 Mon Sep 17 00:00:00 2001
From: indi <1334@shadowproject.net>
Date: Wed, 13 Feb 2013 19:54:08 +0100
Subject: [PATCH 0011/1587] fixed quotes in time tag snippet

---
 snippets/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index d547f1a54..cfc44ad1d 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -789,7 +789,7 @@ snippet thead
 		${1}
 	</thead>
 snippet time
-	<time datetime="${1}" pubdate="${2:$1}>${3:$1}</time>
+	<time datetime="${1}" pubdate="${2:$1}">${3:$1}</time>
 snippet title
 	<title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 snippet tr

From 6c4c7f51d79f5c3fde6153dfdad25461981ad8eb Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Mon, 18 Feb 2013 10:09:55 -0300
Subject: [PATCH 0012/1587] Add snippets to rspec shared examples and new rspec
 syntax.

---
 snippets/ruby.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index a93b23958..2647d62ed 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -934,3 +934,13 @@ snippet subj
 	subject { ${1} }
 snippet spec
 	specify { subject.${1} }
+snippet exp
+	expect(${1:object}).to ${2}
+snippet bt
+	be_true
+snippet bf
+	be_false
+snippet shared
+	shared_examples "${1:shared examples name}" ${2}
+snippet itb
+	it_behaves_like "${1:shared examples name}"${2}

From 3ef38996f4582a709ca3f8110f2fb53d6e96581e Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Mon, 18 Feb 2013 10:25:25 -0300
Subject: [PATCH 0013/1587] Import scala snippets created by @gorodok with some
 alterations.

---
 snippets/scala.snippets | 349 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 349 insertions(+)
 create mode 100644 snippets/scala.snippets

diff --git a/snippets/scala.snippets b/snippets/scala.snippets
new file mode 100644
index 000000000..c342228a2
--- /dev/null
+++ b/snippets/scala.snippets
@@ -0,0 +1,349 @@
+################################################################
+# © Copyright 2011 Konstantin Gorodinskiy. All Rights Reserved.#
+# Do What The Fuck You Want To Public License, Version 2.      #
+# See http://sam.zoy.org/wtfpl/COPYING for more details.       #
+################################################################
+# Scala lang
+#if
+snippet if
+	if(${1:obj}) {
+		${2:/* code */}
+	}
+#if not
+snippet ifn
+	if(!${1:obj}) {
+		${2:/* code */}
+	}
+#if-else
+snippet ifel
+	if(${1:obj}) {
+		${2:/* code */}
+	} else {
+		${3:/* code */}
+	}
+#if-else-if
+snippet ifelif
+	if(${1:obj}) {
+		${2:/* code */}
+	} else if(${3:obj}) {
+		${4:/* code */}
+	}
+#while loop
+snippet while
+	while (${1:obj}) {
+		${2:/* code */}
+	}
+#for loop(classic)
+snippet for
+	for (${1:item} <- ${2:obj}) {
+		${3:/* code */}
+	}
+#for loop(indexed)
+snippet fori
+	for (${1:i} <- ${2:0} to ${3:obj}.length) {
+		${4:/* code */}
+	}
+#exceptions
+snippet try
+	try {
+		${1:/* code */}
+	} catch {
+		case e: FileNotFoundException => ${2:/* code */}
+		case e: IOException => ${3:/* code */}
+	} finally {
+		${4:/* code */}
+	}
+#match
+snippet match
+	${1: obj} match {
+		case ${2:e} => ${3:/* code */}
+		case _ => ${4:/* code */}
+	}
+#case
+snippet case
+	case ${1:value} => ${2:/* code */}
+############################
+# methods and arguments
+#
+#arg
+snippet arg
+	${1:a}: ${2:T}${3:, arg}
+#args
+snippet args
+	${1:args}: ${2:T}*
+#def
+snippet def
+	def ${1:name}(${2:arg}) = ${3:}
+#private def
+snippet prdef
+	private def ${1:name}(${2:arg}) = ${3:}
+#override def
+snippet ovdef
+	override def ${1:name}(${2:arg}) = ${3:}
+#first class function(see scalabook p 188)
+snippet fcf
+	(${1:a}: ${2:T}) => $1 ${3:/* code */}
+snippet =>
+	${1:name} => ${2:/* code */}
+#recursion
+snippet rec
+	def ${1:name}(${2:arg}) =
+		if($2) $2
+		else $1($2)
+#curried method
+snippet crdef
+	def ${1:name}(${2:arg})(${3:arg}) = ${4:}
+#main method
+#check validity of T
+snippet main
+	def main(args: Array[String]):${1:T} = ${2:}
+############################
+# basic types(general purpose)
+# you might want to use basic types snippets
+
+#1
+snippet T Double
+	dbl
+#2
+snippet T Int
+	int
+#3
+snippet T Long
+	lng
+#4
+snippet T Char
+	chr
+#5
+snippet T String
+	str
+#6
+snippet T Array
+	arr
+#7
+snippet T Buffer
+	buf
+#8
+snippet T List
+	list
+#9
+snippet T Tuple
+	tpl
+#10
+snippet T Set
+	set
+#11
+snippet T Map
+	map
+#12
+snippet T HashSet
+	hset
+#13
+snippet T HashMap
+	hmap
+#14
+snippet T Boolean
+	bool
+#end
+
+#named snippets for types
+snippet bool
+	Boolean
+snippet anyr
+	AnyRef
+snippet dbl
+	Double
+snippet int
+	Int
+snippet str
+	String
+snippet chr
+	Char
+snippet lng
+	Long
+snippet arr
+	Array${1:[T]}${2:()}
+snippet buf
+	Buffer${1:[T]}${2:()}
+snippet list
+	List${1:[T]}${2:()}
+snippet tpl
+	Tuple${1:2}[${2:T},${3:T}]
+snippet set
+	Set${1:[T]}${2:()}
+snippet hset
+	HashSet${1:[T]}${2:()}
+snippet mhset
+	mutable.HashSet${1:[T]}${2:()}
+#for maps
+snippet keyval
+	${1:key}->${2:val}${3:, keyval}
+snippet map
+	Map[${1:T},${2:T}]${3:(keyval)}
+snippet hmap
+	HashMap[${1:T},${2:T}]${3:(keyval)}
+snippet mmap
+	mutable.Map[${1:T},${2:T}]${3:(keyval)}
+snippet mhmap
+	mutable.HashMap[${1:T},${2:T}]${3:(keyval)}
+#TODO add TreeMap and TreeSet
+#asInstanceOf[]
+snippet as
+	${1:name}.asInstanceOf[${2:T}]
+#isInstanceOf[]
+	${1:name}.isInstanceOf[${2:T}]
+#end
+#collections methods
+
+#scope() with one arg
+snippet (a
+	(${1:a} => ${2:/* code */})
+#scope() with two args
+snippet {(
+	{(${1:a},${2:b}) =>
+		${3:/* code */}
+	}
+#filter
+snippet filter
+	${1:name}.filter (a
+#map function
+snippet mapf
+	${1:name}.map (a
+#flatmap
+snippet flatmap
+	${1:name}.flatMap${2:[T]}(a
+#fold left
+snippet fldl
+	${1:name}.foldLeft(${2:first}) {(
+#fold right
+snippet fldr
+	${1:name}.foldRight(${2:first}) {(
+#fold left operator(if u wanna reduce readability of ur code)
+#use wildcard symbols
+snippet /:
+	(${1:first}/:${2:name})(${3:/* code */})
+#fold right operator
+snippet :\
+	(${1:first}:\${2:name})(${3:/* code */})
+#reduce left
+snippet redl
+	${1:name}.reduceLeft[${2:T}] {(
+#reduce right
+snippet redr
+	${1:name}.reduceRight[${2:T}] {(
+#zipWithIndex(safe way).
+#see http://daily-scala.blogspot.com/2010/05/zipwithindex.html
+snippet zipwi
+	${1:name}.view.zipWithIndex
+#split
+snippet spl
+	${1:name}.split("${2:,}")
+#end
+snippet val
+	val ${1:name}${2:: T} = ${3:value}
+snippet var
+	var ${1:name}${2:: T} = ${3:value}
+############################
+# classes
+#
+#extends
+snippet extends
+	extends ${1:what}
+#with
+snippet with
+	with ${1:what}${2: with}
+#auxiliary constructor(a. this)
+snippet athis
+	def this(arg) = this(arg)
+#abstract class
+snippet abstract
+	abstract class ${1:name}${2:(arg)}${3: extends }${4: with} {
+		${5:override def toString = "$1"}
+		${6:/* code */}
+	}
+#class
+snippet class
+	class ${1:name}${2:(arg)}${3: extends }${4: with} {
+		${5:override def toString = "$1"}
+		${6:/* code */}
+	}
+#object
+snippet object
+	object ${1:name}${2:(arg)}${3: extends }${4: with} ${5:}
+#trait
+snippet trait
+	trait ${1:name}${2: extends }${3: with} {
+		${4:}
+	}
+#class with trait Ordered(page 265)
+snippet ordered
+	class ${1:name}${2:(arg)} extends Ordered[$1] ${3: with} {
+		${4:override def toString = "$1"}
+		def compare(that: $1) = ${5:this - that}
+		${6:/* code */}
+	}
+#case class
+snippet casecl
+	case class ${1:name}${2:(arg)}${3: extends }${4: with} ${5:}
+############################
+# testing
+#
+#scalatest imports
+snippet scalatest
+	${1:import org.scalatest.Suite}
+	${2:import org.scalatest.FunSuite}
+#assert
+snippet assert
+	assert(${1:a}==${2:b})
+#ensuring(p 296)
+snippet ensuring
+	ifel ensuring(${1:a}==${2:b})
+#expect
+snippet expect
+	expect(${1:what}) {
+#intercept
+snippet intercept
+	intercept[${1:IllegalArgumentException}] {
+#test
+snippet test
+	test("${1:description}") {
+#suite
+snippet suite
+	class ${1:name} extends Suite {
+		def test() {
+	}
+#funsuite
+snippet fsuite
+	class ${1:name} extends FunSuite {
+		test("${2:description}") {
+	}
+############################
+# SBT
+#
+snippet webproject
+	import sbt._
+
+	class ${1:Name}(info: ProjectInfo) extends DefaultWebProject(info) {
+		val liftVersion = "${2:2.3}"
+
+		override def libraryDependencies = Set(
+
+		) ++ super.libraryDependencies
+
+		val snapshots = ScalaToolsSnapshots
+	}
+#depencies
+snippet liftjar
+	"net.liftweb" %% "${1:lib}" % liftVersion % "compile->default",
+snippet jettyjar
+	"org.mortbay.jetty" % "jetty" % "${1:version}" % "test->default",
+############################
+# Lift
+#
+#lift imports
+snippet liftimports
+	import _root_.net.liftweb.http._
+	import S._
+	import _root_.net.liftweb.util._
+	import Helpers._
+	import _root_.scala.xml._
+#TODO LIFT,SBT,WEB.XML,HTML snippets

From 6e58f722f3770777b8303bc284ad5c0d88bc096c Mon Sep 17 00:00:00 2001
From: Eustaquio Rangel <taq@eustaquiorangel.com>
Date: Mon, 25 Feb 2013 09:07:04 -0300
Subject: [PATCH 0014/1587] Fixed Ruby rSpec be_true and be_false

---
 snippets/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 2647d62ed..0365ec222 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -936,9 +936,9 @@ snippet spec
 	specify { subject.${1} }
 snippet exp
 	expect(${1:object}).to ${2}
-snippet bt
+snippet btr
 	be_true
-snippet bf
+snippet bfa
 	be_false
 snippet shared
 	shared_examples "${1:shared examples name}" ${2}

From 63551117aac15a93e7b32b31b096484b0ed59cf2 Mon Sep 17 00:00:00 2001
From: Mike Foley <mike@signaturelabsinc.com>
Date: Tue, 26 Feb 2013 15:51:09 -0800
Subject: [PATCH 0015/1587] added each_with_object Ruby snippets

---
 snippets/ruby.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 0365ec222..879677ca6 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -289,6 +289,12 @@ snippet eawid
 	each_with_index do |${1:e},${2:i}|
 		${3}
 	end
+snippet eawo
+	each_with_object(${1:init}) { |${2:e}, ${3:var}| ${4} }
+snippet eawod
+	each_with_object(${1:init}) do |${2:e}, ${3:var}|
+		${4}
+	end
 snippet reve
 	reverse_each { |${1:e}| ${2} }
 snippet reved

From 0ccc49e39d813829d5b5d84d237bbed05e620024 Mon Sep 17 00:00:00 2001
From: Mike Foley <mike@signaturelabsinc.com>
Date: Tue, 26 Feb 2013 15:51:33 -0800
Subject: [PATCH 0016/1587] added a space to each_with_index Ruby snippet, to
 be consistent with similar snippets

---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 879677ca6..8805430a8 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -286,7 +286,7 @@ snippet eavd
 snippet eawi
 	each_with_index { |${1:e}, ${2:i}| ${3} }
 snippet eawid
-	each_with_index do |${1:e},${2:i}|
+	each_with_index do |${1:e}, ${2:i}|
 		${3}
 	end
 snippet eawo

From 0fbb89d9086ef3b831d8d6f3b238ad19893f543a Mon Sep 17 00:00:00 2001
From: Mike Foley <mike@signaturelabsinc.com>
Date: Fri, 1 Mar 2013 14:48:50 -0800
Subject: [PATCH 0017/1587] added delegate to ruby.snippets

---
 snippets/ruby.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 8805430a8..ccb3968ac 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -660,6 +660,10 @@ snippet defupdate
 			end
 		end
 	end${3}
+snippet dele delegate .. to
+	delegate :${1:methods}, :to => :${2:object}
+snippet dele delegate .. to .. prefix .. allow_nil
+	delegate :${1:methods}, :to => :${2:object}, :prefix => :${3:prefix}, :allow_nil => ${4:allow_nil}
 snippet flash
 	flash[:${1:notice}] = "${2}"
 snippet habtm

From d8b43c12e8d45fa9475a7eba3f9b5b1ad20653dd Mon Sep 17 00:00:00 2001
From: Gui Lin <guileen@gmail.com>
Date: Wed, 6 Mar 2013 12:15:11 +0800
Subject: [PATCH 0018/1587] improve for loop

---
 snippets/javascript.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index de50a0cf0..edbb87894 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -52,13 +52,13 @@ snippet case
 	${3}
 # for (...) {...}
 snippet for
-	for (var ${2:i} = 0; $2 < ${1:Things}.length; $2${3: += 1}) {
-		${4:$1[$2]}
+	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
+		var ${3:v} = $1[$2];${4:}
 	}
 # for (...) {...} (Improved Native For-Loop)
 snippet forr
-	for (var ${2:i} = ${1:Things}.length - 1; $2 >= 0; $2${3: -= 1}) {
-		${4:$1[$2]}
+	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2 --) {
+		var ${3:v} = $1[$2];${4:}
 	}
 # while (...) {...}
 snippet wh

From 4ce177eadd5596503c1c647fd84d1b5d654de6d8 Mon Sep 17 00:00:00 2001
From: mwcz <mwc@clayto.com>
Date: Thu, 14 Mar 2013 14:38:03 -0300
Subject: [PATCH 0019/1587] add semicolon to self-defining function (sdf)

---
 snippets/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index 9a98add4d..141f933a7 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -129,7 +129,7 @@ snippet sdf
 		$1 = function ($2) {
 			${4:// main code}
 		};
-	}
+	};
 # singleton
 snippet sing
 	function ${1:Singleton} (${2:argument}) {

From c85575e50d366f41d130c740159dd737f35f5a49 Mon Sep 17 00:00:00 2001
From: mwcz <mwc@clayto.com>
Date: Thu, 14 Mar 2013 15:13:36 -0300
Subject: [PATCH 0020/1587] add a snippet for Crockford's object() function

---
 snippets/javascript.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index 141f933a7..cf543e8ac 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -154,3 +154,10 @@ snippet sing
 
 		return instance;
 	}
+# Crockford's object function 
+snippet obj
+	object(o) {
+		function F() {}
+		F.prototype = o;
+		return new F();
+	}

From 91f24bd88b9aaf040eeea78024e1e2d786219a2b Mon Sep 17 00:00:00 2001
From: mwcz <mwc@clayto.com>
Date: Fri, 15 Mar 2013 14:53:35 -0300
Subject: [PATCH 0021/1587] fix javascript `object` function snippet

---
 snippets/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index cf543e8ac..2901587f0 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -156,7 +156,7 @@ snippet sing
 	}
 # Crockford's object function 
 snippet obj
-	object(o) {
+	function object(o) {
 		function F() {}
 		F.prototype = o;
 		return new F();

From d07009f27f22d39e1e12eee0b56fe6ce0d8144c2 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 17 Mar 2013 20:13:47 +0100
Subject: [PATCH 0022/1587] Adding UltiSnips snippets, updating Readme

UltiSnips snippets are taken from UltiSnips repo.
Putting them nearby the engine seems to be the wrong thing to do.
One reason is that there are two forks now.
---
 AUTHORS                               |   3 +
 README.md                             |  70 +-
 UltiSnips/README                      |  21 +
 UltiSnips/all.snippets                | 112 ++++
 UltiSnips/bindzone.snippets           |  27 +
 UltiSnips/c.snippets                  | 117 ++++
 UltiSnips/coffee.snippets             |  90 +++
 UltiSnips/coffee_jasmine.snippets     | 163 +++++
 UltiSnips/cpp.snippets                |  52 ++
 UltiSnips/css.snippets                | 405 ++++++++++++
 UltiSnips/d.snippets                  | 583 +++++++++++++++++
 UltiSnips/django.snippets             | 236 +++++++
 UltiSnips/erlang.snippets             |  98 +++
 UltiSnips/eruby.snippets              | 279 ++++++++
 UltiSnips/go.snippets                 | 107 +++
 UltiSnips/haskell.snippets            |  61 ++
 UltiSnips/help.snippets               |  30 +
 UltiSnips/html.snippets               | 297 +++++++++
 UltiSnips/htmldjango.snippets         |   1 +
 UltiSnips/java.snippets               | 212 ++++++
 UltiSnips/javascript.snippets         |  65 ++
 UltiSnips/javascript_jasmine.snippets | 168 +++++
 UltiSnips/jinja2.snippets             | 209 ++++++
 UltiSnips/json.snippets               |  19 +
 UltiSnips/lua.snippets                |  37 ++
 UltiSnips/mako.snippets               |  90 +++
 UltiSnips/markdown.snippets           |  44 ++
 UltiSnips/objc.snippets               | 270 ++++++++
 UltiSnips/perl.snippets               | 127 ++++
 UltiSnips/php.snippets                | 258 ++++++++
 UltiSnips/puppet.snippets             |  78 +++
 UltiSnips/python.snippets             | 468 +++++++++++++
 UltiSnips/rails.snippets              | 906 ++++++++++++++++++++++++++
 UltiSnips/rst.snippets                |  61 ++
 UltiSnips/ruby.snippets               | 568 ++++++++++++++++
 UltiSnips/sh.snippets                 |  88 +++
 UltiSnips/snippets.snippets           |  23 +
 UltiSnips/tcl.snippets                |  50 ++
 UltiSnips/tex.snippets                | 125 ++++
 UltiSnips/texmath.snippets            |  54 ++
 UltiSnips/vim.snippets                |  58 ++
 UltiSnips/xhtml.snippets              |   1 +
 UltiSnips/zsh.snippets                |  13 +
 43 files changed, 6727 insertions(+), 17 deletions(-)
 create mode 100644 UltiSnips/README
 create mode 100644 UltiSnips/all.snippets
 create mode 100644 UltiSnips/bindzone.snippets
 create mode 100644 UltiSnips/c.snippets
 create mode 100644 UltiSnips/coffee.snippets
 create mode 100644 UltiSnips/coffee_jasmine.snippets
 create mode 100644 UltiSnips/cpp.snippets
 create mode 100644 UltiSnips/css.snippets
 create mode 100644 UltiSnips/d.snippets
 create mode 100644 UltiSnips/django.snippets
 create mode 100644 UltiSnips/erlang.snippets
 create mode 100644 UltiSnips/eruby.snippets
 create mode 100644 UltiSnips/go.snippets
 create mode 100644 UltiSnips/haskell.snippets
 create mode 100644 UltiSnips/help.snippets
 create mode 100644 UltiSnips/html.snippets
 create mode 100644 UltiSnips/htmldjango.snippets
 create mode 100644 UltiSnips/java.snippets
 create mode 100644 UltiSnips/javascript.snippets
 create mode 100644 UltiSnips/javascript_jasmine.snippets
 create mode 100644 UltiSnips/jinja2.snippets
 create mode 100644 UltiSnips/json.snippets
 create mode 100644 UltiSnips/lua.snippets
 create mode 100644 UltiSnips/mako.snippets
 create mode 100644 UltiSnips/markdown.snippets
 create mode 100644 UltiSnips/objc.snippets
 create mode 100644 UltiSnips/perl.snippets
 create mode 100644 UltiSnips/php.snippets
 create mode 100644 UltiSnips/puppet.snippets
 create mode 100644 UltiSnips/python.snippets
 create mode 100644 UltiSnips/rails.snippets
 create mode 100644 UltiSnips/rst.snippets
 create mode 100644 UltiSnips/ruby.snippets
 create mode 100644 UltiSnips/sh.snippets
 create mode 100644 UltiSnips/snippets.snippets
 create mode 100644 UltiSnips/tcl.snippets
 create mode 100644 UltiSnips/tex.snippets
 create mode 100644 UltiSnips/texmath.snippets
 create mode 100644 UltiSnips/vim.snippets
 create mode 100644 UltiSnips/xhtml.snippets
 create mode 100644 UltiSnips/zsh.snippets

diff --git a/AUTHORS b/AUTHORS
index 1261dc82d..22a322905 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,3 +38,6 @@ Dmitry Dementev
 Travis Holton
 Chrisyue
 Erik Westrup
+
+TODO: add contributors from github.com/SirVer/Ultisnip having contributed to
+github.com/SirVer/Ultisnip/UltiSnips/* files
diff --git a/README.md b/README.md
index c1cc3a64a..395dcc95d 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,57 @@
 IMPORTANT: comment on: [What about merging whith Ultisnip using its engine](https://github.com/garbas/vim-snipmate/issues/114)
 
-Snipmate Snippets
-=================
+Snipmate & UltiSnip Snippets
+============================
 
 This repository contains snippets files for various programming languages.
 
-It was originally written for the the famous [snipMate][1] plugin for vim.
-However today there are at least 3 plugins which can make use of this snippet repository:
+It is community-maintained and many people have contributed snippet files and other
+improvements already.
 
-1) [snipMate][1]
+Contents
+========
 
-2) [Shougo's neosnippet][5] has a compatible mode allowing
-  to reuse most snippets.
+    snippets/*: snippets using snipmate format
+    UltiSnips/*: snippets using UltiSnips format
 
-3) [ultisnip][6] (stable enough to be used, branch master previously snipmate-merge)
-  This code is subject to change. Take it as preview. That branch
-  has additional notes for Snipmate users. at the bottom.
-  In the long run ultisnip will have its own set of snippets, because it is
-  more powerful cause it supports nested snippets.
+Snippet engines
+===============
 
+There are different forks of snippet engines which allow the user to insert
+sippets by typing the name of a snippet hitting the expansion mapping.
 
+    garbas/vim-snipmate [4]:
+      VimL, snipmate-snippets, engine sometimes behaves strange, supports
+      rewriting snippets on the fly (eg adding a second version with folding
+      markers)
 
-It is community-maintained and many people have contributed snippet files and other
-improvements already. Not sure whether it implements all features such as
-guards - does anybody know?
+    MarcWeber/UltiSnips [6]:
+      python, snipmate-snippets and UltiSnips-snippets
+
+    SirVer/ultisnips [7]:
+      python, UltiSnips-snippets
+
+    github.com/Shougo/neosnippet [5]:
+      viml, has a compatible mode allowing to reuse most snipmate snippets ?
+
+    XPTemplate:
+      totally different syntax, does not read snippets contained in this file,
+      but it is also very powerful
+
+    ... there are some more, but they have less features which is why I don't
+    mention them here
+
+UltiSnips engine has additional features such as "nested snippets".
+
+Which one to use? If you have python give MarcWeber/UltiSnips a try because its
+fast and supports all important features. You can prefer the UltiSnip versions
+of the snippets by setting the "always_use_first_snippet" option to 1.
+
+If you have VimL only (vim without python support) your best option is using
+garbas/vim-snipmate and cope with the minor bugs found in the engine.
+
+Historical notes
+================
 
 [vim-snipmate][1] was originally started by [Michael Sanders][2] who has now
 unfortunately abandoned the project. [Rok Garbas][3] is now maintaining a
@@ -50,6 +78,13 @@ Until further work is done on `vim-snipmate`, please don't add folding markers
 into snippets. `vim-snipmate` has some comments about how to patch all snippets
 on the fly adding those.
 
+Because MarcWeber/UltiSnips [6] supports also snipmate-snippets there is no
+need to duplicate all snippets - only those snippets who use advanced UltiSnips
+features should be duplicated in UltiSnips (?)
+
+Currently all snippets from UltiSnips have been put into UltiSnips - some work
+on merging should be done (dropping duplicates etc)
+
 Authors
 -------
 
@@ -66,5 +101,6 @@ terms of the MIT license.
 [2]: http://github.com/msanders
 [3]: http://github.com/garbas
 [4]: http://github.com/garbas/vim-snipmate
-[5]: https://github.com/Shougo/neosnippet
-[6]: https://github.com/MarcWeber/UltiSnips/tree/snipmate-merge
+[5]: http://github.com/Shougo/neosnippet
+[6]: http://github.com/MarcWeber/UltiSnips
+[7]: http://github.com/SirVer/ultisnips
diff --git a/UltiSnips/README b/UltiSnips/README
new file mode 100644
index 000000000..eafd0866b
--- /dev/null
+++ b/UltiSnips/README
@@ -0,0 +1,21 @@
+This directory contains the main scripts that come bundled with UltiSnips.
+
+Standing On The Shoulders of Giants
+===================================
+
+The snippets have been collected from various other project which I want to
+express my gratitude for. My main source for inspiration where the following
+two projects:
+
+   TextMate: http://svn.textmate.org/trunk/Bundles/
+   SnipMate: http://code.google.com/p/snipmate/
+
+All snippets from those sources were copied and cleaned up, so that they are 
+  - not using shell script, only python (so they are cross platform compatible)
+  - not using any feature that UltiSnips doesn't offer
+
+UltiSnips has seen contributions by various individuals. Those contributions
+have been merged into this collection seamlessly and without further comments.
+
+-- vim:ft=rst:nospell:
+
diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
new file mode 100644
index 000000000..8844e2813
--- /dev/null
+++ b/UltiSnips/all.snippets
@@ -0,0 +1,112 @@
+# This file contains snippets that are always defined. I personally
+# have snippets for signatures and often needed texts
+
+##############
+# NICE BOXES #
+##############
+global !p
+import string, vim
+
+""" Maps a filetype to comment format used for boxes.
+Automatically filled during usage"""
+_commentDict = { }
+
+def _parse_comments(s):
+    """ Parses vim's comments option to extract comment format """
+    i = iter(s.split(","))
+
+    rv = []
+    try:
+        while True:
+            # get the flags and text of a comment part
+            flags,text = i.next().split(':', 1)
+
+            if len(flags) == 0:
+                if len(text) == 1:
+                    rv.append((text,text,text, ""))
+            # parse 3-part comment, but ignore those with O flag
+            elif flags[0] == 's' and 'O' not in flags:
+                ctriple = []
+                indent = ""
+
+                if flags[-1] in string.digits:
+                    indent = " " * int(flags[-1])
+                ctriple.append(text)
+
+                flags,text = i.next().split(':', 1)
+                assert(flags[0] == 'm')
+                ctriple.append(text)
+
+                flags,text = i.next().split(':', 1)
+                assert(flags[0] == 'e')
+                ctriple.append(text)
+                ctriple.append(indent)
+
+                rv.append(ctriple)
+
+            elif flags[0] == 'b':
+                if len(text) == 1:
+                    rv.insert(0, (text,text,text, ""))
+
+    except StopIteration:
+       return rv
+
+def _get_comment_format():
+    """ Returns a 4-element tuple representing the comment format for
+    the current file. """
+
+    ft = vim.eval("&filetype")
+    # check if the comment dict has the format for the current file
+    if _commentDict.has_key(ft):
+        return _commentDict[ft]
+
+    # otherwise parse vim's comments and add it for later use
+    commentformat = _parse_comments(vim.eval("&comments"))[0]
+    _commentDict[ft] = commentformat
+
+    return commentformat
+
+
+def make_box(twidth, bwidth = None):
+   if bwidth is None:
+      bwidth = twidth + 2
+   b,m,e,i = _get_comment_format()
+   sline = b + m + bwidth*m + 2*m
+   nspaces = (bwidth - twidth)//2 
+   mlines = i + m + " " + " "*nspaces
+   mlinee = " " + " "*(bwidth-twidth-nspaces) + m
+   eline = i + 2*m + bwidth*m + m + e
+   return sline, mlines, mlinee, eline
+endglobal
+
+snippet box "A nice box with the current comment symbol" b
+`!p
+box = make_box(len(t[1]))
+snip.rv = box[0] + '\n' + box[1]
+`${1:content}`!p
+box = make_box(len(t[1]))
+snip.rv = box[2] + '\n' + box[3]`
+$0
+endsnippet
+
+snippet bbox "A nice box over the full width" b
+`!p
+box = make_box(len(t[1]), 71)
+snip.rv = box[0] + '\n' + box[1]
+`${1:content}`!p
+box = make_box(len(t[1]), 71)
+snip.rv = box[2] + '\n' + box[3]`
+$0
+endsnippet
+
+##########################
+# LOREM IPSUM GENERATORS #
+##########################
+snippet lorem "Lorem Ipsum - 50 Words" b
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
+tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
+vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
+no sea takimata sanctus est Lorem ipsum dolor sit amet.
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/bindzone.snippets b/UltiSnips/bindzone.snippets
new file mode 100644
index 000000000..034ccdec9
--- /dev/null
+++ b/UltiSnips/bindzone.snippets
@@ -0,0 +1,27 @@
+global !p
+def newsoa():
+    import datetime
+    now = datetime.datetime.now()
+    # return standard SOA formatted serial for today
+    return now.strftime("%Y%m%d00")
+endglobal
+
+snippet zone "Bootstrap a new Bind zonefile" b
+$TTL 86400
+@     IN SOA   ${1:example.net}.     ${2:hostmaster.$1}.(
+                        `!p snip.rv = newsoa()`;     serial
+                        21600;          refresh every 6 hours
+                        3600;           retry after one hour
+                        604800;         expire after a week
+                        86400 );        minimum TTL of 1 day
+
+                IN      NS              ns01.$1.
+                IN      MX      10      mail.$1.
+
+ns01.$1         IN      A       
+mail.$1         IN      A   
+endsnippet
+
+snippet A "Insert A Record" b
+${1:hostname}   IN      A   ${2:ip}
+endsnippet
diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
new file mode 100644
index 000000000..062a36aeb
--- /dev/null
+++ b/UltiSnips/c.snippets
@@ -0,0 +1,117 @@
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+
+snippet def "#define ..."
+#define ${1}
+endsnippet
+
+snippet ifndef "#ifndef ... #define ... #endif"
+#ifndef ${1/([A-Za-z0-9_]+).*/$1/}
+#define ${1:SYMBOL} ${2:value}
+#endif
+endsnippet
+
+snippet #if "#if #endif" !b
+#if ${1:0}
+${VISUAL:code}$0
+#endif
+endsnippet
+
+snippet inc "#include local header (inc)"
+#include "${1:`!p snip.rv = snip.basename + '.h'`}"
+endsnippet
+
+snippet Inc "#include <> (Inc)"
+#include <${1:.h}>
+endsnippet
+
+snippet mark "#pragma mark (mark)"
+#if 0
+${1:#pragma mark -
+}#pragma mark $2
+#endif
+
+$0
+endsnippet
+
+snippet main "main() (main)"
+int main(int argc, char const *argv[])
+{
+	${0:/* code */}
+	return 0;
+}
+endsnippet
+
+snippet for "for int loop (fori)"
+for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
+{
+	${0:/* code */}
+}
+endsnippet
+
+snippet enum "Enumeration"
+enum ${1:name} { $0 };
+endsnippet
+
+snippet once "Include header once only guard"
+#ifndef ${1:`!p
+if not snip.c:
+	import random, string
+	name = re.sub(r'[^A-Za-z0-9]+','_', snip.fn).upper()
+	rand = ''.join(random.sample(string.ascii_letters+string.digits, 8))
+	snip.rv = ('%s_%s' % (name,rand)).upper()
+else:
+    snip.rv = snip.c`}
+#define $1
+
+${0}
+
+#endif /* end of include guard: $1 */
+
+endsnippet
+
+snippet td "Typedef"
+typedef ${1:int} ${2:MyCustomType};
+endsnippet
+
+snippet do "do...while loop (do)"
+do {
+	${0:/* code */}
+} while(${1:/* condition */});
+endsnippet
+
+snippet fprintf "fprintf ..."
+fprintf(${1:stderr}, "${2:%s}\n"${2/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$3${2/([^%]|%%)*(%.)?.*/(?2:\);)/}
+endsnippet
+
+snippet if "if .. (if)"
+if (${1:/* condition */})
+{
+	${0:/* code */}
+}
+endsnippet
+
+snippet ife "if .. else (ife)"
+if (${1:/* condition */})
+{
+        ${2:/* code */}
+}
+else
+{
+        ${3:/* else */}
+}
+endsnippet
+
+snippet printf "printf .. (printf)"
+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 */}
+};
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
new file mode 100644
index 000000000..8f347f1fa
--- /dev/null
+++ b/UltiSnips/coffee.snippets
@@ -0,0 +1,90 @@
+# From the TextMate bundle
+
+snippet fun "Function" b
+${1:name} = (${2:args}) ->
+	${0:# body...}
+endsnippet
+
+snippet bfun "Function (bound)" b
+${1:(${2:args}) }=>
+	${0:# body...}
+endsnippet
+
+snippet if "If" b
+if ${1:condition}
+	${0:# body...}
+endsnippet
+
+snippet ife "If .. Else" b
+if ${1:condition}
+	${2:# body...}
+else
+	${3:# body...}
+endsnippet
+
+snippet elif "Else if" b
+else if ${1:condition}
+	${0:# body...}
+endsnippet
+
+snippet ifte "Ternary if" b
+if ${1:condition} then ${2:value} else ${3:other}
+endsnippet
+
+snippet unl "Unless" b
+${1:action} unless ${2:condition}
+endsnippet
+
+snippet fora "Array Comprehension" b
+for ${1:name} in ${2:array}
+	${0:# body...}
+endsnippet
+
+snippet foro "Object Comprehension" b
+for ${1:key}, ${2:value} of ${3:Object}
+	${0:# body...}
+endsnippet
+
+snippet forr "Range Comprehension (inclusive)" b
+for ${1:name} in [${2:start}..${3:finish}]${4: by ${5:step}}
+	${0:# body...}
+endsnippet
+
+snippet forrex "Range Comprehension (exclusive)" b
+for ${1:name} in [${2:start}...${3:finish}]${4: by ${5:step}}
+	${0:# body...}
+endsnippet
+
+snippet swi "Switch" b
+switch ${1:object}
+	when ${2:value}
+		${0:# body...}
+endsnippet
+
+snippet cla "Class" b
+class ${1:ClassName}${2: extends ${3:Ancestor}}
+
+	${4:constructor: (${5:args}) ->
+		${6:# body...}}
+	$7
+endsnippet
+
+snippet try "Try .. Catch" b
+try
+	$1
+catch ${2:error}
+	$3
+endsnippet
+
+snippet req "Require" b
+${1/^'?(\w+)'?$/\L$1\E/} = require(${1:'${2:sys}'})
+endsnippet
+
+snippet # "Interpolated Code"
+#{$1}$0
+endsnippet
+
+snippet log "Log" b
+console.log ${1:"${2:msg}"}
+endsnippet
+
diff --git a/UltiSnips/coffee_jasmine.snippets b/UltiSnips/coffee_jasmine.snippets
new file mode 100644
index 000000000..47d1e6b53
--- /dev/null
+++ b/UltiSnips/coffee_jasmine.snippets
@@ -0,0 +1,163 @@
+#
+# CoffeeScript versions -- adapted from the JS TextMate bundle + additions
+# for some jasmine-jquery matchers
+#
+extends coffee
+
+snippet des "Describe (coffee)" b
+describe '${1:description}', ->
+	$0
+endsnippet
+
+snippet it "it (coffee)" b
+it '${1:description}', ->
+	$0
+endsnippet
+
+snippet bef "before each (coffee)" b
+beforeEach ->
+	$0
+endsnippet
+
+snippet aft "after each (coffee)" b
+afterEach ->
+	$0
+endsnippet
+
+snippet any "any (coffee)" b
+jasmine.any($1)
+endsnippet
+
+snippet ru "runs (coffee)" b
+runs ->
+	$0
+endsnippet
+
+snippet wa "waits (coffee)" b
+waits($1)
+endsnippet
+
+snippet ex "expect (coffee)" b
+expect(${1:target})$0
+endsnippet
+
+snippet ee "expect to equal (coffee)" b
+expect(${1:target}).toEqual(${2:value})
+endsnippet
+
+snippet em "expect to match (coffee)" b
+expect(${1:target}).toMatch(${2:pattern})
+endsnippet
+
+snippet eha "expect to have attribute (coffee)" b
+expect(${1:target}).toHaveAttr('${2:attr}'${3:, '${4:value}'})
+endsnippet
+
+snippet et "expect to be truthy (coffee)" b
+expect(${1:target}).toBeTruthy()
+endsnippet
+
+snippet ef "expect to be falsy (coffee)" b
+expect(${1:target}).toBeFalsy()
+endsnippet
+
+snippet ed "expect to be defined (coffee)" b
+expect(${1:target}).toBeDefined()
+endsnippet
+
+snippet en "expect to be null (coffee)" b
+expect(${1:target}).toBeNull()
+endsnippet
+
+snippet ec "expect to contain (coffee)" b
+expect(${1:target}).toContain(${2:value})
+endsnippet
+
+snippet ev "expect to be visible (coffee)" b
+expect(${1:target}).toBeVisible()
+endsnippet
+
+snippet eh "expect to be hidden (coffee)" b
+expect(${1:target}).toBeHidden()
+endsnippet
+
+snippet notx "expect not (coffee)" b
+expect(${1:target}).not$0
+endsnippet
+
+snippet note "expect not to equal (coffee)" b
+expect(${1:target}).not.toEqual(${2:value})
+endsnippet
+
+snippet notm "expect not to match (coffee)" b
+expect(${1:target}).not.toMatch(${2:pattern})
+endsnippet
+
+snippet notha "expect to not have attribute (coffee)" b
+expect(${1:target}).not.toHaveAttr('${2:attr}'${3:, '${4:value}'})
+endsnippet
+
+snippet nott "expect not to be truthy (coffee)" b
+expect(${1:target}).not.toBeTruthy()
+endsnippet
+
+snippet notf "expect not to be falsy (coffee)" b
+expect(${1:target}).not.toBeFalsy()
+endsnippet
+
+snippet notd "expect not to be defined (coffee)" b
+expect(${1:target}).not.toBeDefined()
+endsnippet
+
+snippet notn "expect not to be null (coffee)" b
+expect(${1:target}).not.toBeNull()
+endsnippet
+
+snippet notc "expect not to contain (coffee)" b
+expect(${1:target}).not.toContain(${2:value})
+endsnippet
+
+snippet notv "expect not to be visible (coffee)" b
+expect(${1:target}).not.toBeVisible()
+endsnippet
+
+snippet noth "expect not to be hidden (coffee)" b
+expect(${1:target}).not.toBeHidden()
+endsnippet
+
+snippet s "spy on (coffee)" b
+spyOn(${1:object}, "${2:method}")$0
+endsnippet
+
+snippet sr "spy on and return (coffee)" b
+spyOn(${1:object}, "${2:method}").andReturn(${3:arguments})
+endsnippet
+
+snippet st "spy on and throw (coffee)" b
+spyOn(${1:object}, "${2:method}").andThrow(${3:exception})
+endsnippet
+
+snippet sct "spy on and call through (coffee)" b
+spyOn(${1:object}, "${2:method}").andCallThrough()
+endsnippet
+
+snippet scf "spy on and call fake (coffee)" b
+spyOn(${1:object}, "${2:method}").andCallFake(${3:function})
+endsnippet
+
+snippet esc "expect was called (coffee)" b
+expect(${1:target}).wasCalled()
+endsnippet
+
+snippet escw "expect was called with (coffee)" b
+expect(${1:target}).wasCalledWith(${2:arguments})
+endsnippet
+
+snippet notsc "expect was not called (coffee)" b
+expect(${1:target}).wasNotCalled()
+endsnippet
+
+snippet noscw "expect was not called with (coffee)" b
+expect(${1:target}).wasNotCalledWith(${2:arguments})
+endsnippet
+
diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
new file mode 100644
index 000000000..9d2eb868c
--- /dev/null
+++ b/UltiSnips/cpp.snippets
@@ -0,0 +1,52 @@
+extends c
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet beginend "$1.begin(), $1.end() (beginend)"
+${1:v}${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}begin(), $1${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}end()
+endsnippet
+
+snippet cl "class .. (class)"
+class ${1:`!p snip.rv = snip.basename or "name"`}
+{
+public:
+	${1/(\w+).*/$1/} (${2:arguments});
+	virtual ~${1/(\w+).*/$1/} ();
+
+private:
+	${0:/* data */}
+};
+endsnippet
+
+snippet ns "namespace .. (namespace)"
+namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`}
+{
+	$0
+}${1/.+/ \/* /m}$1${1/.+/ *\/ /m}
+endsnippet
+
+snippet readfile "read file (readF)"
+std::vector<char> v;
+if (FILE *fp = fopen(${1:"filename"}, "r"))
+{
+	char buf[1024];
+	while(size_t len = fread(buf, 1, sizeof(buf), fp))
+		v.insert(v.end(), buf, buf + len);
+	fclose(fp);
+}
+endsnippet
+
+snippet map "std::map (map)"
+std::map<${1:key}, ${2:value}> map$0;
+endsnippet
+
+snippet vector "std::vector (v)"
+std::vector<${1:char}> v$0;
+endsnippet
+
+snippet tp "template <typename ..> (template)"
+template <typename ${1:_InputIter}>
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/css.snippets b/UltiSnips/css.snippets
new file mode 100644
index 000000000..d14d51c04
--- /dev/null
+++ b/UltiSnips/css.snippets
@@ -0,0 +1,405 @@
+###########################################################################
+#                    Most of these came from TextMate                     #
+###########################################################################
+
+snippet ! "!important CSS (!)"
+${1:!important}
+endsnippet
+
+snippet fixed "Fixed Position Bottom 100% wide IE6"
+${2:bottom: auto;}top: expression(eval(document.documentElement.scrollTop+document.documentElement.clientHeight-${1:THE HEIGHT OF THIS THING IN PIXELS}));
+${3:left: expression(eval(document.documentElement.scrollLeft));
+}${4:width: expression(eval(document.documentElement.clientWidth));}$0
+endsnippet
+
+snippet background "background-attachment: scroll:fixed (background)"
+background-attachment: ${1:scroll/fixed};$0
+endsnippet
+
+snippet background "background-color:  color-hex (background)"
+background-color: #${1:DDD};$0
+endsnippet
+
+snippet background "background-color:  color-name (background)"
+background-color: ${1:red};$0
+endsnippet
+
+snippet background "background-color:  color-rgb (background)"
+background-color: rgb(${1:255},${2:255},${3:255});$0
+endsnippet
+
+snippet background "background-color:  transparent (background)"
+background-color: transparent;$0
+endsnippet
+
+snippet background "background-image:  none (background)"
+background-image: none;$0
+endsnippet
+
+snippet background "background-image:  url (background)"
+background-image: url($1);$0
+endsnippet
+
+snippet background "background-position:  position (background)"
+background-position: ${1:top left/top center/top right/center left/center center/center right/bottom left/bottom center/bottom right/x-% y-%/x-pos y-pos};$0
+endsnippet
+
+snippet background "background-repeat:  r:r-x:r-y:n-r (background)"
+background-repeat: ${1:repeat/repeat-x/repeat-y/no-repeat};$0
+endsnippet
+
+snippet background "background:  color image repeat attachment position (background)"
+background:${6: #${1:DDD}} url($2) ${3:repeat/repeat-x/repeat-y/no-repeat} ${4:scroll/fixed} ${5:top left/top center/top right/center left/center center/center right/bottom left/bottom center/bottom right/x-% y-%/x-pos y-pos};$0
+endsnippet
+
+snippet border "border-bottom-color: size style color (border)"
+border-bottom-color: #${1:999};$0
+endsnippet
+
+snippet border "border-bottom-style: size style color (border)"
+border-bottom-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
+endsnippet
+
+snippet border "border-bottom-width: size style color (border)"
+border-bottom-width: ${1:1}px ${2:solid} #${3:999};$0
+endsnippet
+
+snippet border "border-bottom: size style color (border)"
+border-bottom: ${1:1}px ${2:solid} #${3:999};$0
+endsnippet
+
+snippet border "border-color: color (border)"
+border-color: ${1:999};$0
+endsnippet
+
+snippet border "border-left-color: color (border)"
+border-right-color: #${1:999};$0
+endsnippet
+
+snippet border "border-left-style: style (border)"
+border-left-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
+endsnippet
+
+snippet border "border-left-width: size (border)"
+border-left-width: ${1:1}px
+endsnippet
+
+snippet border "border-left: size style color (border)"
+border-left: ${1:1}px ${2:solid} #${3:999};$0
+endsnippet
+
+snippet border "border-right-color: color (border)"
+border-right-color: #${1:999};$0
+endsnippet
+
+snippet border "border-right-style: style (border)"
+border-right-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
+endsnippet
+
+snippet border "border-right-width: size (border)"
+border-right-width: ${1:1}px
+endsnippet
+
+snippet border "border-right: size style color (border)"
+border-right: ${1:1}px ${2:solid} #${3:999};$0
+endsnippet
+
+snippet border "border-style: style (border)"
+border-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
+endsnippet
+
+snippet border "border-top-color: color (border)"
+border-top-color: #${1:999};$0
+endsnippet
+
+snippet border "border-top-style: style (border)"
+border-top-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
+endsnippet
+
+snippet border "border-top-width: size (border)"
+border-top-width: ${1:1}px
+endsnippet
+
+snippet border "border-top: size style color (border)"
+border-top: ${1:1}px ${2:solid} #${3:999};$0
+endsnippet
+
+snippet border "border-width: width (border)"
+border-width: ${1:1px};$0
+endsnippet
+
+snippet border "border:   size style color (border)"
+border: ${1:1px} ${2:solid} #${3:999};$0
+endsnippet
+
+snippet clear "clear: value (clear)"
+clear: ${1:left/right/both/none};$0
+endsnippet
+
+snippet color "color:  color-hex (color)"
+color: #${1:DDD};$0
+endsnippet
+
+snippet color "color:  color-name (color)"
+color: ${1:red};$0
+endsnippet
+
+snippet color "color:  color-rgb (color)"
+color: rgb(${1:255},${2:255},${3:255});$0
+endsnippet
+
+snippet cursor "cursor: type (cursor)"
+cursor: ${1:default/auto/crosshair/pointer/move/*-resize/text/wait/help};$0
+endsnippet
+
+snippet cursor "cursor: url (cursor)"
+cursor: url($1);$0
+endsnippet
+
+snippet direction "direction: ltr|rtl (direction)"
+direction: ${1:ltr|rtl};$0
+endsnippet
+
+snippet display "display: block (display)"
+display: block;$0
+endsnippet
+
+snippet display "display: common-types (display)"
+display: ${1:none/inline/block/list-item/run-in/compact/marker};$0
+endsnippet
+
+snippet display "display: inline (display)"
+display: inline;$0
+endsnippet
+
+snippet display "display: table-types (display)"
+display: ${1:table/inline-table/table-row-group/table-header-group/table-footer-group/table-row/table-column-group/table-column/table-cell/table-caption};$0
+endsnippet
+
+snippet float "float: left:right:none (float)"
+float: ${1:left/right/none};$0
+endsnippet
+
+snippet font "font-family:   family (font)"
+font-family: ${1:Arial, "MS Trebuchet"}, ${2:sans-}serif;$0
+endsnippet
+
+snippet font "font-size: size (font)"
+font-size: ${1:100%};$0
+endsnippet
+
+snippet font "font-style:   normal:italic:oblique (font)"
+font-style: ${1:normal/italic/oblique};$0
+endsnippet
+
+snippet font "font-variant:   normal:small-caps (font)"
+font-variant: ${1:normal/small-caps};$0
+endsnippet
+
+snippet font "font-weight: weight (font)"
+font-weight: ${1:normal/bold};$0
+endsnippet
+
+snippet font "font:   style variant weight size:line-height font -family (font)"
+font: ${1:normal/italic/oblique} ${2:normal/small-caps} ${3:normal/bold} ${4:1em/1.5em} ${5:Arial}, ${6:sans-}serif;$0
+endsnippet
+
+snippet font "font: size font (font)"
+font: ${1:75%} ${2:"Lucida Grande", "Trebuchet MS", Verdana,} ${3:sans-}serif;$0
+endsnippet
+
+snippet letter "letter-spacing:   length-em (letter)"
+letter-spacing: $1em;$0
+endsnippet
+
+snippet letter "letter-spacing:   length-px (letter)"
+letter-spacing: $1px;$0
+endsnippet
+
+snippet list "list-style-image: url (list)"
+list-style-image: url($1);$0
+endsnippet
+
+snippet list "list-style-position: pos (list)"
+list-style-position: ${1:inside/outside};$0
+endsnippet
+
+snippet list "list-style-type: asian (list)"
+list-style-type: ${1:cjk-ideographic/hiragana/katakana/hiragana-iroha/katakana-iroha};$0
+endsnippet
+
+snippet list "list-style-type: marker(list)"
+list-style-type: ${1:none/disc/circle/square};$0
+endsnippet
+
+snippet list "list-style-type: numeric (list)"
+list-style-type: ${1:decimal/decimal-leading-zero/zero};$0
+endsnippet
+
+snippet list "list-style-type: other (list)"
+list-style-type: ${1:hebrew/armenian/georgian};$0
+endsnippet
+
+snippet list "list-style-type: roman-alpha-greek (list)"
+list-style-type: ${1:lower-roman/upper-roman/lower-alpha/upper-alpha/lower-greek/lower-latin/upper-latin};$0
+endsnippet
+
+snippet list "list-style: type position image (list)"
+list-style: ${1:none/disc/circle/square/decimal/zero} ${2:inside/outside} url($3);$0
+endsnippet
+
+snippet margin "margin-bottom: length (margin)"
+margin-bottom: ${1:20px};$0
+endsnippet
+
+snippet margin "margin-left: length (margin)"
+margin-left: ${1:20px};$0
+endsnippet
+
+snippet margin "margin-right: length (margin)"
+margin-right: ${1:20px};$0
+endsnippet
+
+snippet margin "margin-top: length (margin)"
+margin-top: ${1:20px};$0
+endsnippet
+
+snippet margin "margin:   all (margin)"
+margin: ${1:20px};$0
+endsnippet
+
+snippet margin "margin: T R B L (margin)"
+margin: ${1:20px} ${2:0px} ${3:40px} ${4:0px};$0
+endsnippet
+
+snippet margin "margin: V H (margin)"
+margin: ${1:20px} ${2:0px};$0
+endsnippet
+
+snippet marker "marker-offset: auto (marker)"
+marker-offset: auto;$0
+endsnippet
+
+snippet marker "marker-offset: length (marker)"
+marker-offset: ${1:10px};$0
+endsnippet
+
+snippet overflow "overflow: type (overflow)"
+overflow: ${1:visible/hidden/scroll/auto};$0
+endsnippet
+
+snippet padding "padding-bottom: length (margin)"
+padding-bottom: ${1:20px};$0
+endsnippet
+
+snippet padding "padding-left: length (margin)"
+padding-left: ${1:20px};$0
+endsnippet
+
+snippet padding "padding-right: length (margin)"
+padding-right: ${1:20px};$0
+endsnippet
+
+snippet padding "padding-top: length (margin)"
+padding-top: ${1:20px};$0
+endsnippet
+
+snippet padding "padding:   T R B L (padding)"
+padding: ${1:20px} ${2:0px} ${3:40px} ${4:0px};$0
+endsnippet
+
+snippet padding "padding:   V H (padding)"
+padding: ${1:20px} ${2:0px};$0
+endsnippet
+
+snippet padding "padding:   all (padding)"
+padding: ${1:20px};$0
+endsnippet
+
+snippet position "position: type (position)"
+position: ${1:static/relative/absolute/fixed};$0
+endsnippet
+
+snippet { "properties { } ( } )"
+{
+	/* $1 */
+	$0
+
+endsnippet
+
+snippet scrollbar "scrollbar"
+scrollbar-base-color:       ${1:#CCCCCC};${2:
+scrollbar-arrow-color:      ${3:#000000};
+scrollbar-track-color:      ${4:#999999};
+scrollbar-3dlight-color:    ${5:#EEEEEE};
+scrollbar-highlight-color:  ${6:#FFFFFF};
+scrollbar-face-color:       ${7:#CCCCCC};
+scrollbar-shadow-color:     ${9:#999999};
+scrollbar-darkshadow-color: ${8:#666666};}
+endsnippet
+
+snippet selection "selection"
+$1::-moz-selection,
+$1::selection {
+	color: ${2:inherit};
+	background: ${3:inherit};
+}
+endsnippet
+
+snippet text "text-align: left:center:right (txt)"
+text-align: ${1:left/right/center/justify};$0
+endsnippet
+
+snippet text "text-decoration: none:underline:overline:line-through:blink (text)"
+text-decoration: ${1:none/underline/overline/line-through/blink};$0
+endsnippet
+
+snippet text "text-indent: length (text)"
+text-indent: ${1:10}px;$0
+endsnippet
+
+snippet text "text-shadow: color-hex x y blur (text)"
+text-shadow: #${1:DDD} ${2:10px} ${3:10px} ${4:2px};$0
+endsnippet
+
+snippet text "text-shadow: color-rgb x y blur (text)"
+text-shadow: rgb(${1:255},${2:255},${3:255}) ${4:10px} ${5:10px} ${6:2px};$0
+endsnippet
+
+snippet text "text-shadow: none (text)"
+text-shadow: none;$0
+endsnippet
+
+snippet text "text-transform: capitalize:upper:lower (text)"
+text-transform: ${1:capitalize/uppercase/lowercase};$0
+endsnippet
+
+snippet text "text-transform: none (text)"
+text-transform: none;$0
+endsnippet
+
+snippet vertical "vertical-align: type (vertical)"
+vertical-align: ${1:baseline/sub/super/top/text-top/middle/bottom/text-bottom/length/%};$0
+endsnippet
+
+snippet visibility "visibility: type (visibility)"
+visibility: ${1:visible/hidden/collapse};$0
+endsnippet
+
+snippet white "white-space:  normal:pre:nowrap (white)"
+white-space: ${1:normal/pre/nowrap};$0
+endsnippet
+
+snippet word "word-spacing:  length (word)"
+word-spacing: ${1:10px};$0
+endsnippet
+
+snippet word "word-spacing:  normal (word)"
+word-spacing: normal;$0
+endsnippet
+
+snippet z "z-index: index (z)"
+z-index: $1;$0
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/d.snippets b/UltiSnips/d.snippets
new file mode 100644
index 000000000..8ed9b4170
--- /dev/null
+++ b/UltiSnips/d.snippets
@@ -0,0 +1,583 @@
+# Simple shortcuts
+
+snippet imp "import (imp)" b
+import ${1:std.stdio};
+endsnippet
+
+snippet pimp "public import (pimp)" b
+public import ${1:/*module*/};
+endsnippet
+
+snippet over "override (over)" b
+override ${1:/*function*/}
+endsnippet
+
+snippet al "alias (al)"
+alias ${1:/*orig*/} ${2:/*alias*/};
+endsnippet
+
+snippet mixin "mixin (mixin)" b
+mixin ${1:/*mixed_in*/} ${2:/*name*/};
+endsnippet
+
+snippet new "new (new)"
+new ${1}(${2});
+endsnippet
+
+snippet scpn "@safe const pure nothrow (scpn)"
+@safe const pure nothrow
+endsnippet
+
+snippet spn "@safe pure nothrow (spn)"
+@safe pure nothrow
+endsnippet
+
+snippet cont "continue (cont)"
+continue;
+endsnippet
+
+snippet dis "@disable (dis)" b
+@disable ${1:/*method*/};
+endsnippet
+
+snippet pub "public (pub)" b
+public:
+    ${1:/*members*/}
+endsnippet
+
+snippet priv "private (priv)" b
+private:
+    ${1:/*members*/}
+endsnippet
+
+snippet prot "protected (prot)" b
+protected:
+    ${1:/*members*/}
+endsnippet
+
+snippet pack "package (pack)" b
+package:
+    ${1:/*members*/}
+endsnippet
+
+snippet ret "return (ret)"
+return ${1:/*value to return*/};
+endsnippet
+
+snippet auto "auto (auto)" b
+auto ${1:/*variable*/} = ${2:/*value*/};
+endsnippet
+
+snippet con "const (con)" b
+const ${1:/*variable*/} = ${2:/*value*/};
+endsnippet
+
+snippet siz "size_t (siz)" b
+size_t ${1:/*variable*/} = ${2:/*value*/};
+endsnippet
+
+snippet sup "super (sup)" b
+super(${1:/*args*/});
+endsnippet
+
+# Phobos
+
+snippet tup "tuple (tup)"
+tuple(${1:/*args*/})
+endsnippet
+
+snippet wr "writeln (wr)"
+writeln(${1:/*args*/});
+endsnippet
+
+snippet to "to (to)"
+to!(${1:/*type*/})(${2:/*arg*/})
+endsnippet
+
+snippet enf "enforce (enf)" b
+enforce(${1:/*condition*/},
+        new ${2}Exception(${3:/*args*/}));
+endsnippet
+
+# Branches
+
+snippet if "if .. (if)"
+if(${1:/*condition*/})
+{
+    ${VISUAL}${0:/*code*/}
+}
+endsnippet
+
+snippet ife "if .. else (ife)" b
+if(${1:/*condition*/})
+{
+    ${2:/*code*/}
+}
+else
+{
+    ${3:/*else*/}
+}
+endsnippet
+
+snippet el "else (el)" b
+else
+{
+    ${VISUAL}${1:/*code*/}
+}
+endsnippet
+
+snippet elif "else if (elif)" b
+else if(${1:/*condition*/})
+{
+    ${VISUAL}${0:/*code*/}
+}
+endsnippet
+
+snippet sw "switch (sw)"
+switch(${1:/*var*/})
+{
+    case ${2:/*value*/}:
+        ${3:/*code*/}
+        break;
+    case ${4:/*value*/}:
+        ${5:/*code*/}
+        break;
+    ${7:/*more cases*/}
+    default:
+        ${6:assert(false);}
+}
+endsnippet
+
+snippet fsw "final switch (fsw)"
+switch(${1:/*var*/})
+{
+    case ${2:/*value*/}:
+        ${3:/*code*/}
+        break;
+    case ${4:/*value*/}:
+        ${5:/*code*/}
+        break;
+    ${7:/*more cases*/}
+}
+endsnippet
+
+snippet case "case (case)" b
+case ${1:/*value*/}:
+    ${2:/*code*/}
+    break;
+endsnippet
+
+snippet ?: "ternary operator (?:)"
+${1:/*condition*/} ? ${2:/*then*/} : ${3:/*else*/}$4
+endsnippet
+
+# Loops
+
+snippet do "do while (do)" b
+do
+{
+    ${VISUAL}${2:/*code*/}
+} while(${1:/*condition*/});
+endsnippet
+
+snippet wh "while (wh)" b
+while(${1:/*condition*/})
+{
+    ${VISUAL}${2:/*code*/}
+}
+endsnippet
+
+snippet for "for (for)" b
+for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
+{
+    ${VISUAL}${0:/*code*/}
+}
+endsnippet
+
+snippet forever "forever (forever)" b
+for(;;)
+{
+    ${VISUAL}${0:/*code*/}
+}
+endsnippet
+
+snippet fore "foreach (fore)"
+foreach(${1:/*elem*/}; ${2:/*range*/})
+{
+    ${VISUAL}${3:/*code*/}
+}
+endsnippet
+
+snippet forif "foreach if (forif)" b
+foreach(${1:/*elem*/}; ${2:/*range*/}) if(${3:/*condition*/})
+{
+    ${VISUAL}${4:/*code*/}
+}
+endsnippet
+
+# Contracts
+snippet in "in contract (in)" b
+in
+{
+    assert(${1:/*condition*/}, "${2:error message}");
+    ${3}
+}
+body
+endsnippet
+
+snippet out "out contract (out)" b
+out${1:(result)}
+{
+    assert(${2:/*condition*/}, "${3:error message}");
+    ${4}
+}
+body
+endsnippet
+
+snippet inv "invariant (inv)" b
+invariant()
+{
+    assert(${1:/*condition*/}, "${2:error message}");
+    ${3}
+}
+endsnippet
+
+# Functions (generic)
+
+snippet fun "function definition (fun)"
+${1:void} ${2:/*function name*/}(${3:/*args*/}) ${4:@safe pure nothrow}
+{
+    ${VISUAL}${5:/*code*/}
+}
+endsnippet
+
+snippet void "void function definition (void)"
+void ${1:/*function name*/}(${2:/*args*/}) ${3:@safe pure nothrow}
+{
+    ${VISUAL}${4:/*code*/}
+}
+endsnippet
+
+snippet this "ctor (this)" w
+this(${1:/*args*/})
+{
+    ${VISUAL}${2:/*code*/}
+}
+endsnippet
+
+snippet get "getter property (get)" !
+@property ${1:/*type*/} ${2:/*member_name*/}() const pure nothrow {return ${3:$2_};}
+endsnippet
+
+snippet set "setter property (set)" !
+@property void ${1:/*member_name*/}(${2:/*type*/} rhs) pure nothrow {${3:$1_} = rhs;}
+endsnippet
+
+# Functions (concrete)
+
+snippet main "Main" b
+void main(string[] args)
+{
+    ${VISUAL}${0: /*code*/}
+}
+endsnippet
+
+# Mixins
+
+snippet signal "signal (signal)" b
+mixin Signal!(${1:/*args*/}) ${2:/*name*/};
+endsnippet
+
+# Scope
+
+snippet scope "scope (scope)" b
+scope(${1:exit})
+{
+    ${VISUAL}${2:/*code*/}
+}
+endsnippet
+
+# With
+
+snippet with "with (with)"
+with(${1})
+{
+    ${VISUAL}${2:/*code*/}
+}
+endsnippet
+
+# Exception handling
+
+snippet try "try/catch (try)" b
+try
+{
+    ${VISUAL}${1:/*code to try*/}
+}
+catch(${2}Exception e)
+{
+    ${3:/*handle exception*/}
+}
+endsnippet
+
+snippet tryf "try/catch/finally (tryf)" b
+try
+{
+    ${VISUAL}${1:/*code to try*/}
+}
+catch(${2}Exception e)
+{
+    ${3:/*handle exception*/}
+}
+finally
+{
+    ${4:/*cleanup*/}
+}
+endsnippet
+
+snippet catch "catch (catch)" b
+catch(${1}Exception e)
+{
+    ${2:/*handle exception*/}
+}
+endsnippet
+
+snippet thr "throw (thr)"
+throw new ${1}Exception("${2}");
+endsnippet
+
+
+# Type declarations
+
+snippet struct "struct (struct)"
+struct ${1:`!p snip.rv = (snip.basename or "name")`}
+{
+    ${2}
+}
+endsnippet
+
+snippet union "union (union)"
+union ${1:`!p snip.rv = (snip.basename or "name")`}
+{
+    ${2}
+}
+endsnippet
+
+snippet class "class (class)"
+class ${1:`!p snip.rv = (snip.basename or "name")`}
+{
+    ${2}
+}
+endsnippet
+
+snippet inter "interface (inter)"
+interface ${1:`!p snip.rv = (snip.basename or "name")`}
+{
+    ${2}
+}
+endsnippet
+
+snippet enum "enum (enum)"
+enum ${1:`!p snip.rv = (snip.basename or "name")`}
+{
+    ${2}
+}
+endsnippet
+
+
+# Exception declarations
+
+snippet exc "exception declaration (exc)" b
+/// ${3:/*documentation*/}
+class ${1}Exception : ${2}Exception 
+{
+    public this(string msg, string file = __FILE__, int line = __LINE__)
+    {
+        super(msg, file, line);
+    }
+}
+endsnippet
+
+
+# Conditional compilation
+
+snippet version "version (version)" b
+version(${1:/*version name*/})
+{
+    ${VISUAL}${2:/*code*/}
+}
+endsnippet
+
+snippet debug "debug" b
+debug
+{
+    ${VISUAL}${1:/*code*/}
+}
+endsnippet
+
+
+# Templates
+
+snippet temp "template (temp)" b
+template ${2:/*name*/}(${1:/*args*/})
+{
+    ${3:/*code*/}
+}
+endsnippet
+
+
+# Asserts
+
+snippet ass "assert (ass)" b
+assert(${1:false}, "${2:TODO}");
+
+endsnippet
+
+
+# Unittests
+
+snippet unittest "unittest (unittest)" b
+unittest
+{
+    ${1:/*code*/}
+}
+endsnippet
+
+
+# Common member functions
+
+snippet opDis "opDispatch (opDis)" b
+${1:/*return type*/} opDispatch(string s)()
+{
+    ${2:/*code*/};
+}
+endsnippet
+
+snippet op= "opAssign (op=)" b
+void opAssign(${1} rhs) ${2:@safe pure nothrow}
+{
+    ${2:/*code*/}
+}
+endsnippet
+
+snippet opCmp "opCmp (opCmp)" b
+int opCmp(${1} rhs) @safe const pure nothrow
+{
+    ${2:/*code*/}
+}
+endsnippet
+
+snippet opApply "opApply (opApply)" b
+int opApply(int delegate(ref ${1:/*iterated type/s*/}) dg)
+{
+    int result = 0;
+    ${2:/*loop*/}
+    {
+        result = dg(${3:/*arg/s*/});
+        if(result){break;}
+    }
+    return result;
+}
+endsnippet
+
+snippet toString "toString (toString)" b
+string toString() @safe const pure nothrow
+{
+    ${1:/*code*/}
+}
+endsnippet
+
+
+# Comments
+
+
+snippet todo "TODO (todo)" !
+// TODO: ${1}
+endsnippet
+
+
+
+# DDoc
+
+snippet doc "generic ddoc block (doc)" b
+/// ${1:description}
+///
+/// ${2:details}
+endsnippet
+
+snippet fdoc "function ddoc block (fdoc)" b
+/// ${1:description}
+///
+/// ${2:Params:  ${3:param} = ${4:param description}
+///          ${5}}
+///
+/// ${6:Returns: ${7:return value}}
+///
+/// ${8:Throws:  ${9}Exception ${10}}
+endsnippet
+
+snippet Par "Params (Par)"
+Params:  ${1:param} = ${2:param description}
+///         ${3}
+endsnippet
+
+snippet Ret "Returns (Ret)"
+Returns:  ${1:return value/s}
+endsnippet
+
+snippet Thr "Throws (Thr)"
+Throws:  ${1}Exception ${2}
+endsnippet
+
+snippet Example "Examples (Example)"
+Examples:
+/// --------------------
+/// ${1:example code}
+/// --------------------
+endsnippet
+
+
+# License blocks
+
+snippet gpl "GPL (gpl)" b
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// 
+// Copyright (C) ${1:Author}, `!v strftime("%Y")`
+
+${2}
+endsnippet
+
+snippet boost "Boost (boost)" b
+//          Copyright ${1:Author} `!v strftime("%Y")`.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+${2}
+endsnippet
+
+
+# New module
+
+snippet module "New module (module)" b
+//          Copyright ${1:Author} `!v strftime("%Y")`.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+module ${2}.`!v Filename('$1', 'name')`;
+
+
+${3}
+endsnippet
diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
new file mode 100644
index 000000000..59b77c576
--- /dev/null
+++ b/UltiSnips/django.snippets
@@ -0,0 +1,236 @@
+# Generic Tags
+snippet %
+{% ${1} %}${2}
+endsnippet
+
+snippet %%
+{% ${1:tag_name} %}
+  ${2}
+{% end$1 %}
+endsnippet
+
+snippet {
+{{ ${1} }}${2}
+endsnippet
+
+# Template Tags
+
+snippet autoescape
+{% autoescape ${1:off} %}
+  ${2}
+{% endautoescape %}
+endsnippet
+
+snippet block
+{% block ${1} %}
+  ${2}
+{% endblock %}
+endsnippet
+
+snippet #
+{# ${1:comment} #}
+endsnippet
+
+snippet comment
+{% comment %}
+  ${1}
+{% endcomment %}
+endsnippet
+
+snippet cycle
+{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
+endsnippet
+
+snippet debug
+{% debug %}
+endsnippet
+
+snippet extends
+{% extends "${1:base.html}" %}
+endsnippet
+
+snippet filter
+{% filter ${1} %}
+  ${2}
+{% endfilter %}
+endsnippet
+
+snippet firstof
+{% firstof ${1} %}
+endsnippet
+
+snippet for
+{% for ${1} in ${2} %}
+  ${3}
+{% endfor %}
+endsnippet
+
+snippet empty
+{% empty %}
+  ${1}
+endsnippet
+
+snippet if
+{% if ${1} %}
+  ${2}
+{% endif %}
+endsnippet
+
+snippet else
+{% else %}
+  ${1}
+endsnippet
+
+snippet ifchanged
+{% ifchanged %}${1}{% endifchanged %}
+endsnippet
+
+snippet ifequal
+{% ifequal ${1} ${2} %}
+  ${3}
+{% endifequal %}
+endsnippet
+
+snippet ifnotequal
+{% ifnotequal ${1} ${2} %}
+  ${3}
+{% endifnotequal %}
+endsnippet
+
+snippet include
+{% include "${1}" %}
+endsnippet
+
+snippet load
+{% load ${1} %}
+endsnippet
+
+snippet now
+{% now "${1:jS F Y H:i}" %}
+endsnippet
+
+snippet regroup
+{% regroup ${1} by ${2} as ${3} %}
+endsnippet
+
+snippet spaceless
+{% spaceless %}${1}{% endspaceless %}
+endsnippet
+
+snippet ssi
+{% ssi ${1} %}
+endsnippet
+
+snippet trans
+{% trans "${1:string}" %}
+endsnippet
+
+snippet url
+{% url ${1} as ${2} %}
+endsnippet
+
+snippet widthratio
+{% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
+endsnippet
+
+snippet with
+{% with ${1} as ${2} %}
+endsnippet
+
+# Template Filters
+
+# Note: Since SnipMate can't determine which template filter you are
+# expanding without the "|" character, these do not add the "|"
+# character.  These save a few keystrokes still.
+
+# Note: Template tags that take no arguments are not implemented.
+
+snippet add
+add:"${1}"
+endsnippet
+
+snippet center
+center:"${1}"
+endsnippet
+
+snippet cut
+cut:"${1}"
+endsnippet
+
+snippet date
+date:"${1}"
+endsnippet
+
+snippet default
+default:"${1}"
+endsnippet
+
+snippet defaultifnone
+default_if_none:"${1}"
+endsnippet
+
+snippet dictsort
+dictsort:"${1}"
+endsnippet
+
+snippet dictsortrev
+dictsortreversed:"${1}"
+endsnippet
+
+snippet divisibleby
+divisibleby:"${1}"
+endsnippet
+
+snippet floatformat
+floatformat:"${1}"
+endsnippet
+
+snippet getdigit
+get_digit:"${1}"
+endsnippet
+
+snippet join
+join:"${1}"
+endsnippet
+
+snippet lengthis
+length_is:"${1}"
+endsnippet
+
+snippet pluralize
+pluralize:"${1}"
+endsnippet
+
+snippet removetags
+removetags:"${1}"
+endsnippet
+
+snippet slice
+slice:"${1}"
+endsnippet
+
+snippet stringformat
+stringformat:"${1}"
+endsnippet
+
+snippet time
+time:"${1}"
+endsnippet
+
+snippet truncatewords
+truncatewords:${1}
+endsnippet
+
+snippet truncatewordshtml
+truncatewords_html:${1}
+endsnippet
+
+snippet urlizetrunc
+urlizetrunc:${1}
+endsnippet
+
+snippet wordwrap
+wordwrap:${1}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/erlang.snippets b/UltiSnips/erlang.snippets
new file mode 100644
index 000000000..782316261
--- /dev/null
+++ b/UltiSnips/erlang.snippets
@@ -0,0 +1,98 @@
+###########################################################################
+#                            TEXTMATE SNIPPETS                            #
+###########################################################################
+
+snippet pat "Case:Receive:Try Clause"
+${1:pattern}${2: when ${3:guard}} ->;
+	${4:body}
+endsnippet
+
+snippet beh "Behaviour Directive"
+-behaviour (${1:behaviour}).
+endsnippet
+
+snippet case "Case Expression"
+case ${1:expression} of
+	${2:pattern}${3: when ${4:guard}} ->
+		${5:body}
+end
+endsnippet
+
+snippet def "Define Directive"
+-define (${1:macro}${2: (${3:param})}, ${4:body}).
+endsnippet
+
+snippet exp "Export Directive"
+-export ([${1:function}/${2:arity}]).
+endsnippet
+
+snippet fun "Fun Expression"
+fun
+	(${1:pattern})${2: when ${3:guard}} ->
+		${4:body}
+end
+endsnippet
+
+snippet fu "Function"
+${1:function} (${2:param})${3: when ${4:guard}} ->
+	${5:body}
+endsnippet
+
+snippet if "If Expression"
+if
+	${1:guard} ->
+		${2:body}
+end
+endsnippet
+
+snippet ifdef "Ifdef Directive"
+-ifdef (${1:macro}).
+endsnippet
+
+snippet ifndef "Ifndef Directive"
+-ifndef (${1:macro}).
+endsnippet
+
+snippet imp "Import Directive"
+-import (${1:module}, [${2:function}/${3:arity}]).
+endsnippet
+
+snippet inc "Include Directive"
+-include ("${1:file}").
+endsnippet
+
+snippet mod "Module Directive"
+-module (${1:`!p snip.rv = snip.basename or "module"`}).
+endsnippet
+
+snippet rcv "Receive Expression"
+receive
+${1:	${2:pattern}${3: when ${4:guard}} ->
+		${5:body}}
+${6:after
+	${7:expression} ->
+		${8:body}}
+end
+endsnippet
+
+snippet rec "Record Directive"
+-record (${1:record}, {${2:field}${3: = ${4:value}}}).
+endsnippet
+
+snippet try "Try Expression"
+try${1: ${2:expression}${3: of
+	${4:pattern}${5: when ${6:guard}} ->
+		${7:body}}}
+${8:catch
+	${9:pattern}${10: when ${11:guard}} ->
+		${12:body}}
+${13:after
+	${14:body}}
+end
+endsnippet
+
+snippet undef "Undef Directive"
+-undef (${1:macro}).
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
new file mode 100644
index 000000000..1fdcfc167
--- /dev/null
+++ b/UltiSnips/eruby.snippets
@@ -0,0 +1,279 @@
+# TextMate added these variables to cope with changes in ERB handling
+# in different versions of Rails -- for instance, Rails 3 automatically
+# strips whitespace so that it's no longer necessary to use a form like
+# <% end -%>, but if you're still maintaining Rails 2 projects, you
+# can't omit the minus sign and get the same behavior.
+#
+# The following regex replace substitutes the function below for the
+# TextMate variable references after the snippets are converted:
+#
+#   /\v\$\{(TM_RAILS_TEMPLATE_([^_]+)_RUBY_([^_\s]+))\}/`!p textmate_var('\1', snip)`/g
+#
+global !p
+def textmate_var(var, snip):
+    lookup = dict(
+       TM_RAILS_TEMPLATE_START_RUBY_EXPR = snip.opt('g:tm_rails_template_start_ruby_expr', '<%= '),
+       TM_RAILS_TEMPLATE_END_RUBY_EXPR = snip.opt('g:tm_rails_template_end_ruby_expr', ' %>'),
+       TM_RAILS_TEMPLATE_START_RUBY_INLINE = snip.opt('g:tm_rails_template_start_ruby_inline', ' %>'),
+       TM_RAILS_TEMPLATE_END_RUBY_INLINE = snip.opt('g:tm_rails_template_end_ruby_inline', ' %>'),
+       TM_RAILS_TEMPLATE_END_RUBY_BLOCK = 'end'
+    )
+
+    snip.rv = lookup[var]
+    return
+endglobal
+
+
+###########################################################################
+#            GENERATED FROM get_tm_snippets.py + REGEX REPLACE            #
+###########################################################################
+
+snippet fi "<%= Fixtures.identify(:symbol) %>"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`Fixtures.identify(:${1:name})`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`$0
+endsnippet
+
+snippet ft "form_tag"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => "${5:update}"}${6:, {:${8:class} => "${9:form}"\}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+  $0
+`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+endsnippet
+
+snippet end "end (ERB)"
+<% end -%>
+endsnippet
+
+snippet for "for loop (ERB)"
+<% if !${1:list}.blank? %>
+  <% for ${2:item} in ${1} %>
+    $3
+  <% end %>
+<% else %>
+  $4
+<% end %>
+
+endsnippet
+
+snippet ffcb "form_for check_box"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.check_box :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet ffff "form_for file_field 2"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.file_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet ffhf "form_for hidden_field 2"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.hidden_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet ffl "form_for label 2"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.label :${1:attribute', snip)`${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet ffpf "form_for password_field 2"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.password_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet ffrb "form_for radio_box 2"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_box :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet ffs "form_for submit 2"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.submit "${1:Submit}"${2:, :disable_with => '${3:$1ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet ffta "form_for text_area 2"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_area :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet fftf "form_for text_field 2"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet fields "fields_for"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`fields_for :${1:model}, @${2:$1} do |$1|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
+  $0
+`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+endsnippet
+
+snippet f. "f_fields_for (nff)"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`f.fields_for :${1:attribute} do |${2:f}|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
+	$0
+`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+endsnippet
+
+snippet f. "f.checkbox"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.check_box :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.file_field"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.file_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.hidden_field"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.hidden_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.label"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.label :${1:attribute', snip)`${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.password_field"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.password_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.radio_box"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_box :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.submit"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.submit "${1:Submit}"${2:, :disable_with => '${3:$1ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.text_area"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_area :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.text_field"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet ffe "form_for with errors"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`error_messages_for :${1:model}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_for @${2:$1} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
+  $0
+`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+endsnippet
+
+snippet ff "form_for"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_for @${1:model} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
+  $0
+`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+endsnippet
+
+snippet ist "image_submit_tag"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_submit_tag("${1:agree.png}"${2:${3:, :id => "${4:${1/^(\w+)(\.\w*)?$/$1/}}"}${5:, :name => "${6:${1/^(\w+)(\.\w*)?$/$1/}}"}${7:, :class => "${8:${1/^(\w+)(\.\w*)?$/$1/}-button}"}${9:, :disabled => ${10:false}}})`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet it "image_tag"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_tag "$1${2:.png}"${3:${4:, :title => "${5:title}"}${6:, :class => "${7:class}"}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet layout "layout"
+layout "${1:template_name}"${2:${3:, :only => ${4:[:${5:action}, :${6:action}]}}${7:, :except => ${8:[:${9:action}, :${10:action}]}}}
+endsnippet
+
+snippet jit "javascript_include_tag"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`javascript_include_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lia "link_to (action)"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet liai "link_to (action, id)"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:edit}", :id => ${3:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lic "link_to (controller)"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lica "link_to (controller, action)"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet licai "link_to (controller, action, id)"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:edit}", :id => ${4:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet linpp "link_to (nested path plural)"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${10:parent}_${11:child}_path(${12:@}${13:${10}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet linp "link_to (nested path)"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lipp "link_to (path plural)"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${4:model}s_path}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lip "link_to (path)"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:model}_path(${13:@}${14:${12}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lim "link_to model"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:model}.${2:name}, ${3:${4:$1}_path(${14:$1})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet hide "page.hide (*ids)"
+page.hide ${1:"${2:id(s)}"}
+endsnippet
+
+snippet ins "page.insert_html (position, id, partial)"
+page.insert_html :${1:top}, ${2:"${3:id}"}, :${4:partial => "${5:template}"}
+endsnippet
+
+snippet rep "page.replace (id, partial)"
+page.replace ${1:"${2:id}"}, :${3:partial => "${4:template}"}
+endsnippet
+
+snippet reph "page.replace_html (id, partial)"
+page.replace_html ${1:"${2:id}"}, :${3:partial => "${4:template}"}
+endsnippet
+
+snippet show "page.show (*ids)"
+page.show ${1:"${2:id(s)}"}
+endsnippet
+
+snippet tog "page.toggle (*ids)"
+page.toggle ${1:"${2:id(s)}"}
+endsnippet
+
+snippet vis "page.visual_effect (effect, id)"
+page.visual_effect :${1:toggle_slide}, ${2:"${3:DOM ID}"}
+endsnippet
+
+snippet rp "render (partial) (rp)"
+render :partial => "${1:item}"
+endsnippet
+
+snippet rpc "render (partial,collection) (rpc)"
+render :partial => "${1:item}", :collection => ${2:@$1s}
+endsnippet
+
+snippet rpl "render (partial,locals) (rpl)"
+render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}$0 }
+endsnippet
+
+snippet rpo "render (partial,object) (rpo)"
+render :partial => "${1:item}", :object => ${2:@$1}
+endsnippet
+
+snippet rps "render (partial,status) (rps)"
+render :partial => "${1:item}", :status => ${2:500}
+endsnippet
+
+snippet slt "stylesheet_link_tag"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`stylesheet_link_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet st "submit_tag"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`submit_tag "${1:Save changes}"${2:, :id => "${3:submit}"}${4:, :name => "${5:$3}"}${6:, :class => "${7:form_$3}"}${8:, :disabled => ${9:false}}${10:, :disable_with => "${11:Please wait...}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet else "else (ERB)"
+<% else %>
+  
+endsnippet
+
+snippet if "if (ERB)"
+<% if ${1:condition} %>$0
+endsnippet
+
+snippet lf "link_to_function"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to_function ${1:"${2:Greeting}"}, "${3:alert('Hello world!')}"$4`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/go.snippets b/UltiSnips/go.snippets
new file mode 100644
index 000000000..ea46931ba
--- /dev/null
+++ b/UltiSnips/go.snippets
@@ -0,0 +1,107 @@
+# Snippets for Go
+
+# when to abbriviate and when not?
+# b doesn't work here, because it ignores whitespace
+# optional local name?
+snippet /^import/ "Import declaration" r
+import (
+	"${1:package}"
+)
+endsnippet
+
+snippet /^package/ "Package declaration" r
+// Package $1 provides ...
+package ${1:main}
+endsnippet
+
+# Mostly converted from: https://github.com/AlanQuatermain/go-tmbundle
+snippet /^cons/ "Constants declaration" r
+const (
+	${1:constant}${2/(.+)/ /}${2:type} = ${0:value}
+)
+endsnippet
+
+snippet /^con/ "Constant declaration" r
+const ${1:name}${2/(.+)/ /}${2:type} = ${0:value}
+endsnippet
+
+snippet iota "Iota constant generator" b
+const (
+	${1:constant}${2/(.+)/ /}${2:type} = iota
+)
+endsnippet
+
+# statements
+snippet for "For loop" !b
+for ${1:condition}${1/(.+)/ /}{
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet forr "For range loop" !b
+for ${2:name} := range ${1:collection} {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet if "If statement" !b
+if ${1:condition}${1/(.+)/ /}{
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet switch "Switch statement" !b
+switch ${1:expression}${1/(.+)/ /}{
+case${0}
+}
+endsnippet
+
+snippet case "Case clause" !b
+case ${1:condition}:
+	${0:${VISUAL}}
+endsnippet
+
+snippet default "Default clause" !b
+default:
+	${0:${VISUAL}}
+endsnippet
+
+# functions
+snippet /^main/ "Main function" r
+func main() {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet /^meth/ "Method" r
+func (${1:receiver} ${2:type}) ${3:name}(${4:params})${5/(.+)/ /}${5:type} {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet func "Function" b
+func ${1:name}(${2:params})${3/(.+)/ /}${3:type} {
+	${0:${VISUAL}}
+}
+endsnippet
+
+# types and variables
+snippet map "Map type" !b
+map[${1:keytype}]${2:valtype}
+endsnippet
+
+snippet : "Variable declaration :=" !b
+${1:name} := ${0:value}
+endsnippet
+
+snippet var "Variable declaration" !b
+var ${1:name}${2/(.+)/ /}${2:type}${3: = ${0:value}}
+endsnippet
+
+snippet vars "Variables declaration" !b
+var (
+	${1:name}${2/(.+)/ /}${2:type}${3: = ${0:value} }
+)
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets
new file mode 100644
index 000000000..eb7b2c62e
--- /dev/null
+++ b/UltiSnips/haskell.snippets
@@ -0,0 +1,61 @@
+snippet if "if ... then ... else ..."
+if ${1:condition}
+   then ${2:expression}
+   else ${3:expression}
+endsnippet
+
+snippet case "case ... of ..."
+case ${1:expression} of
+     ${2:pattern} -> ${3:expression}
+     ${4:pattern} -> ${5:expression}
+endsnippet
+
+snippet :: "Type signature"
+${1:name} :: ${2:Type} -> ${3:Type}
+endsnippet
+
+snippet => "Type constraint"
+(${1:Class} ${2:Type var}) => ${3:$2}
+endsnippet
+
+snippet def "Function definition"
+${1:name} :: ${2:Type} -> ${3:Type}
+endsnippet
+
+snippet def[] "Function definition for list patterns"
+${1:name} :: [${2:Type}] -> ${3:Type}
+$1 [] = ${4:undefined}
+$1 ${5:(x:xs)} = ${6:undefined}
+endsnippet
+
+snippet = "Function clause"
+${1:name} ${2:pattern} = ${3:undefined}
+endsnippet
+
+snippet 2= "Function clause"
+${1:name} ${2:pattern} = ${3:undefined}
+$1 ${4:pattern} = ${5:undefined}
+endsnippet
+
+snippet 3= "Function clause"
+${1:name} ${2:pattern} = ${3:undefined}
+$1 ${4:pattern} = ${5:undefined}
+$1 ${6:pattern} = ${7:undefined}
+endsnippet
+
+snippet | "Guard"
+| ${1:predicate} = ${2:undefined}
+endsnippet
+
+snippet \ "Lambda expression"
+\ ${1:pattern} -> ${2:expression}
+endsnippet
+
+snippet [|] "List comprehension"
+[${3:foo }$1 | ${1:x} <- ${2:xs} ]
+endsnippet
+
+snippet let "let ... in ..."
+let ${1:name} = ${2:expression}
+in ${3:expression}
+endsnippet
diff --git a/UltiSnips/help.snippets b/UltiSnips/help.snippets
new file mode 100644
index 000000000..bd0bb12fb
--- /dev/null
+++ b/UltiSnips/help.snippets
@@ -0,0 +1,30 @@
+# Snippets for VIM Help Files
+
+global !p
+def sec_title(snip, t):
+    file_start = snip.fn.split('.')[0]
+    sec_name = t[1].strip("1234567890. ").lower().replace(' ', '-')
+    return ("*%s-%s*" % (file_start, sec_name)).rjust(78-len(t[1]))
+endglobal
+
+snippet sec "Section marker" b
+==============================================================================
+${1:SECTION}`!p snip.rv = sec_title(snip, t)`
+
+$0
+endsnippet
+
+snippet ssec "Sub section marker" b
+${1:Subsection}`!p snip.rv = sec_title(snip, t)
+snip += "-"*len(t[1])`
+
+$0
+endsnippet
+
+snippet sssec "Subsub Section marker" b
+${1:SubSubsection}:`!p snip.rv = sec_title(snip, t)`
+
+$0
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
new file mode 100644
index 000000000..bb0747890
--- /dev/null
+++ b/UltiSnips/html.snippets
@@ -0,0 +1,297 @@
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+
+global !p
+def x(snip):
+    if snip.ft.startswith("x"):
+        snip.rv = '/'
+    else:
+        snip.rv = ""
+endglobal
+
+############
+# Doctypes #
+############
+snippet doctype "DocType XHTML 1.0 Strict" b
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+endsnippet
+
+snippet doctype "DocType XHTML 1.0 Transitional" b
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+endsnippet
+
+snippet doctype "DocType XHTML 1.1" b
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+endsnippet
+
+snippet doctype "HTML - 4.0 Transitional (doctype)" b
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+
+endsnippet
+
+snippet doctype "HTML - 5.0 (doctype)" b
+<!DOCTYPE html>
+
+endsnippet
+
+#############
+# Shortcuts #
+#############
+snippet down "Down (down)"
+&#x2193;
+endsnippet
+
+snippet enter "Enter (enter)"
+&#x2305;
+endsnippet
+
+snippet escape "Escape (escape)"
+&#x238B;
+endsnippet
+
+snippet shift "Shift (shift)"
+&#x21E7;
+endsnippet
+
+snippet tab "Tab (tab)"
+&#x21E5;
+endsnippet
+
+snippet up "Up (up)"
+&#x2191;
+endsnippet
+
+snippet return "Return (return)"
+&#x21A9;
+endsnippet
+
+snippet right "Right (right)"
+&#x2192;
+endsnippet
+
+snippet left "Left (left)"
+&#x2190;
+endsnippet
+
+snippet option "Option (option)"
+&#x2325;
+endsnippet
+
+#######################
+# Conditional inserts #
+#######################
+snippet ! "IE Conditional Comment: Internet Explorer 5_0 only"
+<!--[if IE 5.0]>${1:IE Conditional Comment: Internet Explorer 5.0 only }<![endif]-->$0
+endsnippet
+
+snippet ! "IE Conditional Comment: Internet Explorer 5_5 only"
+<!--[if IE 5.5000]>${1:IE Conditional Comment: Internet Explorer 5.5 only }<![endif]-->$0
+endsnippet
+
+snippet ! "IE Conditional Comment: Internet Explorer 5_x"
+<!--[if lt IE 6]>${1:IE Conditional Comment: Internet Explorer 5.x      }<![endif]-->$0
+endsnippet
+
+snippet ! "IE Conditional Comment: Internet Explorer 6 and below"
+<!--[if lte IE 6]>${1:IE Conditional Comment: Internet Explorer 6 and below }<![endif]-->$0
+endsnippet
+
+snippet ! "IE Conditional Comment: Internet Explorer 6 only"
+<!--[if IE 6]>${1:IE Conditional Comment: Internet Explorer 6 only   }<![endif]-->$0
+endsnippet
+
+snippet ! "IE Conditional Comment: Internet Explorer 7+"
+<!--[if gte IE 7]>${1:IE Conditional Comment: Internet Explorer 7 and above }<![endif]-->$0
+endsnippet
+
+snippet ! "IE Conditional Comment: Internet Explorer"
+<!--[if IE]>${1:       IE Conditional Comment: Internet Explorer          }<![endif]-->$0
+endsnippet
+
+snippet ! "IE Conditional Comment: NOT Internet Explorer"
+<!--[if !IE]><!-->${1:  IE Conditional Comment: NOT Internet Explorer      }<!-- <![endif]-->$0
+endsnippet
+
+#############
+# HTML TAGS #
+#############
+snippet input "Input with Label"
+<label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}">$1</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="$5"${6: id="${7:$2}"}`!p x(snip)`>
+
+endsnippet
+
+snippet input "XHTML   <input>"
+<input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}`!p x(snip)`>
+endsnippet
+
+
+snippet opt "Option"
+<option${1: value="${2:option}"}>${3:$2}</option>
+endsnippet
+
+snippet select "Select Box"
+<select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: onchange="${6:}"}${7: size="${8:1}"}}>
+	<option${9: value="${10:option1}"}>${11:$10}</option>
+	<option${12: value="${13:option2}"}>${14:$13}</option>${15:}
+	$0
+</select>
+endsnippet
+
+
+snippet textarea "XHTML   <textarea>"
+<textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">$0</textarea>
+endsnippet
+
+snippet mailto "XHTML <a mailto: >"
+<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
+endsnippet
+
+snippet base "XHTML <base>"
+<base href="$1"${2: target="$3"}`!p x(snip)`>
+endsnippet
+
+snippet body "XHTML <body>"
+<body id="${1:`!p
+snip.rv = snip.fn and 'Hallo' or 'Nothin'
+`}"${2: onload="$3"}>
+	$0
+</body>
+endsnippet
+
+snippet div "XHTML <div>"
+<div`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`>
+   $0
+</div>
+endsnippet
+
+snippet form "XHTML <form>"
+<form action="${1:`!p
+snip.rv = (snip.basename or 'unnamed') + '_submit'
+`}" method="${2:get}" accept-charset="utf-8">
+	$0
+
+	<p><input type="submit" value="Continue →"`!p x(snip)`></p>
+</form>
+endsnippet
+
+snippet h1 "XHTML <h1>"
+<h1 id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}">${1}</h1>
+endsnippet
+
+snippet head "XHTML <head>"
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8"`!p x(snip)`>
+	<title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
+	$0
+</head>
+endsnippet
+
+snippet link "XHTML <link>"
+<link rel="${1:stylesheet}" href="${2:/css/master.css}" type="text/css" media="${3:screen}" title="${4:no title}" charset="${5:utf-8}"`!p x(snip)`>
+endsnippet
+
+snippet meta "XHTML <meta>"
+<meta name="${1:name}" content="${2:content}"`!p x(snip)`>
+endsnippet
+
+snippet scriptsrc "XHTML <script src...>"
+<script src="$1" type="text/javascript" charset="${3:utf-8}"></script>
+endsnippet
+
+snippet script "XHTML <script>"
+<script type="text/javascript" charset="utf-8">
+	$0
+</script>
+endsnippet
+
+snippet style "XHTML <style>"
+<style type="text/css" media="screen">
+	$0
+</style>
+endsnippet
+
+snippet table "XHTML <table>"
+<table border="${1:0}"${2: cellspacing="${3:5}" cellpadding="${4:5}"}>
+	<tr><th>${5:Header}</th></tr>
+	<tr><td>${0:Data}</td></tr>
+</table>
+endsnippet
+
+snippet a "Link"
+<a href="${1:http://www.${2:url.com}}"${3: target="_blank"}>${4:Anchor Text}</a>
+endsnippet
+
+snippet p "paragraph"
+<p>$0</p>
+endsnippet
+
+snippet li "list item"
+<li></li>
+endsnippet
+
+snippet ul "unordered list"
+<ul>
+$0
+</ul>
+endsnippet
+
+snippet td "table cell"
+<td>$0</td>
+endsnippet
+
+snippet tr "table row"
+<tr>$0</tr>
+endsnippet
+
+snippet title "XHTML <title>"
+<title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
+endsnippet
+
+snippet fieldset "Fieldset"
+<fieldset id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}" ${2:class="${3:}"}>
+	<legend>$1</legend>
+	
+	$0
+</fieldset>
+endsnippet
+
+snippet movie "Embed QT movie (movie)" b
+<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab">
+	<param name="src" value="$1"`!p x(snip)`>
+	<param name="controller" value="$4"`!p x(snip)`>
+	<param name="autoplay" value="$5"`!p x(snip)`>
+	<embed src="${1:movie.mov}"
+		width="${2:320}" height="${3:240}"
+		controller="${4:true}" autoplay="${5:true}"
+		scale="tofit" cache="true"
+		pluginspage="http://www.apple.com/quicktime/download/"
+	`!p x(snip)`>
+</object>
+endsnippet
+
+snippet html5 "HTML5 Template"
+<!DOCTYPE html>
+<html>
+<head>
+    <title>${1}</title>
+    <meta charset="utf-8" />
+</head>
+<body>
+    <header>
+        ${2}
+    </header>
+    <footer>
+        ${4}
+    </footer>
+</body>
+</html>
+endsnippet
+# vim:ft=snippets:
diff --git a/UltiSnips/htmldjango.snippets b/UltiSnips/htmldjango.snippets
new file mode 100644
index 000000000..9df5f7884
--- /dev/null
+++ b/UltiSnips/htmldjango.snippets
@@ -0,0 +1 @@
+extends html, django
diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
new file mode 100644
index 000000000..6e1b3ffe3
--- /dev/null
+++ b/UltiSnips/java.snippets
@@ -0,0 +1,212 @@
+###########################################################################
+#                            TEXTMATE SNIPPETS                            #
+###########################################################################
+
+# Many of the snippets here use a global option called
+# "g:ultisnips_java_brace_style" which, if set to "nl" will put a newline
+# before '{' braces.
+
+global !p
+def nl(snip):
+    if snip.opt("g:ultisnips_java_brace_style", "") == "nl":
+        snip += ""
+    else:
+        snip.rv += " "
+endglobal
+
+snippet ab "abstract" b
+abstract 
+endsnippet
+
+snippet as "assert" b
+assert ${1:test}${2/(.+)/(?1: \: ")/}${2:Failure message}${2/(.+)/(?1:")/};$0
+endsnippet
+
+snippet br "break"
+break;
+
+endsnippet
+
+snippet cs "case" b
+case $1:
+	$2
+$0
+endsnippet
+
+snippet ca "catch" b
+catch (${1:Exception} ${2:e})`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet cl "class" b
+class ${1:`!p
+snip.rv = snip.basename or "untitled"`} ${2:extends ${3:Parent} }${4:implements ${5:Interface} }{
+	$0
+}
+endsnippet
+
+snippet cos "constant string" b
+static public final String ${1:var} = "$2";$0
+endsnippet
+
+snippet co "constant" b
+static public final ${1:String} ${2:var} = $3;$0
+endsnippet
+
+snippet de "default" b
+default:
+	$0
+endsnippet
+
+snippet elif "else if" b
+else if ($1)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet /el(se)?/ "else" br
+else`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet fi "final" b
+final 
+endsnippet
+
+snippet fore "for (each)" b
+for ($1 : $2)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet for "for" b
+for ($1; $2; $3)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet if "if" b
+if ($1)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet imt "import junit_framework_TestCase;"  b
+import junit.framework.TestCase;
+$0
+endsnippet
+
+snippet im "import"  b
+import 
+endsnippet
+
+snippet in "interface" b
+interface ${1:`!p snip.rv = snip.basename or "untitled"`} ${2:extends ${3:Parent} }{
+	$0
+}
+endsnippet
+
+snippet j.b "java_beans_" i
+java.beans.
+endsnippet
+
+snippet j.i "java_io" i
+java.io.
+endsnippet
+
+snippet j.m "java_math" i
+java.math.
+endsnippet
+
+snippet j.n "java_net_" i
+java.net.
+endsnippet
+
+snippet j.u "java_util_"  i
+java.util.
+endsnippet
+
+snippet main "method (main)" b
+public static void main(String[] args)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet m "method" b
+${1:void} ${2:method}($3) ${4:throws $5 }{
+	$0
+}
+
+endsnippet
+
+snippet pa "package" b
+package 
+endsnippet
+
+snippet p "print" b
+System.out.print($1);$0
+endsnippet
+
+snippet pl "println"  b
+System.out.println($1);$0
+endsnippet
+
+snippet pr "private" b
+private 
+endsnippet
+
+snippet po "protected" b
+protected 
+endsnippet
+
+snippet pu "public" b
+public 
+endsnippet
+
+snippet re "return" b
+return 
+endsnippet
+
+snippet st "static"
+static 
+endsnippet
+
+snippet sw "switch" b
+switch ($1)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet sy "synchronized"
+synchronized 
+endsnippet
+
+snippet tc "test case"
+public class ${1:`!p snip.rv = snip.basename or "untitled"`} extends ${2:TestCase}`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet t "test" b
+public void test${1:Name}() throws Exception`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet th "throw" b
+throw $0
+endsnippet
+
+snippet v "variable" b
+${1:String} ${2:var}${3: = ${0:null}};
+endsnippet
+
+snippet wh "while" b
+while ($1)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
new file mode 100644
index 000000000..e4e7f7ab6
--- /dev/null
+++ b/UltiSnips/javascript.snippets
@@ -0,0 +1,65 @@
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet get "Get Elements"
+getElement${1/(T)|.*/(?1:s)/}By${1:T}${1/(T)|(I)|.*/(?1:agName)(?2:d)/}('$2')
+endsnippet
+
+snippet '':f "object method string"
+'${1:${2:#thing}:${3:click}}': function(element){
+	$0
+}${10:,}
+endsnippet
+
+snippet :f "Object Method"
+${1:method_name}: function(${3:attribute}){
+	$0
+}${10:,}
+endsnippet
+
+snippet :, "Object Value JS"
+${1:value_name}:${0:value},
+endsnippet
+
+snippet : "Object key key: 'value'"
+${1:key}: ${2:"${3:value}"}${4:, }
+endsnippet
+
+snippet proto "Prototype (proto)"
+${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) ,,{
+	${0:// body...}
+};
+ 
+endsnippet
+
+snippet for "for (...) {...} (faster)"
+for (var ${2:i} = ${1:Things}.length - 1; $2 >= 0; $2--){
+	${3:$1[$2]}$0
+};
+endsnippet
+
+snippet for "for (...) {...}"
+for (var ${2:i}=0; $2 < ${1:Things}.length; $2++) {
+	${3:$1[$2]}$0
+};
+endsnippet
+
+snippet fun "function (fun)"
+function ${1:function_name} (${2:argument}) {
+	${0:// body...}
+}
+endsnippet
+
+snippet ife "if ___ else"
+if (${1:true}) {$0} else{};
+endsnippet
+
+snippet if "if"
+if (${1:true}) {$0};
+endsnippet
+
+snippet timeout "setTimeout function"
+setTimeout(function() {$0}${2:}, ${1:10});
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/javascript_jasmine.snippets b/UltiSnips/javascript_jasmine.snippets
new file mode 100644
index 000000000..49e38a35d
--- /dev/null
+++ b/UltiSnips/javascript_jasmine.snippets
@@ -0,0 +1,168 @@
+#
+# JavaScript versions -- from the TextMate bundle + some additions
+# for jasmine-jquery matchers
+#
+extends javascript
+
+snippet des "Describe (js)" b
+describe('${1:description}', function() {
+	$0
+});
+endsnippet
+
+snippet it "it (js)" b
+it('${1:description}', function() {
+	$0
+});
+endsnippet
+
+snippet bef "before each (js)" b
+beforeEach(function() {
+	$0
+});
+endsnippet
+
+snippet aft "after each (js)" b
+afterEach(function() {
+	$0
+});
+endsnippet
+
+snippet any "any (js)" b
+jasmine.any($1)
+endsnippet
+
+snippet ru "runs (js)" b
+runs(function() {
+	$0
+});
+endsnippet
+
+snippet wa "waits (js)" b
+waits($1);
+endsnippet
+
+snippet ex "expect (js)" b
+expect(${1:target})$0;
+endsnippet
+
+snippet ee "expect to equal (js)" b
+expect(${1:target}).toEqual(${2:value});
+endsnippet
+
+snippet em "expect to match (js)" b
+expect(${1:target}).toMatch(${2:pattern});
+endsnippet
+
+snippet eha "expect to have attribute (js)" b
+expect(${1:target}).toHaveAttr('${2:attr}'${3:, '${4:value}'});
+endsnippet
+
+snippet et "expect to be truthy (js)" b
+expect(${1:target}).toBeTruthy();
+endsnippet
+
+snippet ef "expect to be falsy (js)" b
+expect(${1:target}).toBeFalsy();
+endsnippet
+
+snippet ed "expect to be defined (js)" b
+expect(${1:target}).toBeDefined();
+endsnippet
+
+snippet en "expect to be null (js)" b
+expect(${1:target}).toBeNull();
+endsnippet
+
+snippet ec "expect to contain (js)" b
+expect(${1:target}).toContain(${2:value});
+endsnippet
+
+snippet ev "expect to be visible (js)" b
+expect(${1:target}).toBeVisible();
+endsnippet
+
+snippet eh "expect to be hidden (js)" b
+expect(${1:target}).toBeHidden();
+endsnippet
+
+snippet notx "expect not (js)" b
+expect(${1:target}).not$0;
+endsnippet
+
+snippet note "expect not to equal (js)" b
+expect(${1:target}).not.toEqual(${2:value});
+endsnippet
+
+snippet notm "expect not to match (js)" b
+expect(${1:target}).not.toMatch(${2:pattern});
+endsnippet
+
+snippet notha "expect to not have attribute (js)" b
+expect(${1:target}).not.toHaveAttr('${2:attr}'${3:, '${4:value}'});
+endsnippet
+
+snippet nott "expect not to be truthy (js)" b
+expect(${1:target}).not.toBeTruthy();
+endsnippet
+
+snippet notf "expect not to be falsy (js)" b
+expect(${1:target}).not.toBeFalsy();
+endsnippet
+
+snippet notd "expect not to be defined (js)" b
+expect(${1:target}).not.toBeDefined();
+endsnippet
+
+snippet notn "expect not to be null (js)" b
+expect(${1:target}).not.toBeNull();
+endsnippet
+
+snippet notc "expect not to contain (js)" b
+expect(${1:target}).not.toContain(${2:value});
+endsnippet
+
+snippet notv "expect not to be visible (js)" b
+expect(${1:target}).not.toBeVisible();
+endsnippet
+
+snippet noth "expect not to be hidden (js)" b
+expect(${1:target}).not.toBeHidden();
+endsnippet
+
+snippet s "spy on (js)" b
+spyOn(${1:object}, '${2:method}')$0;
+endsnippet
+
+snippet sr "spy on and return (js)" b
+spyOn(${1:object}, '${2:method}').andReturn(${3:arguments});
+endsnippet
+
+snippet st "spy on and throw (js)" b
+spyOn(${1:object}, '${2:method}').andThrow(${3:exception});
+endsnippet
+
+snippet sct "spy on and call through (js)" b
+spyOn(${1:object}, '${2:method}').andCallThrough();
+endsnippet
+
+snippet scf "spy on and call fake (js)" b
+spyOn(${1:object}, '${2:method}').andCallFake(${3:function});
+endsnippet
+
+snippet esc "expect was called (js)" b
+expect(${1:target}).wasCalled();
+endsnippet
+
+snippet escw "expect was called with (js)" b
+expect(${1:target}).wasCalledWith(${2:arguments});
+endsnippet
+
+snippet notsc "expect was not called (js)" b
+expect(${1:target}).wasNotCalled();
+endsnippet
+
+snippet noscw "expect was not called with (js)" b
+expect(${1:target}).wasNotCalledWith(${2:arguments});
+endsnippet
+
diff --git a/UltiSnips/jinja2.snippets b/UltiSnips/jinja2.snippets
new file mode 100644
index 000000000..6fef6edfa
--- /dev/null
+++ b/UltiSnips/jinja2.snippets
@@ -0,0 +1,209 @@
+
+# http://jinja.pocoo.org/
+
+# jinja2 is a full featured template engine for Python. It has full
+# unicode support, an optional integrated sandboxed execution
+# environment, widely used and BSD licensed.
+
+# possible extends:
+#extends html
+
+
+snippet block "block" b
+{% block ${1:name} %}
+    $2
+{% endblock $1 %}
+endsnippet
+
+
+snippet {{ "variable" b
+{{ $1 }}
+endsnippet
+
+
+snippet {# "comment" b
+{# $1 #}
+endsnippet
+
+
+snippet # "comment" b
+{# $1 #}
+endsnippet
+
+
+snippet raw "escaped block" b
+{% raw %}
+    $1
+{% endraw %}
+endsnippet
+
+
+snippet extends "extends" b
+{% extends "${1:template}" %}
+endsnippet
+
+
+snippet include "include" b
+{% include "${1:template}" %}
+endsnippet
+
+
+snippet import "import" b
+{% import "${1:template}" %}
+endsnippet
+
+
+snippet from "from/import/as" b
+{% from "${1:template}" import ${2:name}${3: as ${4:$2}} %}
+endsnippet
+
+
+snippet filter "filter" b
+{% filter ${1:filter} %}
+    $2
+{% endfilter %}
+endsnippet
+
+
+# Being able to quickly remove the whole 'else' block seems faster to me than
+# choosing between 'for' and 'for/else' snippets from the menu.
+# snippet for "for" b
+# {% for ${1:item} in ${2:sequence} %}
+#     $3${4:
+# {% else %}
+#     $5}
+# {% endfor %}
+# endsnippet
+
+
+snippet for "for" b
+{% for ${1:item} in ${2:sequence} %}
+    $3
+{% endfor %}
+endsnippet
+
+
+snippet for "for/else" b
+{% for ${1:item} in ${2:sequence} %}
+    $3
+{% else %}
+    $4
+{% endfor %}
+endsnippet
+
+
+snippet if "if" b
+{% if ${1:expr} %}
+    $2
+{% endif %}
+endsnippet
+
+
+snippet if "if/else" b
+{% if ${1:expr} %}
+    $2
+{% else %}
+    $3
+{% endif %}
+endsnippet
+
+
+snippet if "if/elif/else" b
+{% if ${1:expr} %}
+    $2
+{% elif %}
+    $3
+{% else %}
+    $4
+{% endif %}
+endsnippet
+
+
+snippet macro "macro" b
+{% macro ${1:name}(${2:args}) %}
+    $3
+{% endmacro %}
+endsnippet
+
+
+snippet call "call" b
+{% call ${1:name}(${2:args}) %}
+    $3
+{% endcall %}
+endsnippet
+
+
+snippet set "set" b
+{% set ${1:name} = ${2:'value'} %}
+endsnippet
+
+
+snippet trans "translation" b
+{% trans %}
+    $1
+{% endtrans %}
+endsnippet
+
+
+snippet with "with" b
+{% with %}
+    $1
+{% endwith %}
+endsnippet
+
+
+snippet autoescape "autoescape" b
+{% autoescape ${1:true} %}
+    $2
+{% endautoescape %}
+endsnippet
+
+# Filters 
+# @todo: expand only when snippet is preceeded by a |
+
+snippet batch "batch items" w
+batch(linecount=$1, fill_with=${2:None})
+endsnippet
+
+
+snippet dictsort "sort and yield (key, value) pairs" w
+dictsort(case_sensitive=${1:False}, by=${2:'key'})
+endsnippet
+
+
+snippet round "round number" w
+round(precision=${1:0}, method=${2:'common|ceil|floor'})
+endsnippet
+
+
+snippet urlize "convert plain-text url to <a/>" w
+urlize(trim_url_limit=${1:None}, nofollow=${2:False})
+endsnippet
+
+
+snippet wordwrap "wordwrap" w
+wordwrap(width=${1:79}, break_long_words=${2:True})
+endsnippet
+
+
+snippet truncate "truncate" w
+truncate(lenght=${1:79}, killwords=${2:False}, end=${3:'...''})
+endsnippet
+
+
+snippet sum "sum of sequence of numbers + start" w
+sum(attribute=${1:None}, start=${2:0})
+endsnippet
+
+
+snippet sort "sort an iterable" w
+sort(reverse=${1:False}, case_sensitive=${2:False}, attribute=${3:None})
+endsnippet
+
+
+snippet indent "indent" w
+indent(width=${1:4}, indentfirst=${2:False})
+endsnippet
+
+
+# vim:ft=snippets:
diff --git a/UltiSnips/json.snippets b/UltiSnips/json.snippets
new file mode 100644
index 000000000..81e65611d
--- /dev/null
+++ b/UltiSnips/json.snippets
@@ -0,0 +1,19 @@
+snippet s "String" b
+"${1:key}": "${0:value}",
+endsnippet
+
+snippet n "number" b
+"${1:key}": ${0:value},
+endsnippet
+
+snippet a "Array" b
+[
+   ${VISUAL}$0
+],
+endsnippet
+snippet o "Object" b
+{
+   ${VISUAL}$0
+},
+endsnippet
+
diff --git a/UltiSnips/lua.snippets b/UltiSnips/lua.snippets
new file mode 100644
index 000000000..1b82a245b
--- /dev/null
+++ b/UltiSnips/lua.snippets
@@ -0,0 +1,37 @@
+#################################
+# Snippets for the Lua language #
+#################################
+snippet #! "Shebang header" b
+#!/usr/bin/env lua
+$0
+endsnippet
+
+snippet !fun(ction)?! "New function" br
+function ${1:new_function}(${2:args})
+   $0
+end
+endsnippet
+
+snippet forp "pair for loop" b
+for ${1:name},${2:val} in pairs(${3:table_name}) do
+   $0
+end
+endsnippet
+
+snippet fori "ipair for foop" b
+for ${1:idx},${2:val} in ipairs(${3:table_name}) do
+   $0
+end
+endsnippet
+
+snippet for "numeric for loop" b
+for ${1:i}=${2:first},${3:last}${4/^..*/(?0:,:)/}${4:step} do
+   $0
+end
+endsnippet
+
+snippet local "local x = 1"
+local ${1:x} = ${0:1}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/mako.snippets b/UltiSnips/mako.snippets
new file mode 100644
index 000000000..92a7be38a
--- /dev/null
+++ b/UltiSnips/mako.snippets
@@ -0,0 +1,90 @@
+#################
+# From snipmate #
+#################
+snippet def "definition" b
+<%def name="${1:name}">
+	${2:}
+</%def>
+endsnippet
+
+snippet call "call" b
+<%call expr="${1:name}">
+	${2:}
+</%call>
+endsnippet
+
+snippet doc "doc" b
+<%doc>
+	${1:}
+</%doc>
+endsnippet
+
+snippet text "text" b
+<%text>
+	${1:}
+</%text>
+endsnippet
+
+snippet for "for" b
+% for ${1:i} in ${2:iter}:
+	${3:}
+% endfor
+endsnippet
+
+snippet if "if " b
+% if ${1:condition}:
+	${2:}
+% endif
+endsnippet
+
+snippet if "if/else" b
+% if ${1:condition}:
+	${2:}
+% else:
+	${3:}
+% endif
+endsnippet
+
+snippet try "try" b
+% try:
+	${1:}
+% except${2:}:
+	${3:pass}
+% endtry
+endsnippet
+
+snippet wh "wh" b
+% while ${1:}:
+	${2:}
+% endwhile
+endsnippet
+
+snippet $ "$" i
+${${1:}}
+endsnippet
+
+snippet <% "<%" b
+<% ${1:} %>
+endsnippet
+
+snippet <!% "<!%" b
+<!% ${1:} %>
+endsnippet
+
+snippet inherit "inherit" b
+<%inherit file="${1:filename}" />
+endsnippet
+
+snippet include "include" b
+<%include file="${1:filename}" />
+endsnippet
+
+snippet namespace "namespace" b
+<%namespace file="${1:name}" />
+endsnippet
+
+snippet page "page" b
+<%page args="${1:}" />
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
new file mode 100644
index 000000000..c3189b8a1
--- /dev/null
+++ b/UltiSnips/markdown.snippets
@@ -0,0 +1,44 @@
+###########################################################################
+#                          SNIPPETS for MARKDOWN                          #
+###########################################################################
+
+###########################
+# Sections and Paragraphs #
+###########################
+snippet sec "Section" b
+# ${1:Section Name} #
+$0
+endsnippet
+
+snippet ssec "Sub Section" b
+## ${1:Section Name} ##
+$0
+endsnippet
+
+snippet sssec "SubSub Section" b
+### ${1:Section Name} ###
+$0
+endsnippet
+
+snippet par "Paragraph" b
+#### ${1:Paragraph Name} ####
+$0
+endsnippet
+
+snippet spar "Paragraph" b
+##### ${1:Paragraph Name} #####
+$0
+endsnippet
+
+################
+# Common stuff #
+################
+snippet link "Link to something"
+[${1:${VISUAL:Text}}](${3:http://${2:www.url.com}})$0
+endsnippet
+
+snippet img "Image"
+![${1:pic alt}](${2:path}${3/.+/ "/}${3:opt title}${3/.+/"/})$0
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/objc.snippets b/UltiSnips/objc.snippets
new file mode 100644
index 000000000..0c6766417
--- /dev/null
+++ b/UltiSnips/objc.snippets
@@ -0,0 +1,270 @@
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+
+snippet imp "#import (imp)" b
+#import "${1:`!p snip.rv = re.sub(r'\..*$', '.h', fn)`}"
+endsnippet
+
+snippet Imp "#import <> (Imp)"
+#import <${1:Cocoa/Cocoa.h}>
+endsnippet
+
+snippet cl "020 Class (objc)"
+@interface ${1:`!p 
+if len(fn):
+   snip.rv = re.sub(r'\..*$', '', fn)
+else:
+   snip.rv = "object"
+`} : ${2:NSObject}
+{
+}
+@end
+
+@implementation $1
+- (id)init
+{
+	if((self = [super init]))
+	{$0
+	}
+	return self;
+}
+@end
+endsnippet
+
+snippet array "NSArray (array)"
+NSMutableArray *${1:array} = [NSMutableArray array];
+endsnippet
+
+snippet dict "NSDictionary (dict)"
+NSMutableDictionary *${1:dict} = [NSMutableDictionary dictionary];
+endsnippet
+
+snippet forarray "for NSArray loop (forarray)"
+unsigned int	${1:object}Count = [${2:array} count];
+
+for(unsigned int index = 0; index < $1Count; index += 1)
+{
+	${3:id}	$1 = [$2 objectAtIndex:index];
+	$0
+}
+endsnippet
+
+snippet objacc "Object Accessors (objacc)"
+- (${1:id})${2:thing}
+{
+	return $2;
+}
+
+- (void)set${2/./\u$0/}:($1)aValue
+{
+	$0${1/( \*)?$/(?1:$1: )/}old${2/./\u$0/} = $2;
+	$2 = [aValue retain];
+	[old${2/./\u$0/} release];
+}
+endsnippet
+
+snippet sel "@selector"
+@selector(${1:method}:)
+endsnippet
+
+snippet cdacc "CoreData Accessors Implementation"
+- (${1:id})${2:attribute}
+{
+	[self willAccessValueForKey:@"$2"];
+	$1 value = [self primitiveValueForKey:@"$2"];
+	[self didAccessValueForKey:@"$2"];
+	return value;
+}
+
+- (void)set${2/./\u$0/}:($1)aValue
+{
+	[self willChangeValueForKey:@"$2"];
+	[self setPrimitiveValue:aValue forKey:@"$2"];
+	[self didChangeValueForKey:@"$2"];
+}
+endsnippet
+
+snippet delegate "Delegate Responds to Selector"
+if([${1:[self delegate]} respondsToSelector:@selector(${2:selfDidSomething:})])
+	[$1 ${3:${2/((^\s*([A-Za-z0-9_]*:)\s*)|(:\s*$)|(:\s*))/(?2:$2self :\:<>)(?4::)(?5: :)/g}}];
+
+endsnippet
+
+snippet thread "Detach New NSThread"
+[NSThread detachNewThreadSelector:@selector(${1:method}:) toTarget:${2:aTarget} withObject:${3:anArgument}]
+endsnippet
+
+snippet ibo "IBOutlet (ibo)"
+IBOutlet ${1:NSSomeClass} *${2:${1/^[A-Z](?:[A-Z]+|[a-z]+)([A-Z]\w*)/\l$1/}};
+endsnippet
+
+snippet I "Initialize Implementation (I)"
++ (void)initialize
+{
+	[[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
+		$0@"value", @"key",
+		nil]];
+}
+endsnippet
+
+snippet bind "Key:value binding (bind)"
+bind:@"${1:binding}" toObject:${2:observableController} withKeyPath:@"${3:keyPath}" options:${4:nil}
+endsnippet
+
+snippet arracc "LoD array (arracc)"
+- (void)addObjectTo${1:Things}:(${2:id})anObject
+{
+	[${3:${1/./\l$0/}} addObject:anObject];
+}
+
+- (void)insertObject:($2)anObject in$1AtIndex:(unsigned int)i 
+{
+	[$3 insertObject:anObject atIndex:i];
+}
+
+- ($2)objectIn$1AtIndex:(unsigned int)i
+{
+	return [$3 objectAtIndex:i];
+}
+
+- (unsigned int)indexOfObjectIn$1:($2)anObject
+{
+	return [$3 indexOfObject:anObject];
+}
+
+- (void)removeObjectFrom$1AtIndex:(unsigned int)i
+{
+	[$3 removeObjectAtIndex:i];
+}
+
+- (unsigned int)countOf$1
+{
+	return [$3 count];
+}
+
+- (NSArray *${1/./\l$0/}
+{
+	return $3;
+}
+
+- (void)set$1:(NSArray *)new$1
+{
+	[$3 setArray:new$1];
+}
+endsnippet
+
+snippet arracc "LoD array interface (arracc)"
+- (void)addObjectTo${1:Things}:(${2:id})anObject;
+- (void)insertObject:($2)anObject in$1AtIndex:(unsigned int)i;
+- ($2)objectIn$1AtIndex:(unsigned int)i;
+- (unsigned int)indexOfObjectIn$1:($2)anObject;
+- (void)removeObjectFrom$1AtIndex:(unsigned int)i;
+- (unsigned int)countOf$1;
+- (NSArray *)${1/./\l$0/};
+- (void)set$1:(NSArray *)new$1;
+endsnippet
+
+snippet focus "Lock Focus"
+[self lockFocus];
+$0
+[self unlockFocus];
+endsnippet
+
+snippet pool "NSAutoreleasePool (pool)"
+NSAutoreleasePool *pool = [NSAutoreleasePool new];
+$0
+[pool drain];
+endsnippet
+
+snippet log "NSLog (log) 2"
+NSLog(@"$1"${1/[^%]*(%)?.*/(?1:, :\);)/}$2${1/[^%]*(%)?.*/(?1:\);)/}
+endsnippet
+
+snippet alert "NSRunAlertPanel (alert)"
+int choice = NSRunAlertPanel(@"${1:Something important!}", @"${2:Something important just happend, and now I need to ask you, do you want to continue?}", @"${3:Continue}", @"${4:Cancel}", nil);
+if(choice == NSAlertDefaultReturn) // "$3"
+{
+	$0;
+}
+else if(choice == NSAlertAlternateReturn) // "$4"
+{
+	
+}
+endsnippet
+
+snippet format "NSString stringWithFormat (format)"
+[NSString stringWithFormat:@"$1", $2]$0
+endsnippet
+
+snippet objacc "Object Accessors Interface (objacc)"
+- (${1:id})${2:thing};
+- (void)set${2/./\u$0/}:($1)aValue;
+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/}};
+endsnippet
+
+snippet getprefs "Read from defaults (getprefs)"
+[[NSUserDefaults standardUserDefaults] objectForKey:${1:key}];
+endsnippet
+
+snippet obs "Register for Notification"
+[[NSNotificationCenter defaultCenter] addObserver:${1:self} selector:@selector(${3:${2/^([A-Z]{2})?(.+?)(Notification)?$/\l$2/}}:) name:${2:NSWindowDidBecomeMainNotification} object:${4:nil}];
+endsnippet
+
+snippet responds "Responds to Selector"
+if ([${1:self} respondsToSelector:@selector(${2:someSelector:})])
+{
+    [$1 ${3:${2/((:\s*$)|(:\s*))/:<>(?3: )/g}}];
+}
+endsnippet
+
+snippet gsave "Save and Restore Graphics Context (gsave)"
+[NSGraphicsContext saveGraphicsState];
+$0
+[NSGraphicsContext restoreGraphicsState];
+
+endsnippet
+
+snippet acc "Scalar Accessors (acc)"
+- (${1:unsigned int})${2:thing}
+{
+	return ${3:$2};
+}
+
+- (void)set${2/./\u$0/}:(${1:unsigned int})new${2/./\u$0/}
+{
+	$3 = new${2/./\u$0/};
+}
+endsnippet
+
+snippet acc "Scalar Accessors Interface (acc)"
+- (${1:unsigned int})${2:thing};
+- (void)set${2/./\u$0/}:($1)new${2/./\u$0/};
+endsnippet
+
+snippet stracc "String Accessors (stracc)"
+- (NSString *)${1:thing}
+{
+	return ${2:$1};
+}
+
+- (void)set${1/.*/\u$0/}:(NSString *)/})${3:a${1/.*/\u$0/}}
+{
+	$3 = [$3 copy];
+	[$2 release];
+	$2 = $3;
+}
+endsnippet
+
+snippet syn "Synthesize"
+@synthesize ${1:property};
+endsnippet
+
+snippet setprefs "Write to defaults (setprefs)"
+[[NSUserDefaults standardUserDefaults] setObject:${1:object} forKey:${2:key}];
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/perl.snippets b/UltiSnips/perl.snippets
new file mode 100644
index 000000000..6a9e8f9d1
--- /dev/null
+++ b/UltiSnips/perl.snippets
@@ -0,0 +1,127 @@
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet ife "Conditional if..else (ife)"
+if ($1) {
+	${2:# body...}
+} else {
+	${3:# else...}
+}
+
+endsnippet
+
+snippet ifee "Conditional if..elsif..else (ifee)"
+if ($1) {
+	${2:# body...}
+} elsif ($3) {
+	${4:# elsif...}
+} else {
+	${5:# else...}
+}
+
+endsnippet
+
+snippet xunless "Conditional one-line (unless)"
+${1:expression} unless ${2:condition};
+
+endsnippet
+
+snippet xif "Conditional one-line (xif)"
+${1:expression} if ${2:condition};
+
+endsnippet
+
+snippet sub "Function (sub)"
+sub ${1:function_name} {
+	${2:# body...}
+}
+
+endsnippet
+
+snippet xfore "Loop one-line (xforeach)"
+${1:expression} foreach @${2:array};
+
+endsnippet
+
+snippet xwhile "Loop one-line (xwhile)"
+${1:expression} while ${2:condition};
+
+endsnippet
+
+snippet test "Test"
+#!/usr/bin/perl -w
+
+use strict;
+use Test::More tests => ${1:1};
+use ${2:ModuleName};
+
+ok(${3:assertion});
+
+endsnippet
+
+snippet class "class"
+package ${1:ClassName};
+
+${2:use base qw(${3:ParentClass});}${2/.+/\n\n/}sub new {
+	my $class = shift;
+	$class = ref $class if ref $class;
+	my $self = bless {}, $class;
+	$self;
+}
+
+1;
+
+endsnippet
+
+snippet eval "eval"
+eval {
+	${1:# do something risky...}
+};
+if ($@) {
+	${2:# handle failure...}
+}
+
+endsnippet
+
+snippet for "for"
+for (my $${1:var} = 0; $$1 < ${2:expression}; $$1++) {
+	${3:# body...}
+}
+
+endsnippet
+
+snippet fore "foreach"
+foreach ${1:my $${2:x}} (@${3:array}) {
+	${4:# body...}
+}
+
+endsnippet
+
+snippet if "if"
+if ($1) {
+	${2:# body...}
+}
+
+endsnippet
+
+snippet slurp "slurp"
+my $${1:var};
+{ local $/ = undef; local *FILE; open FILE, "<${2:file}"; $$1 = <FILE>; close FILE }
+
+endsnippet
+
+snippet unless "unless"
+unless ($1) {
+	${2:# body...}
+}
+
+endsnippet
+
+snippet while "while"
+while ($1) {
+	${2:# body...}
+}
+
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
new file mode 100644
index 000000000..40461d293
--- /dev/null
+++ b/UltiSnips/php.snippets
@@ -0,0 +1,258 @@
+## Snippets from SnipMate, taken from
+## https://github.com/scrooloose/snipmate-snippets.git
+
+snippet array "array"
+$${1:arrayName} = array('${2}' => ${3});${4}
+endsnippet
+
+snippet def "def"
+define('${1}'${2});${3}
+endsnippet
+
+snippet do "do"
+do {
+	${2:// code... }
+} while (${1:/* condition */});"
+endsnippet
+
+snippet doc_f "doc_f"
+/**
+ * $2
+ * @return ${4:void}
+ * @author ${5:`!v g:snips_author`}
+ **/
+${1:public }function ${2:someFunc}(${3})
+{${6}
+}
+endsnippet
+
+snippet doc_i "doc_i"
+/**
+ * $1
+ * @package ${2:default}
+ * @author ${3:`!v g:snips_author`}
+ **/
+interface ${1:someClass}
+{${4}
+} // END interface $1"
+endsnippet
+
+snippet else "else"
+else {
+	${1:// code...}
+}
+endsnippet
+
+snippet for "for"
+for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
+	${4:// code...}
+}
+endsnippet
+
+snippet foreachk "foreachk"
+foreach ($${1:variable} as $${2:key} => $${3:value}){
+	${4:// code...}
+}
+endsnippet
+
+snippet get "get"
+$_GET['${1}']${2}
+endsnippet
+
+snippet if "if"
+if (${1:/* condition */}) {
+	${2:// code...}
+}
+endsnippet
+
+snippet inc "inc"
+include '${1:file}';${2}
+endsnippet
+
+snippet log "log"
+error_log(var_export(${1}, true));${2}
+endsnippet
+
+snippet post "post"
+$_POST['${1}']${2}
+endsnippet
+
+snippet req1 "req1"
+require_once '${1:file}';${2}
+endsnippet
+
+snippet session "session"
+$_SESSION['${1}']${2}
+endsnippet
+
+snippet t "t"
+$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};${5}
+endsnippet
+
+snippet var "var"
+var_export(${1});${2}
+endsnippet
+
+snippet getter "PHP Class Getter" !b
+/*
+ * Getter for $1
+ */
+public function get${1/\w+\s*/\u$0/}() 
+{
+    return $this->$1;$2
+}
+$4
+endsnippet
+
+snippet setter "PHP Class Setter" !b
+/*
+ * Setter for $1
+ */
+public function set${1/\w+\s*/\u$0/}($$1)
+{
+    $this->$1 = $$1;$3
+    ${4:return $this;}
+}
+$0
+endsnippet
+
+snippet gs "PHP Class Getter Setter" !b
+protected $$1
+
+/*
+ * Getter for $1
+ */
+public function get${1/\w+\s*/\u$0/}() 
+{
+    return $this->$1;$2
+}
+
+/*
+ * Setter for $1
+ */
+public function set${1/\w+\s*/\u$0/}($$1)
+{
+    $this->$1 = $$1;$3
+    ${4:return $this;}
+}
+$0
+endsnippet
+
+snippet pub "Public function" !b
+public function ${1:name}(${2:$param})
+{
+    ${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pro "Protected function" !b
+protected function ${1:name}(${2:$param})
+{
+    ${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pri "Private function" !b
+private function ${1:name}(${2:$param})
+{
+    ${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pubs "Public static function" !b
+public static function ${1:name}(${2:$param})
+{
+    ${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pros "Protected static function" !b
+protected static function ${1:name}(${2:$param})
+{
+    ${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pris "Private static function" !b
+private static function ${1:name}(${2:$param})
+{
+    ${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet fu "Function snip" !b
+function ${1:name}(${2:$param}) 
+{
+    ${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+# :vim:ft=snippets
+
+snippet fore "Foreach loop"
+foreach ($${1:variable} as $${3:value}){
+    ${VISUAL}${4}
+}
+$0
+endsnippet
+
+snippet new "New class instance" !b
+$$1 = new $1($2);
+$0
+endsnippet
+
+
+snippet ife "if else"
+if (${1:/* condition */}) {
+    ${2:// code...}
+} else {
+    ${3:// code...}
+}
+$0
+endsnippet
+
+
+snippet class "Class declaration template" !b
+/**
+ * Class ${1:`!p snip.rv=snip.fn.capitalize().split('.')[0]`} 
+ * @author $2
+ */
+class $1
+{
+    public function ${3:__construct}(${4:$options})
+    {
+        ${4:// code}
+    }
+}
+$0
+endsnippet
+
+snippet pr "Dumb debug helper in HTML"
+echo '<pre>' . var_export($1, 1) . '</pre>';$0
+endsnippet
+
+snippet pc "Dumb debug helper in cli"
+var_export($1);$0
+endsnippet
+
+# Symfony 2 based snippets
+snippet sfa "Symfony 2 Controller action"
+/**
+* @Route("/${1:route_name}", name="$1")
+* @Template()
+*/
+public function $1Action($2)
+{
+    $3
+    return ${4:array();}$0
+}
+endsnippet
+
+# :vim:ft=snippets:
+
diff --git a/UltiSnips/puppet.snippets b/UltiSnips/puppet.snippets
new file mode 100644
index 000000000..68ae0fe44
--- /dev/null
+++ b/UltiSnips/puppet.snippets
@@ -0,0 +1,78 @@
+# Snippets for Puppet
+
+snippet /^class/ "Class declaration" r
+class ${1:name} {
+    ${0:# body}
+}
+endsnippet
+
+snippet File "Defaults for file" b
+File {
+    owner => ${1:username},
+    group => ${2:groupname},
+}
+endsnippet
+
+# Resource types
+snippet package "Package resource type" b
+package { "${1:name}":
+    ensure => ${2:installed},
+}
+endsnippet
+
+snippet file "File resource type" b
+file { "${1:name}":
+    source => "puppet://${2:path}",
+    mode   => ${3:mode},
+endsnippet
+
+snippet group "Group resource type" b
+group { "${1:groupname}":
+    ensure => ${3:present},
+    gid    => ${2:gid},
+endsnippet
+
+snippet user "user resource type" b
+group { "${1:username}":
+    ensure     => ${2:present},
+    uid        => ${3:uid},
+    gid        => ${4:gid},
+    comment    => ${5:gecos},
+    home       => ${6:homedirectory},
+    managehome => false,
+    require    => Group["${7:group"],
+endsnippet
+
+snippet exec "Exec resource type" b
+exec { "${1:command}":
+    refreshonly => true,
+}
+endsnippet
+
+snippet cron "Cron resource type" b
+cron { "${1:name}":
+    user    => ${2:user},
+    command => "${3:command}",
+    minute  => ${3:minute},
+    hour    => ${4:hour},
+}
+endsnippet
+
+snippet mount "Mount resource type" b
+mount { "${1:path}":
+    device  => "${2:/dev}",
+    fstype  => "${3:filesystem}",
+    ensure  => mounted,
+    options => "rw,errors=remount-ro",
+}
+endsnippet
+
+snippet service "Service resource type" b
+service { "${1:name}":
+    hasstatus => true,
+    enable    => true,
+    ensure    => running,
+}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
new file mode 100644
index 000000000..a770d2a98
--- /dev/null
+++ b/UltiSnips/python.snippets
@@ -0,0 +1,468 @@
+###########################################################################
+#                            TEXTMATE SNIPPETS                            #
+###########################################################################
+
+#! header
+snippet #! "Shebang header for python scripts" b
+#!/usr/bin/env python
+# encoding: utf-8
+$0
+endsnippet
+
+snippet ifmain "ifmain" b
+if __name__ == '__main__':
+	${1:main()}$0
+endsnippet
+
+
+##########
+# COMMON #
+##########
+
+# The smart def and smart class snippets use a global option called
+# "g:ultisnips_python_style" which, if set to "doxygen" will use doxygen
+# style comments in docstrings.
+
+global !p
+
+NORMAL  = 0x1
+DOXYGEN = 0x2
+SPHINX  = 0x3
+
+def get_args(arglist):
+    args = [arg.split('=')[0].strip() for arg in arglist.split(',') if arg]
+    args = [arg for arg in args if arg and arg != "self"]
+
+    return args
+
+
+def get_style(snip):
+    style = snip.opt("g:ultisnips_python_style", "normal")
+
+    if    style == "doxygen": return DOXYGEN
+    elif  style == "sphinx": return SPHINX
+    else: return NORMAL
+
+
+def format_arg(arg, style):
+    if style == DOXYGEN:
+        return "@param %s @todo" % arg
+    elif style == SPHINX:
+        return ":param %s: @todo" % arg
+    elif style == NORMAL:
+        return ":%s: @todo" % arg
+
+
+def format_return(style):
+    if style == DOXYGEN:
+        return "@return: @todo"
+    elif style in (NORMAL, SPHINX):
+        return ":returns: @todo"
+
+
+def write_docstring_args(args, snip):
+    if not args:
+        snip.rv += ' """'
+        return
+
+    snip.rv += '\n' + snip.mkline('', indent='')
+
+    style = get_style(snip)
+
+    for arg in args:
+        snip += format_arg(arg, style)
+
+
+def write_init_body(args, parents, snip):
+    parents = [p.strip() for p in parents.split(",")]
+    parents = [p for p in parents if p != 'object']
+
+    for p in parents:
+        snip += p + ".__init__(self)"
+
+    if parents:
+        snip.rv += '\n' + snip.mkline('', indent='')
+
+    for arg in args:
+        snip += "self._%s = %s" % (arg, arg)
+
+
+def write_slots_args(args, snip):
+    args = ['"%s"' % arg for arg in args]
+    snip += '__slots__ = (%s,)' % ', '.join(args)
+
+endglobal
+
+########################################
+# Class & Special Method Name Snippets #
+########################################
+
+snippet class "class with docstrings" b
+class ${1:MyClass}(${2:object}):
+	"""${3:Docstring for $1 }"""
+
+	def __init__(self$4):
+		"""${5:@todo: to be defined}`!p
+snip.rv = ""
+snip >> 2
+
+args = get_args(t[4])
+
+write_docstring_args(args, snip)
+if args:
+    snip.rv += '\n' + snip.mkline('', indent='')
+    snip += '"""'
+
+write_init_body(args, t[2], snip)
+`
+		$0
+endsnippet
+
+
+snippet slotclass "class with slots and docstrings" b
+class ${1:MyClass}(${2:object}):
+	"""${3:Docstring for $1 }"""
+`!p
+snip >> 1
+args = get_args(t[4])
+write_slots_args(args, snip)
+`
+
+	def __init__(self$4):
+		"""${5:@todo: to be defined}`!p
+snip.rv = ""
+snip >> 2
+
+args = get_args(t[4])
+
+write_docstring_args(args, snip)
+if args:
+    snip.rv += '\n' + snip.mkline('', indent='')
+    snip += '"""'
+
+write_init_body(args, t[2], snip)
+`
+		$0
+endsnippet
+
+
+snippet contain "methods for emulating a container type" b
+def __len__(self):
+	${1:pass}
+
+def __getitem__(self, key):
+	${2:pass}
+
+def __setitem__(self, key, value):
+	${3:pass}
+
+def __delitem__(self, key):
+	${4:pass}
+
+def __iter__(self):
+	${5:pass}
+
+def __reversed__(self):
+	${6:pass}
+
+def __contains__(self, item):
+	${7:pass}
+endsnippet
+
+
+snippet context "context manager methods" b
+def __enter__(self):
+	${1:pass}
+
+def __exit__(self, exc_type, exc_value, traceback):
+	${2:pass}
+endsnippet
+
+
+snippet attr "methods for customizing attribute access" b
+def __getattr__(self, name):
+	${1:pass}
+
+def __setattr__(self, name, value):
+	${2:pass}
+
+def __delattr__(self, name):
+	${3:pass}
+endsnippet
+
+
+snippet desc "methods implementing descriptors" b
+def __get__(self, instance, owner):
+	${1:pass}
+
+def __set__(self, instance, value):
+	${2:pass}
+
+def __delete__(self, instance):
+	${3:pass}
+endsnippet
+
+
+snippet cmp "methods implementing rich comparison"
+def __eq__(self, other):
+	${1:pass}
+
+def __ne__(self, other):
+	${2:pass}
+
+def __lt__(self, other):
+	${3:pass}
+
+def __le__(self, other):
+	${4:pass}
+
+def __gt__(self, other):
+	${5:pass}
+
+def __ge__(self, other):
+	${6:pass}
+
+def __cmp__(self, other):
+	${7:pass}
+endsnippet
+
+
+snippet repr "methods implementing string representation"
+def __repr__(self):
+	${1:pass}
+
+def __str__(self):
+	${2:pass}
+
+def __unicode__(self):
+	${3:pass}
+endsnippet
+
+
+# note: reflected operands and augmented arithmeitc assignements have been
+# intentionally ommited to reduce verbosity.
+snippet numeric "methods for emulating a numeric type" b
+def __add__(self, other):
+	${1:pass}
+
+def __sub__(self, other):
+	${2:pass}
+
+def __mul__(self, other):
+	${3:pass}
+
+def __div__(self, other):
+	${4:pass}
+
+def __truediv__(self, other):
+	${5:pass}
+
+def __floordiv__(self, other):
+	${6:pass}
+
+
+def __mod__(self, other):
+	${7:pass}
+
+def __divmod__(self, other):
+	${8:pass}
+
+def __pow__(self, other):
+	${9:pass}
+
+
+def __lshift__(self, other):
+	${10:pass}
+
+def __rshift__(self, other):
+	${11:pass}
+
+def __and__(self, other):
+	${12:pass}
+
+def __xor__(self, other):
+	${13:pass}
+
+def __or__(self, other):
+	${14:pass}
+
+
+def __neg__(self):
+	${15:pass}
+
+def __pos__(self):
+	${16:pass}
+
+def __abs__(self):
+	${17:pass}
+
+def __invert__(self):
+	${18:pass}
+
+
+def __complex__(self):
+	${19:pass}
+
+def __int__(self):
+	${20:pass}
+
+def __long__(self):
+	${21:pass}
+
+def __float__(self):
+	${22:pass}
+
+
+def __oct__(self):
+	${22:pass}
+
+def __hex__(self):
+	${23:pass}
+
+
+def __index__(self):
+	${24:pass}
+
+def __coerce__(self, other):
+	${25:pass}
+endsnippet
+
+snippet def "function with docstrings" b
+def ${1:function}(`!p
+if snip.indent:
+   snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
+	"""${4:@todo: Docstring for $1}`!p
+snip.rv = ""
+snip >> 1
+
+args = get_args(t[2])
+if args:
+   write_docstring_args(args, snip)
+
+style = get_style(snip)
+snip += format_return(style)
+snip.rv += '\n' + snip.mkline('', indent='')
+snip += '"""' `
+	${0:pass}
+endsnippet
+
+
+# doesn't expand when there is a word in front
+snippet /(^|(?<=\W))\./ "self." r
+self.
+endsnippet
+
+snippet from "from module import name" b
+from ${1:module} import ${2:Stuff}
+endsnippet
+
+
+##############
+# PROPERTIES #
+##############
+snippet roprop "Read Only Property" b
+@property
+def ${1:property}(self):
+	${2:return self._$1}$0
+endsnippet
+
+snippet rwprop "Read write property" b
+def ${1:property}():
+	${2/.+/(?0:""")/}${2:The RW property $1}`!p if t[2]:
+   snip.rv += '"""'
+   snip >> 1
+   snip += ""
+else:
+   snip.rv = ""`def fget(self):
+		return self._$1$0
+	def fset(self, value):
+		self._$1 = value
+	return locals()
+$1 = property(**$1())
+endsnippet
+
+
+##########################
+# Try / Except / Finally #
+##########################
+snippet try "Try / Except" b
+try:
+	${1:pass}
+except ${2:Exception}, ${3:e}:
+	${4:raise $3}
+endsnippet
+
+snippet try "Try / Except / Else" b
+try:
+	${1:pass}
+except ${2:Exception}, ${3:e}:
+	${4:raise $3}
+else:
+	${5:pass}
+endsnippet
+
+snippet try "Try / Except / Finally" b
+try:
+	${1:pass}
+except ${2:Exception}, ${3:e}:
+	${4:raise $3}
+finally:
+	${5:pass}
+endsnippet
+
+snippet try "Try / Except / Else / Finally" b
+try:
+	${1:pass}
+except${2: ${3:Exception}, ${4:e}}:
+	${5:raise}
+else:
+	${6:pass}
+finally:
+	${7:pass}
+endsnippet
+
+
+#####################
+# Assertions & Tests #
+#####################
+
+snippet pdb "Set PDB breakpoint" b
+import pdb; pdb.set_trace()
+endsnippet
+
+snippet ae "Assert equal" b
+self.assertEqual(${1:first},${2:second})
+endsnippet
+
+snippet at "Assert True" b
+self.assertTrue(${0:exp})
+endsnippet
+
+snippet af "Assert False" b
+self.assertFalse(${1:expression})
+endsnippet
+
+snippet aae "Assert almost equal" b
+self.assertAlmostEqual(${1:first},${2:second})
+endsnippet
+
+snippet ar "Assert raises" b
+self.assertRaises(${1:exception}, ${2:func}${3/.+/, /}${3:arguments})
+endsnippet
+
+
+snippet testcase "pyunit testcase" b
+class Test${1:Class}(${2:unittest.TestCase}):
+	"""${3:Test case docstring}"""
+
+	def setUp(self):
+		${4:pass}
+
+	def tearDown(self):
+		${5:pass}
+
+	def test_${6:name}(self):
+		${7:pass}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
new file mode 100644
index 000000000..9e0e29f88
--- /dev/null
+++ b/UltiSnips/rails.snippets
@@ -0,0 +1,906 @@
+###########################################################################
+#                    GENERATED FROM get_tm_snippets.py                    #
+###########################################################################
+
+snippet anaf "accepts_nested_attributes_for"
+accepts_nested_attributes_for :${1:association_name}${2:${3:, :allow_destroy => true}${4:, :reject_if => proc \{ |obj| ${5:obj.blank?} \}}}
+
+endsnippet
+
+snippet tcbi "Create binary column"
+t.binary :${1:title}${2:, :limit => ${3:2}.megabytes}
+$0
+endsnippet
+
+snippet tcb "Create boolean column"
+t.boolean :${1:title}
+$0
+endsnippet
+
+snippet cla "Create controller class"
+class ${1:Model}Controller < ApplicationController
+	before_filter :find_${2:model}
+
+	$0
+
+	private
+	def find_${2}
+		@$2 = ${3:$1}.find(params[:id]) if params[:id]
+	end
+end
+endsnippet
+
+snippet tcda "Create date column"
+t.date :${1:title}
+$0
+endsnippet
+
+snippet tcdt "Create datetime column"
+t.datetime :${1:title}
+$0
+endsnippet
+
+snippet tcd "Create decimal column"
+t.decimal :${1:title}${2:${3:, :precision => ${4:10}}${5:, :scale => ${6:2}}}
+$0
+endsnippet
+
+snippet tcf "Create float column"
+t.float :${1:title}
+$0
+endsnippet
+
+snippet cla "Create functional test class"
+require 'test_helper'
+
+class ${1:Model}ControllerTest < ActionController::TestCase
+	test$0
+end
+
+endsnippet
+
+snippet tci "Create integer column"
+t.integer :${1:title}
+$0
+endsnippet
+
+snippet tcl "Create lock_version column"
+t.integer :lock_version, :null => false, :default => 0
+$0
+endsnippet
+
+# FIXME: handling literal bracket pair inside of nested tab groups?
+snippet tcr "Create references column"
+t.references :${1:taggable}${2:, :polymorphic => ${3:{ :default => '${4:Photo}' \}}}
+$0
+endsnippet
+
+snippet resources "Create resources controller class"
+class ${1:Model}sController < ApplicationController
+  before_filter :find_${1/./\l$0/}, :only => [:show, :edit, :update, :destroy]
+
+  # GET /${1/./\l$0/}s
+  # GET /${1/./\l$0/}s.xml
+  def index
+    @${1/./\l$0/}s = ${1:Model}.all
+
+    respond_to do |wants|
+      wants.html # index.html.erb
+      wants.xml  { render :xml => @${1/./\l$0/}s }
+    end
+  end
+
+  # GET /${1/./\l$0/}s/1
+  # GET /${1/./\l$0/}s/1.xml
+  def show
+    respond_to do |wants|
+      wants.html # show.html.erb
+      wants.xml  { render :xml => @${1/./\l$0/} }
+    end
+  end
+
+  # GET /${1/./\l$0/}s/new
+  # GET /${1/./\l$0/}s/new.xml
+  def new
+    @${1/./\l$0/} = ${1:Model}.new
+
+    respond_to do |wants|
+      wants.html # new.html.erb
+      wants.xml  { render :xml => @${1/./\l$0/} }
+    end
+  end
+
+  # GET /${1/./\l$0/}s/1/edit
+  def edit
+  end
+
+  # POST /${1/./\l$0/}s
+  # POST /${1/./\l$0/}s.xml
+  def create
+    @${1/./\l$0/} = ${1:Model}.new(params[:${1/./\l$0/}])
+
+    respond_to do |wants|
+      if @${1/./\l$0/}.save
+        flash[:notice] = '${1:Model} was successfully created.'
+        wants.html { redirect_to(@${1/./\l$0/}) }
+        wants.xml  { render :xml => @${1/./\l$0/}, :status => :created, :location => @${1/./\l$0/} }
+      else
+        wants.html { render :action => "new" }
+        wants.xml  { render :xml => @${1/./\l$0/}.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /${1/./\l$0/}s/1
+  # PUT /${1/./\l$0/}s/1.xml
+  def update
+    respond_to do |wants|
+      if @${1/./\l$0/}.update_attributes(params[:${1/./\l$0/}])
+        flash[:notice] = '${1:Model} was successfully updated.'
+        wants.html { redirect_to(@${1/./\l$0/}) }
+        wants.xml  { head :ok }
+      else
+        wants.html { render :action => "edit" }
+        wants.xml  { render :xml => @${1/./\l$0/}.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /${1/./\l$0/}s/1
+  # DELETE /${1/./\l$0/}s/1.xml
+  def destroy
+    @${1/./\l$0/}.destroy
+
+    respond_to do |wants|
+      wants.html { redirect_to(${1/./\l$0/}s_url) }
+      wants.xml  { head :ok }
+    end
+  end
+
+  private
+    def find_${1/./\l$0/}
+      @${1/./\l$0/} = ${1:Model}.find(params[:id])
+    end
+
+end
+
+endsnippet
+
+snippet tcs "Create string column"
+t.string :${1:title}
+$0
+endsnippet
+
+snippet tct "Create text column"
+t.text :${1:title}
+$0
+endsnippet
+
+snippet tcti "Create time column"
+t.time :${1:title}
+$0
+endsnippet
+
+snippet tcts "Create timestamp column"
+t.timestamp :${1:title}
+$0
+endsnippet
+
+snippet tctss "Create timestamps columns"
+t.timestamps
+$0
+endsnippet
+
+snippet mcol "Migration Create Column (mcc)"
+t.column ${1:title}, :${2:string}
+$0
+endsnippet
+
+snippet mccc "Migration Create Column Continue (mccc)"
+t.column ${1:title}, :${2:string}
+mccc$0
+endsnippet
+
+snippet mtab "Migration Drop Create Table (mdct)"
+drop_table :${1:table}${2: [press tab twice to generate create_table]}
+endsnippet
+
+snippet mcol "Migration Remove and Add Column (mrac)"
+remove_column :${1:table}, :${2:column}${3: [press tab twice to generate add_column]}
+endsnippet
+
+snippet rdb "RAILS_DEFAULT_LOGGER.debug (rdb)"
+RAILS_DEFAULT_LOGGER.debug "${1:message}"$0
+endsnippet
+
+snippet tre "Table column(s) rename"
+t.rename(:${1:old_column_name}, :${2:new_column_name})
+$0
+endsnippet
+
+snippet art "Test Assert Redirected To (art)"
+assert_redirected_to ${2::action => "${1:index}"}
+endsnippet
+
+snippet asre "Test Assert Response (are)"
+assert_response :${1:success}, @response.body$0
+endsnippet
+
+snippet aftc "after_create"
+after_create 
+endsnippet
+
+snippet aftd "after_destroy"
+after_destroy 
+endsnippet
+
+snippet afts "after_save"
+after_save 
+endsnippet
+
+snippet aftu "after_update"
+after_update 
+endsnippet
+
+snippet aftv "after_validation"
+after_validation 
+endsnippet
+
+snippet aftvoc "after_validation_on_create"
+after_validation_on_create 
+endsnippet
+
+snippet aftvou "after_validation_on_update"
+after_validation_on_update 
+endsnippet
+
+snippet asg "assert(var = assigns(:var))"
+assert(${1:var} = assigns(:${1}), "Cannot find @${1}")
+$0
+endsnippet
+
+snippet asd "assert_difference"
+assert_difference "${1:Model}.${2:count}", ${3:1} do
+  $0
+end
+endsnippet
+
+snippet asnd "assert_no_difference"
+assert_no_difference "${1:Model}.${2:count}" do
+  $0
+end
+endsnippet
+
+snippet artnpp "assert_redirected_to (nested path plural)"
+assert_redirected_to ${10:${2:parent}_${3:child}_path(${4:@}${5:${2}})}
+endsnippet
+
+snippet artnp "assert_redirected_to (nested path)"
+assert_redirected_to ${2:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})}
+endsnippet
+
+snippet artpp "assert_redirected_to (path plural)"
+assert_redirected_to ${10:${2:model}s_path}
+endsnippet
+
+snippet artp "assert_redirected_to (path)"
+assert_redirected_to ${2:${12:model}_path(${13:@}${14:${12}})}
+endsnippet
+
+snippet asrj "assert_rjs"
+assert_rjs :${1:replace}, ${2:"${3:dom id}"}
+endsnippet
+
+snippet ass "assert_select"
+assert_select '${1:path}'${2:, :${3:text} => ${4:'${5:inner_html}'}}${6: do
+	$0
+end}
+endsnippet
+
+snippet befc "before_create"
+before_create 
+endsnippet
+
+snippet befd "before_destroy"
+before_destroy 
+endsnippet
+
+snippet befs "before_save"
+before_save 
+endsnippet
+
+snippet befu "before_update"
+before_update 
+endsnippet
+
+snippet befv "before_validation"
+before_validation 
+endsnippet
+
+snippet befvoc "before_validation_on_create"
+before_validation_on_create 
+endsnippet
+
+snippet befvou "before_validation_on_update"
+before_validation_on_update
+endsnippet
+
+snippet bt "belongs_to (bt)"
+belongs_to :${1:object}${2:, :class_name => "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key => "${4:${1}_id}"}
+endsnippet
+
+snippet crw "cattr_accessor"
+cattr_accessor :${0:attr_names}
+endsnippet
+
+snippet defcreate "def create - resource"
+def create
+	@${1:model} = ${2:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}.new(params[:$1])
+	$0
+	respond_to do |wants|
+		if @$1.save
+			flash[:notice] = '$2 was successfully created.'
+			wants.html { redirect_to(@$1) }
+			wants.xml { render :xml => @$1, :status => :created, :location => @$1 }
+		else
+			wants.html { render :action => "new" }
+			wants.xml { render :xml => @$1.errors, :status => :unprocessable_entity }
+		end
+	end
+end
+
+endsnippet
+
+snippet test "test do..end"
+test "${1:something interesting}" do
+	$0
+end
+endsnippet
+
+snippet deftg "def get request"
+def test_should_get_${1:action}
+	${2:@${3:model} = ${4:$3s}(:${5:fixture_name})
+	}get :${1}${6:, :id => @$3.to_param}
+	assert_response :success
+	$0
+end
+endsnippet
+
+snippet deftp "def post request"
+def test_should_post_${1:action}
+	${3:@$2 = ${4:$2s}(:${5:fixture_name})
+	}post :${1}${6:, :id => @$2.to_param}, :${2:model} => { $0 }
+	assert_response :redirect
+
+end
+endsnippet
+
+snippet fina "find(:all)"
+find(:all${1:, :conditions => ['${2:${3:field} = ?}', ${5:true}]})
+endsnippet
+
+snippet finf "find(:first)"
+find(:first${1:, :conditions => ['${2:${3:field} = ?}', ${5:true}]})
+endsnippet
+
+snippet fini "find(id)"
+find(${1:id})
+endsnippet
+
+snippet fine "find_each"
+find_each(${1::conditions => {:${2:field} => ${3:true}\}}) do |${4:${TM_CURRENT_WORD/(\w+)\./\L$1/g}}|
+	$0
+end
+endsnippet
+
+snippet finb "find_in_batches"
+find_in_batches(${1::conditions => {:${2:field} => ${3:true}\}}) do |${4:${TM_CURRENT_WORD/(\w+)\./\L$1/g}}s|
+	$4s.each do |$4|
+		$0
+	end
+end
+endsnippet
+
+snippet habtm "has_and_belongs_to_many (habtm)"
+has_and_belongs_to_many :${1:object}${2:, :join_table => "${3:table_name}", :foreign_key => "${4:${1}_id}"}
+endsnippet
+
+snippet hm "has_many (hm)"
+has_many :${1:object}s${2:, :class_name => "${1}", :foreign_key => "${4:reference}_id"}
+endsnippet
+
+snippet hmt "has_many (through)"
+has_many :${1:objects}, :through => :${2:join_association}${3:, :source => :${4:${2}_table_foreign_key_to_${1}_table}}
+endsnippet
+
+snippet hmd "has_many :dependent => :destroy"
+has_many :${1:object}s${2:, :class_name => "${1}", :foreign_key => "${4:reference}_id"}, :dependent => :destroy$0
+endsnippet
+
+snippet ho "has_one (ho)"
+has_one :${1:object}${2:, :class_name => "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key => "${4:${1}_id}"}
+endsnippet
+
+snippet logd "logger.debug"
+${1:Rails.}logger.debug { "${1:message}" }$0
+endsnippet
+
+snippet loge "logger.error"
+logger.error { "${1:message}" }$0
+endsnippet
+
+snippet logf "logger.fatal"
+logger.fatal { "${1:message}" }$0
+endsnippet
+
+snippet logi "logger.info"
+logger.info { "${1:message}" }$0
+endsnippet
+
+snippet logw "logger.warn"
+logger.warn { "${1:message}" }$0
+endsnippet
+
+snippet mp "map(&:sym_proc)"
+map(&:${1:id})
+endsnippet
+
+snippet mapca "map.catch_all"
+${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"
+
+endsnippet
+
+snippet map "map.named_route"
+${1:map}.${2:connect} '${3::controller/:action/:id}'
+endsnippet
+
+snippet mapr "map.resource"
+${1:map}.resource :${2:resource}${10: do |${11:$2}|
+  $0
+end}
+endsnippet
+
+snippet maprs "map.resources"
+${1:map}.resources :${2:resource}${10: do |${11:$2}|
+  $0
+end}
+endsnippet
+
+snippet mapwo "map.with_options"
+${1:map}.with_options :${2:controller} => '${3:thing}' do |${4:$3}|
+	$0
+end
+
+endsnippet
+
+snippet mrw "mattr_accessor"
+mattr_accessor :${0:attr_names}
+endsnippet
+
+snippet ncl "named_scope lambda"
+named_scope :name, lambda { |${1:param}| { :conditions => ${3:['${4:${5:field} = ?}', ${6:$1}]} } }
+
+endsnippet
+
+snippet nc "named_scope"
+named_scope :name${1:, :joins => :${2:table}}, :conditions => ${3:['${4:${5:field} = ?}', ${6:true}]}
+
+endsnippet
+
+snippet dscope "default_scope"
+default_scope ${1:order(${2:'${3:created_at DESC}'})}
+endsnippet
+
+snippet flash "flash[...]"
+flash[:${1:notice}] = "${2:Successfully created...}"$0
+endsnippet
+
+snippet rea "redirect_to (action)"
+redirect_to :action => "${1:index}"
+endsnippet
+
+snippet reai "redirect_to (action, id)"
+redirect_to :action => "${1:show}", :id => ${0:@item}
+endsnippet
+
+snippet rec "redirect_to (controller)"
+redirect_to :controller => "${1:items}"
+endsnippet
+
+snippet reca "redirect_to (controller, action)"
+redirect_to :controller => "${1:items}", :action => "${2:list}"
+endsnippet
+
+snippet recai "redirect_to (controller, action, id)"
+redirect_to :controller => "${1:items}", :action => "${2:show}", :id => ${0:@item}
+endsnippet
+
+snippet renpp "redirect_to (nested path plural)"
+redirect_to(${2:${10:parent}_${11:child}_path(${12:@}${13:${10}})})
+endsnippet
+
+snippet renp "redirect_to (nested path)"
+redirect_to(${2:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})})
+endsnippet
+
+snippet repp "redirect_to (path plural)"
+redirect_to(${2:${10:model}s_path})
+endsnippet
+
+snippet rep "redirect_to (path)"
+redirect_to(${2:${12:model}_path(${13:@}${14:${12}})})
+endsnippet
+
+snippet reb "redirect_to :back"
+redirect_to :back
+endsnippet
+
+snippet ra "render (action)... (ra)"
+render :action => "${1:action}"
+endsnippet
+
+snippet ral "render (action,layout) (ral)"
+render :action => "${1:action}", :layout => "${2:layoutname}"
+endsnippet
+
+snippet rf "render (file) (rf)"
+render :file => "${1:filepath}"
+endsnippet
+
+snippet rfu "render (file,use_full_path) (rfu)"
+render :file => "${1:filepath}", :use_full_path => ${2:false}
+endsnippet
+
+snippet ri "render (inline) (ri)"
+render :inline => "${1:<%= 'hello' %>}"
+endsnippet
+
+snippet ril "render (inline,locals) (ril)"
+render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"$4 }
+endsnippet
+
+snippet rit "render (inline,type) (rit)"
+render :inline => "${1:<%= 'hello' %>}", :type => ${2::rxml}
+endsnippet
+
+snippet rl "render (layout) (rl)"
+render :layout => "${1:layoutname}"
+endsnippet
+
+snippet rn "render (nothing) (rn)"
+render :nothing => ${1:true}
+endsnippet
+
+snippet rns "render (nothing,status) (rns)"
+render :nothing => ${1:true}, :status => ${2:401}
+endsnippet
+
+snippet rt "render (text) (rt)"
+render :text => "${1:text to render...}"
+endsnippet
+
+snippet rtl "render (text,layout) (rtl)"
+render :text => "${1:text to render...}", :layout => "${2:layoutname}"
+endsnippet
+
+snippet rtlt "render (text,layout => true) (rtlt)"
+render :text => "${1:text to render...}", :layout => ${2:true}
+endsnippet
+
+snippet rts "render (text,status) (rts)"
+render :text => "${1:text to render...}", :status => ${2:401}
+endsnippet
+
+snippet ru "render (update)"
+render :update do |${2:page}|
+	$2.$0
+end
+endsnippet
+
+snippet rest "respond_to"
+respond_to do |wants|
+	wants.${1:html}${2: { $0 \}}
+end
+endsnippet
+
+snippet resw "respond_with"
+respond_with(${1:@${2:model}})${3: do |format|
+  format.${4:html} { $0 \}
+end}
+endsnippet
+
+# FIXME
+snippet returning "returning do |variable| ... end"
+returning ${1:variable} do${2/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1: |)/}${2:v}${2/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1:|)/}
+	$0
+end
+endsnippet
+
+snippet t. "t.binary (tcbi)"
+t.binary :${1:title}${2:, :limit => ${3:2}.megabytes}
+t.$0
+endsnippet
+
+snippet t. "t.boolean (tcb)"
+t.boolean :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.date (tcda)"
+t.date :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.datetime (tcdt)"
+t.datetime :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.decimal (tcd)"
+t.decimal :${1:title}${2:${3:, :precision => ${4:10}}${5:, :scale => ${6:2}}}
+t.$0
+endsnippet
+
+snippet t. "t.float (tcf)"
+t.float :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.integer (tci)"
+t.integer :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.lock_version (tcl)"
+t.integer :lock_version, :null => false, :default => 0
+t.$0
+endsnippet
+
+snippet t. "t.references (tcr)"
+t.references :${1:taggable}${2:, :polymorphic => ${3:{ :default => '${4:Photo}' \}}}
+t.$0
+endsnippet
+
+snippet t. "t.rename (tre)"
+t.rename(:${1:old_column_name}, :${2:new_column_name})
+t.$0
+endsnippet
+
+snippet t. "t.string (tcs)"
+t.string :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.text (tct)"
+t.text :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.time (tcti)"
+t.time :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.timestamp (tcts)"
+t.timestamp :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.timestamps (tctss)"
+t.timestamps
+t.$0
+endsnippet
+
+snippet vaoif "validates_acceptance_of if"
+validates_acceptance_of :${1:terms}${2:${3:, :accept => "${4:1}"}${5:, :message => "${6:You must accept the terms of service}"}}, :if => proc { |obj| ${7:obj.condition?} }}
+endsnippet
+
+snippet vao "validates_acceptance_of"
+validates_acceptance_of :${1:terms}${2:${3:, :accept => "${4:1}"}${5:, :message => "${6:You must accept the terms of service}"}}
+endsnippet
+
+snippet va "validates_associated (va)"
+validates_associated :${1:attribute}${2:, :on => :${3:create}}
+endsnippet
+
+snippet vaif "validates_associated if (vaif)"
+validates_associated :${1:attribute}${2:, :on => :${3:create}, :if => proc { |obj| ${5:obj.condition?} }}
+endsnippet
+
+snippet vc "validates_confirmation_of (vc)"
+validates_confirmation_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:should match confirmation}"}
+endsnippet
+
+snippet vcif "validates_confirmation_of if (vcif)"
+validates_confirmation_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:should match confirmation}", :if => proc { |obj| ${5:obj.condition?} }}
+endsnippet
+
+snippet ve "validates_exclusion_of (ve)"
+validates_exclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not allowed}"}
+endsnippet
+
+snippet veif "validates_exclusion_of if (veif)"
+validates_exclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not allowed}"}, :if => proc { |obj| ${7:obj.condition?} }}
+endsnippet
+
+snippet vfif "validates_format_of if"
+validates_format_of :${1:attribute}, :with => /${2:^[${3:\w\d}]+\$}/${4:, :on => :${5:create}, :message => "${6:is invalid}"}, :if => proc { |obj| ${7:obj.condition?} }}
+endsnippet
+
+snippet vf "validates_format_of"
+validates_format_of :${1:attribute}, :with => /${2:^[${3:\w\d}]+\$}/${4:, :on => :${5:create}, :message => "${6:is invalid}"}
+endsnippet
+
+snippet viif "validates_inclusion_of if"
+validates_inclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not included in the list}"}, :if => proc { |obj| ${7:obj.condition?} }}
+endsnippet
+
+snippet vi "validates_inclusion_of"
+validates_inclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not included in the list}"}
+endsnippet
+
+snippet vl "validates_length_of (vl)"
+validates_length_of :${1:attribute}, :within => ${2:3..20}${3:, :on => :${4:create}, :message => "${5:must be present}"}
+endsnippet
+
+snippet vlif "validates_length_of if"
+validates_length_of :${1:attribute}, :within => ${2:3..20}${3:, :on => :${4:create}, :message => "${5:must be present}"}, :if => proc { |obj| ${6:obj.condition?} }}
+endsnippet
+
+snippet vnif "validates_numericality_of if"
+validates_numericality_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:is not a number}"}, :if => proc { |obj| ${5:obj.condition?} }}
+endsnippet
+
+snippet vn "validates_numericality_of"
+validates_numericality_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:is not a number}"}
+endsnippet
+
+snippet vp "validates_presence_of (vp)"
+validates_presence_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:can't be blank}"}
+endsnippet
+
+snippet vpif "validates_presence_of if (vpif) 2"
+validates_presence_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:can't be blank}"}, :if => proc { |obj| ${5:obj.condition?} }}
+endsnippet
+
+snippet vu "validates_uniqueness_of (vu)"
+validates_uniqueness_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:must be unique}"}
+endsnippet
+
+snippet vuif "validates_uniqueness_of if (vuif)"
+validates_uniqueness_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:must be unique}", :if => proc { |obj| ${6:obj.condition?} }}
+endsnippet
+
+snippet verify "verify -- render"
+verify :only => [:$1], :method => :post, :render => {:status => 500, :text => "use HTTP-POST"}
+
+endsnippet
+
+snippet verify "verify -- redirect"
+verify :only => [:$1], :session => :user, :params => :id, :redirect_to => {:action => '${2:index}'}
+
+endsnippet
+
+snippet wants "wants_format"
+wants.${1:js|xml|html}${2: { $0 \}}
+endsnippet
+
+snippet xdelete "xhr delete"
+xhr :delete, :${1:destroy}, :id => ${2:1}$0
+endsnippet
+
+snippet xget "xhr get"
+xhr :get, :${1:show}${2:, :id => ${3:1}}$0
+endsnippet
+
+snippet xpost "xhr post"
+xhr :post, :${1:create}, :${2:object} => { $3 }
+endsnippet
+
+snippet xput "xhr put"
+xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { $4 }$0
+endsnippet
+
+snippet finl "find(:last)"
+find(:last${1:, :conditions => ['${2:${3:field} = ?}', ${5:true}]})
+endsnippet
+
+snippet sweeper "Create sweeper class"
+class ${1:Model}Sweeper < ActionController::Caching::Sweeper
+  observe ${1:Model}
+
+  def after_save(${1/./\l$0/})
+    expire_cache(${1/./\l$0/})
+  end
+
+  def after_destroy(${1/./\l$0/})
+    expire_cache(${1/./\l$0/})
+  end
+
+  private
+
+    def expire_cache(${1/./\l$0/})
+      ${0:expire_page ${1/./\l$0/}s_path 
+      expire_page ${1/./\l$0/}_path(${1/./\l$0/})}
+    end
+
+end
+endsnippet
+
+snippet col "collection routes"
+collection do
+  ${1:get :${2:action}}
+  ${3:put :${4:action}}
+  ${5:post :${6:action}}
+  ${7:delete :${8:action}}
+end
+endsnippet
+
+snippet format "format (respond_with)"
+format.${1:html|xml|json|js|any} { $0 }
+endsnippet
+
+snippet gem "gem"
+gem '${1:name}'${2:${3:, "${4:1.0}"}${5:${6:, :require => ${7:"${8:$1}"}}${9:, :group => :${10:test}}}}
+endsnippet
+
+snippet gemg "gem :git"
+gem '${1:paperclip}', :git => "${2:git://github.com/thoughtbot/paperclip.git}"${3:, :branch => "${4:rails3}"}
+endsnippet
+
+snippet match "match"
+match '${1:${2::controller}${3:/${4::action}${5:/${6::id}${7:(.:format)}}}}'${8: => '${9:$2}#${10:$4}'${11:, :as => :${12:$10}}}
+endsnippet
+
+snippet member "member routes"
+member do
+  ${1:get :${2:action}}
+  ${3:put :${4:action}}
+  ${5:post :${6:action}}
+  ${7:delete :${8:action}}
+end
+endsnippet
+
+snippet res "resources"
+resources :${1:posts}${2: do
+  $3
+end}
+endsnippet
+
+snippet scope "scope"
+scope :${1:name}, ${2:joins(:${3:table}).}where(${4:'${5:$3.${6:field}} = ?', ${7:'${8:value}'}})
+endsnippet
+
+snippet scopel "scope lambda"
+scope :${1:name}, lambda { |${2:param}| ${3:where(${4::${5:field} => ${6:"${7:value}"}})} }
+endsnippet
+
+snippet scopee "scope with extension"
+scope :${1:name}, ${2:where(${3::${4:field} => ${5:'${6:value}'}})} do
+  def ${7:method_name}
+    $0
+  end
+end
+endsnippet
+
+snippet sb "scoped_by"
+scoped_by_${1:attribute}(${2:id})
+endsnippet
+
+snippet setup "setup do..end"
+setup do
+	$0
+end
+endsnippet
+
+snippet trans "Translation snippet" 
+I18n.t('`!v substitute(substitute(substitute(@%, substitute(getcwd() . "/", "\/", "\\\\/", "g"), "", ""), "\\(\\.\\(html\\|js\\)\\.\\(haml\\|erb\\)\\|\\(_controller\\)\\?\\.rb\\)$", "", ""), "/", ".", "g")`.${2:${1/[^\w]/_/g}}${3}', :default => "${1:some_text}"${4})${5:$0}
+endsnippet
+
+snippet route_spec
+it 'routes to #${1:action}' do
+  ${2:get}('/${3:url}').should route_to('`!v substitute(expand('%:t:r'), '_routing_spec$', '', '')`#$1'${4:, ${5:params}})${6}
+end
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
new file mode 100644
index 000000000..717451015
--- /dev/null
+++ b/UltiSnips/rst.snippets
@@ -0,0 +1,61 @@
+
+
+###########################################################################
+#                              General Stuff                              #
+###########################################################################
+snippet part "Part" b
+`!p snip.rv = len(t[1])*'#'`
+${1:Part name}
+`!p snip.rv = len(t[1])*'#'`
+
+$0
+endsnippet
+
+snippet sec "Section" b
+${1:Section name}
+`!p snip.rv = len(t[1])*'='`
+
+$0
+endsnippet
+
+snippet ssec "Subsection" b
+${1:Section name}
+`!p snip.rv = len(t[1])*'-'`
+
+$0
+endsnippet
+
+snippet sssec "Subsubsection" b
+${1:Section name}
+`!p snip.rv = len(t[1])*'^'`
+
+$0
+endsnippet
+
+snippet chap "Chapter" b
+`!p snip.rv = len(t[1])*'*'`
+${1:Chapter name}
+`!p snip.rv = len(t[1])*'*'`
+
+$0
+endsnippet
+
+snippet para "Paragraph" b
+${1:Paragraph name}
+`!p snip.rv = len(t[1])*'"'`
+
+$0
+endsnippet
+
+###########################################################################
+#                         More Specialized Stuff.                         #
+###########################################################################
+snippet cb "Code Block" b
+.. code-block:: ${1:lua}
+
+   ${2:code}
+
+$0
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
new file mode 100644
index 000000000..63365890d
--- /dev/null
+++ b/UltiSnips/ruby.snippets
@@ -0,0 +1,568 @@
+snippet "^#!" "#!/usr/bin/env ruby" r
+#!/usr/bin/env ruby
+$0
+endsnippet
+
+
+snippet "^# ?[uU][tT][fF]-?8" "# encoding: UTF-8" r
+# encoding: UTF-8
+$0
+endsnippet
+
+
+
+snippet If "<command> if <expression>"
+${1:command} if ${0:expression}
+endsnippet
+
+
+
+snippet Unless "<command> unless <expression>"
+${1:command} unless ${0:expression}
+endsnippet
+
+
+
+snippet if "if <condition> ... end"
+if ${1:condition}
+	${2:# TODO}
+end
+endsnippet
+
+
+
+snippet ife "if <condition> ... else ... end"
+if ${1:condition}
+	${2:# TODO}
+else
+	${3:# TODO}
+end
+endsnippet
+
+
+
+snippet ifee "if <condition> ... elseif <condition> ... else ... end"
+if ${1:condition}
+	${2:# TODO}
+elsif ${3:condition}
+	${4:# TODO}
+else
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet unless "unless <condition> ... end"
+unless ${1:condition}
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet unlesse "unless <condition> ... else ... end"
+unless ${1:condition}
+	${2:# TODO}
+else
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet unlesee "unless <condition> ... elseif <condition> ... else ... end"
+unless ${1:condition}
+	${2:# TODO}
+elsif ${3:condition}
+	${4:# TODO}
+else
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet "\b(de)?f" "def <name>..." r
+def ${1:function_name}${2: ${3:*args}}
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet defi "def initialize ..."
+def initialize${1: ${2:*args}}
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet defr "def <name> ... rescue ..."
+def ${1:function_name}${2: ${3:*args}}
+	${4:# TODO}
+rescue
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet For "(<from>..<to>).each { |<i>| <block> }"
+(${1:from}..${2:to}).each { |${3:i}| ${4:# TODO} }
+endsnippet
+
+
+
+snippet for "(<from>..<to>).each do |<i>| <block> end"
+(${1:from}..${2:to}).each do |${3:i}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.Merge!" ".merge!(<other_hash>) { |<key>,<oldval>,<newval>| <block> }" r
+`!p snip.rv=match.group(1)`.merge!(${1:other_hash}) { |${2:key},${3:oldval},${4:newval}| ${5:block} }
+endsnippet
+
+
+
+snippet "(\S+)\.merge!" ".merge!(<other_hash>) do |<key>,<oldval>,<newval>| <block> end" r
+`!p snip.rv=match.group(1)`.merge!(${1:other_hash}) do |${2:key},${3:oldval},${4:newval}|
+	${0:block}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.Del(ete)?_?if" ".delete_if { |<key>,<value>| <block> }" r
+`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3:# TODO} }
+endsnippet
+
+
+
+snippet "(\S+)\.del(ete)?_?if" ".delete_if do |<key>,<value>| <block> end" r
+`!p snip.rv=match.group(1)`.delete_if do |${1:key},${2:value}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.Keep_?if" ".keep_if { |<key>,<value>| <block> }" r
+`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3:# TODO} }
+endsnippet
+
+
+
+snippet "(\S+)\.keep_?if" ".keep_if do <key>,<value>| <block> end" r
+`!p snip.rv=match.group(1)`.keep_if do |${1:key},${2:value}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.Reject" ".reject { |<key>,<value>| <block> }" r
+`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3:# TODO} }
+endsnippet
+
+
+
+snippet "(\S+)\.reject" ".reject do <key>,<value>| <block> end" r
+`!p snip.rv=match.group(1)`.reject do |${1:key},${2:value}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.Select" ".select { |<item>| <block>}" r
+`!p snip.rv=match.group(1)`.select { |${1:item}| ${2:block} }
+endsnippet
+
+
+
+snippet "(\S+)\.select" ".select do |<item>| <block> end" r
+`!p snip.rv=match.group(1)`.select do |${1:item}|
+	${0:block}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.Sort" ".sort { |<a>,<b>| <block> }" r
+`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3:# TODO} }
+endsnippet
+
+
+
+snippet "(\S+)\.sort" ".sort do |<a>,<b>| <block> end" r
+`!p snip.rv=match.group(1)`.sort do |${1:a},${2:b}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.Each_?k(ey)?" ".each_key { |<key>| <block> }" r
+`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2:# TODO} }
+endsnippet
+
+
+
+snippet "(\S+)\.each_?k(ey)?" ".each_key do |key| <block> end" r
+`!p snip.rv=match.group(1)`.each_key do |${1:key}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.Each_?val(ue)?" ".each_value { |<value>| <block> }" r
+`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2:# TODO} }
+endsnippet
+
+
+
+snippet "(\S+)\.each_?val(ue)?" ".each_value do |<value>| <block> end" r
+`!p snip.rv=match.group(1)`.each_value do |${1:value}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet Each "<elements>.each { |<element>| <block> }"
+${1:elements}.each { |${2:${1/s$//}}| ${3:# TODO} }
+endsnippet
+
+
+
+snippet each "<elements>.each do |<element>| <block> end"
+${1:elements}.each do |${2:${1/s$//}}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet each_?s(lice)? "<array>.each_slice(n) do |slice| <block> end"
+each_slice(${1:2}) do |${2:slice}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet Each_?s(lice)? "<array>.each_slice(n) { |slice| <block> }"
+each_slice(${1:2}) { |${2:slice}| ${3:# TODO} }
+endsnippet
+
+
+
+
+snippet "(\S+)\.Map" ".map { |<element>| <block> }" r
+`!p snip.rv=match.group(1)`.map { |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}| ${2:# TODO} }
+endsnippet
+
+
+
+snippet "(\S+)\.map" ".map do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.map do |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.Rev(erse)?_?each" ".reverse_each { |<element>| <block> }" r
+`!p snip.rv=match.group(1)`.reverse_each { |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}| ${2:# TODO} }
+endsnippet
+
+
+
+snippet "(\S+)\.rev(erse)?_?each" ".reverse_each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.reverse_each do |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.Each" ".each { |<element>| <block> }" r
+`!p snip.rv=match.group(1)`.each { |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}| ${2:# TODO} }
+endsnippet
+
+
+
+snippet "(\S+)\.each" ".each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.each do |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+
+snippet "(\S+)\.Each_w(ith)?_?i(ndex)?" ".each_with_index { |<element>,<i>| <block> }" r
+`!p snip.rv=match.group(1)`.each_with_index { |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`},${2:i}| ${3:# TODO} }$0
+endsnippet
+
+
+
+snippet "(\S+)\.each_?w(ith)?_?i(ndex)?" ".each_with_index do |<element>,<i>| <block> end" r
+`!p snip.rv=match.group(1)`.each_with_index do |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`},${2:i}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+
+snippet "(\S+)\.Each_?p(air)?"  ".each_pair { |<key>,<value>| <block> }" r
+`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3:# TODO} }
+endsnippet
+
+
+
+snippet "(\S+)\.each_?p(air)?" ".each_pair do |<key>,<value>| <block> end" r
+`!p snip.rv=match.group(1)`.each_pair do |${1:key},${2:value}|
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet "(\S+)\.sub" ".sub(<expression>) { <block> }" r
+`!p snip.rv=match.group(1)`.sub(${1:expression}) { ${2:"replace_with"} }
+endsnippet
+
+
+
+snippet "(\S+)\.gsub" ".gsub(<expression>) { <block> }" r
+`!p snip.rv=match.group(1)`.gsub(${1:expression}) { ${2:"replace_with"} }
+endsnippet
+
+
+
+snippet "(\S+)\.index" ".index { |item| <block> }" r
+`!p snip.rv=match.group(1)`.index { |${1:item}| ${2:block} }
+endsnippet
+
+
+
+snippet "(\S+)\.Index" ".index do |item| ... end" r
+`!p snip.rv=match.group(1)`.index do |${1:item}|
+	${0:block}
+end
+endsnippet
+
+
+
+snippet do "do |<key>| ... end" i
+do ${1:|${2:key}|}
+	$0
+end
+endsnippet
+
+
+
+snippet Do "do ... end" i
+do
+	$0
+end
+endsnippet
+
+
+snippet until "until <expression> ... end"
+until ${1:expression}
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet Until "begin ... end until <expression>"
+begin
+	${0:# TODO}
+end until ${1:expression}
+endsnippet
+
+
+
+snippet while "while <expression> ... end"
+while ${1:expression}
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet While "begin ... end while <expression>"
+begin
+	${0:# TODO}
+end while ${1:expression}
+endsnippet
+
+
+
+snippet "\b(r|attr)" "attr_reader :<attr_names>" r
+attr_reader :${0:attr_names}
+endsnippet
+
+
+
+snippet "\b(w|attr)" "attr_writer :<attr_names>" r
+attr_writer :${0:attr_names}
+endsnippet
+
+
+
+snippet "\b(rw|attr)" "attr_accessor :<attr_names>" r
+attr_accessor :${0:attr_names}
+endsnippet
+
+
+
+snippet begin "begin ... rescue ... end"
+begin
+	${1:# TODO}
+rescue
+	${0:# TODO}
+end
+endsnippet
+
+
+
+snippet begin "begin ... rescue ... else ... ensure ... end"
+begin
+	${1:# Raise exception}
+rescue Exception => e
+	puts e.message
+	puts e.backtrace.inspect
+	${2:# Rescue}
+else
+	${3:# other exception}
+ensure
+	${0:# always excute}
+end
+endsnippet
+
+
+
+snippet rescue
+rescue Exception => e
+	puts e.message
+	puts e.backtrace.inspect
+	${0:# Rescue}
+endsnippet
+
+
+
+snippet "\b(case|sw(itch)?)" "case <variable> when <expression> ... end" r
+case ${1:variable}
+when ${2:expression}
+$0
+end
+endsnippet
+
+
+
+snippet alias "alias :<new_name> :<old_name>"
+alias :${1:new_name} :${2:old_name}
+endsnippet
+
+
+
+snippet class "class <class_name> def initialize ... end end"
+class ${1:class_name}
+	def initialize ${2:*args}
+		$0
+	end
+end
+endsnippet
+
+
+
+snippet module "module"
+module ${1:module_name}
+	$0
+end
+endsnippet
+
+
+
+snippet ###
+=begin
+  $0
+=end
+endsnippet
+
+# vim: set ts=2 sw=2 expandtab:
diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
new file mode 100644
index 000000000..915c0df9a
--- /dev/null
+++ b/UltiSnips/sh.snippets
@@ -0,0 +1,88 @@
+global !p
+import vim
+
+# Tests for the existence of a variable declared by Vim's filetype detection
+# suggesting the type of shell script of the current file
+def testShell(scope, shell):
+    return vim.eval("exists('" + scope + ":is_" + shell + "')")
+
+# Loops over the possible variables, checking for global variables
+# first since they indicate an override by the user.
+def getShell():
+    for scope in ["g", "b"]:
+        for shell in ["bash", "sh", "kornshell"]:
+            if testShell(scope, shell) == "1":
+                if shell == "kornshell":
+                    return "ksh"
+                return shell
+    return "sh"
+endglobal
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet #!
+`!p snip.rv = '#!/bin/' + getShell() + "\n\n" `
+endsnippet
+
+snippet !env "#!/usr/bin/env (!env)"
+`!p snip.rv = '#!/usr/bin/env ' + getShell() + "\n\n" `
+endsnippet
+
+snippet temp "Tempfile"
+${1:TMPFILE}="$(mktemp -t ${2:`!p
+snip.rv = re.sub(r'[^a-zA-Z]', '_', snip.fn) or "untitled"
+`})"
+${3:${4/(.+)/trap "/}${4:rm -f '$${1/.*\s//}'}${4/(.+)/" 0               # EXIT\n/}${5/(.+)/trap "/}${5:rm -f '$${1/.*\s//}'; exit 1}${5/(.+)/" 2       # INT\n/}${6/(.+)/trap "/}${6:rm -f '$${1/.*\s//}'; exit 1}${6/(.+)/" 1 15    # HUP TERM\n/}}
+
+endsnippet
+
+snippet case "case .. esac (case)"
+case ${1:word} in
+	${2:pattern} )
+		$0;;
+esac
+endsnippet
+
+snippet elif "elif .. (elif)"
+elif ${2:[[ ${1:condition} ]]}; then
+	${0:#statements}
+endsnippet
+
+snippet for "for ... done (for)"
+for (( i = 0; i < ${1:10}; i++ )); do
+	${0:#statements}
+done
+endsnippet
+
+snippet forin "for ... in ... done (forin)"
+for ${1:i}${2/.+/ in /}${2:words}; do
+	${0:#statements}
+done
+endsnippet
+
+snippet here "here document (here)"
+<<-${2:'${1:TOKEN}'}
+	$0
+${1/['"`](.+)['"`]/$1/}
+endsnippet
+
+snippet if "if ... then (if)"
+if ${2:[[ ${1:condition} ]]}; then
+	${0:#statements}
+fi
+endsnippet
+
+snippet until "until ... (done)"
+until ${2:[[ ${1:condition} ]]}; do
+	${0:#statements}
+done
+endsnippet
+
+snippet while "while ... (done)"
+while ${2:[[ ${1:condition} ]]}; do
+	${0:#statements}
+done
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/snippets.snippets b/UltiSnips/snippets.snippets
new file mode 100644
index 000000000..414f350ee
--- /dev/null
+++ b/UltiSnips/snippets.snippets
@@ -0,0 +1,23 @@
+#########################
+# SNIPPETS for SNIPPETS #
+#########################
+
+# We use a little hack so that the snippet is expanded
+# and parsed correctly
+snippet snip "Snippet definition" !
+`!p snip.rv = "snippet"` ${1:Tab_trigger} "${2:Description}" ${3:!b}
+$0
+`!p snip.rv = "endsnippet"`
+endsnippet
+
+snippet global "Global snippet" !
+`!p snip.rv = "global"` !p
+$0
+`!p snip.rv = "endglobal"`
+endsnippet
+
+snippet vis "${VISUAL}" i
+\$\{VISUAL${1:${2:default}${3:/transform/}}\}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/tcl.snippets b/UltiSnips/tcl.snippets
new file mode 100644
index 000000000..2cb1f347d
--- /dev/null
+++ b/UltiSnips/tcl.snippets
@@ -0,0 +1,50 @@
+###########################################################################
+#                            TEXTMATE SNIPPETS                            #
+###########################################################################
+snippet for "for... (for)" b
+for {${1:set i 0}} {${2:\$i < \$n}} {${3:incr i}} {
+	${4}
+}
+
+endsnippet
+
+snippet foreach "foreach... (foreach)"
+foreach ${1:var} ${2:\$list} {
+	${3}
+}
+
+endsnippet
+
+snippet if "if... (if)" b
+if {${1:condition}} {
+	${2}
+}
+
+endsnippet
+
+snippet proc "proc... (proc)" b
+proc ${1:name} {${2:args}} \
+{
+	${3}
+}
+
+endsnippet
+
+snippet switch "switch... (switch)" b
+switch ${1:-exact} -- ${2:\$var} {
+	${3:match} {
+		${4}
+	}
+	default {${5}}
+}
+
+endsnippet
+
+snippet while "while... (while)" b
+while {${1:condition}} {
+	${2}
+}
+
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
new file mode 100644
index 000000000..d6e62fce9
--- /dev/null
+++ b/UltiSnips/tex.snippets
@@ -0,0 +1,125 @@
+extends texmath
+
+###########################################################################
+#                             LATEX SNIPPETS                              #
+###########################################################################
+
+snippet r "\ref{}" w
+\ref{$1}
+endsnippet
+
+###########################################################################
+#                            TEXTMATE SNIPPETS                            #
+###########################################################################
+
+#################
+# GENERAL STUFF #
+#################
+snippet "b(egin)?" "begin{} / end{}" br
+\begin{${1:something}}
+	${0:${VISUAL}}
+\end{$1}
+endsnippet
+
+####################
+# TABULARS, ARRAYS #
+####################
+
+snippet tab
+\begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
+$0${2/((?<=.)c|l|r)|./(?1: & )/g}
+\end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
+endsnippet
+
+########################
+# ENUM, DESCR, ITEMIZE #
+########################
+snippet enum "Enumerate" b
+\begin{enumerate}
+	\item $0
+\end{enumerate}
+endsnippet
+
+snippet item "Itemize" b
+\begin{itemize}
+	\item $0
+\end{itemize}
+endsnippet
+
+snippet desc "Description" b
+\begin{description}
+	\item[$1] $0
+\end{description}
+endsnippet
+
+#####################################
+# SECTIONS, CHAPTERS AND THERE LIKE #
+#####################################
+
+snippet part "Part" b
+\part{${1:part name}}
+\label{prt:${2:${1/(\w+)|\W+/(?1:\L$0\E:_)/g}}}
+
+${0}
+
+% part $2 (end)
+endsnippet
+
+snippet cha "Chapter" b
+\chapter{${1:chapter name}}
+\label{cha:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+
+${0}
+
+% chapter $2 (end)
+endsnippet
+
+snippet sec "Section" b
+\section{${1:section name}} 
+\label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+
+${0}
+
+% section $2 (end)
+endsnippet
+
+
+snippet sub "Subsection" b
+\subsection{${1:subsection name}}
+\label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+
+${0}
+
+% subsection $2 (end)
+endsnippet
+
+snippet ssub "Subsubsection" b
+\subsubsection{${1:subsubsection name}}
+\label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+
+${0}
+
+% subsubsection $2 (end)
+
+endsnippet
+
+snippet par "Paragraph" b
+\paragraph{${1:paragraph name}}
+\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+
+${0}
+
+% paragraph $2 (end)
+endsnippet
+
+
+snippet subp "Subparagraph" b
+\subparagraph{${1:subparagraph name}}
+\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+
+${0}
+
+% subparagraph $2 (end)
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/texmath.snippets b/UltiSnips/texmath.snippets
new file mode 100644
index 000000000..03589f0f2
--- /dev/null
+++ b/UltiSnips/texmath.snippets
@@ -0,0 +1,54 @@
+##############
+# MATH STUFF #
+##############
+snippet eq "Equation" b
+\begin{equation}
+	$0
+\end{equation}
+endsnippet
+
+snippet eqnn "Equation without number" b
+\begin{equation*}
+	$0
+\end{equation*}
+endsnippet
+
+snippet eqa "Equation array" b
+\begin{eqnarray}
+	$1 & $2 & $0
+\end{eqnarray}
+endsnippet
+
+snippet eqann "Equation array without numbers" b
+\begin{eqnarray*}
+	$1 & $2 & $0
+\end{eqnarray*}
+
+endsnippet
+snippet frac "Fraction" w
+\frac{${1:${VISUAL:nom}}}{${2:denom}}
+endsnippet
+
+snippet mat "Smart Matrix"
+\begin{${1:p/b/v/V/B/small}matrix}
+	$0
+\end{$1matrix}
+endsnippet
+
+snippet lr( "left( right)" w
+\left( ${1:${VISUAL}} \right)
+endsnippet
+
+snippet lr| "left| right|" w
+\left| ${1:${VISUAL}} \right|
+endsnippet
+
+snippet lr{ "left\{ right\}" w
+\left\\{ ${1:${VISUAL}} \right\\}
+endsnippet
+
+snippet lr[ "left[ right]" w
+\left[ ${1:${VISUAL}} \right]
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/vim.snippets b/UltiSnips/vim.snippets
new file mode 100644
index 000000000..f4c37f079
--- /dev/null
+++ b/UltiSnips/vim.snippets
@@ -0,0 +1,58 @@
+###########################################################################
+#                            SnipMate Snippets                            #
+###########################################################################
+snippet header
+" File: ${1:`!v expand('%:t')`}
+" Author: ${2:`!v g:snips_author`}
+" Description: ${3}
+${4:" Last Modified: `!v strftime("%B %d, %Y")`}
+
+$0
+endsnippet
+
+snippet gvar "Global / configuration variable"
+if !exists("g:${1:MyUltraImportantVar}")
+	let g:$1 = ${2:"${3:<tab>}"}
+endif
+endsnippet
+
+snippet guard
+if exists('${1:did_`!p snip.rv = snip.fn.replace('.','_')`}') || &cp${2: || version < 700}
+	finish
+endif
+let $1 = 1${3}
+endsnippet
+
+snippet f
+fun ${1:function_name}(${2})
+	${3:" code}
+endf
+endsnippet
+
+snippet for
+for ${1:needle} in ${2:haystack}
+	${3:" code}
+endfor
+endsnippet
+
+snippet wh
+while ${1:condition}
+	${2:" code}
+endw
+endsnippet
+
+snippet if
+if ${1:condition}
+	${2:" code}
+endif
+endsnippet
+
+snippet ife
+if ${1:condition}
+	${2}
+else
+	${3}
+endif
+endsnippet
+
+# vim:ft=snippets:
diff --git a/UltiSnips/xhtml.snippets b/UltiSnips/xhtml.snippets
new file mode 100644
index 000000000..cc31dbc73
--- /dev/null
+++ b/UltiSnips/xhtml.snippets
@@ -0,0 +1 @@
+extends html
diff --git a/UltiSnips/zsh.snippets b/UltiSnips/zsh.snippets
new file mode 100644
index 000000000..18a2989ee
--- /dev/null
+++ b/UltiSnips/zsh.snippets
@@ -0,0 +1,13 @@
+extends sh
+
+snippet #! "shebang" !
+#!/bin/zsh
+
+endsnippet
+
+snippet !env "#!/usr/bin/env (!env)" !
+#!/usr/bin/env zsh
+
+endsnippet
+
+# vim:ft=snippets:

From dfe410306b8cc3e4cc6ae277e9060268a4cec4d8 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 17 Mar 2013 20:46:38 +0100
Subject: [PATCH 0023/1587] merge changes from pull/179

---
 snippets/ruby.snippets | 3 +++
 snippets/sh.snippets   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index ccb3968ac..1a77d397a 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -922,6 +922,9 @@ snippet itp
 	${2}
 snippet its
 	its(:${1:method}) { should ${2} }
+snippet itsn
+	its(:${1:method}) { should_not ${2} }
+
 snippet desc
 	describe ${1:class_name} do
 		${2}
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 9a48eb514..b07362081 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -81,3 +81,6 @@ snippet getopt
 	done
 	shift $(($OPTIND-1))
 
+
+snippet root
+	if [ $(id -u) -ne 0 ]; then exec sudo $0; fi

From da5894a87cbd797a1f4811a764f7348dee87c9cc Mon Sep 17 00:00:00 2001
From: mockturtl <mockturtl@gmail.com>
Date: Mon, 3 Dec 2012 07:35:56 -0500
Subject: [PATCH 0024/1587] fix FSF address

Per http://www.gnu.org/licenses/gpl-howto.html.
---
 snippets/_.snippets  | 9 +++------
 snippets/c.snippets  | 3 +--
 snippets/go.snippets | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index d553449d0..cb51536c3 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -26,8 +26,7 @@ snippet GPL2
 	GNU General Public License for more details.
 	
 	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software Foundation,
-	Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+	along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 	${3}
 snippet LGPL2
@@ -45,8 +44,7 @@ snippet LGPL2
 	GNU Lesser General Public License for more details.
 	
 	You should have received a copy of the GNU Lesser General Public License
-	along with this library; if not, write to the Free Software Foundation,
-	Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+	along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 	${3}
 snippet GPL3
@@ -82,8 +80,7 @@ snippet LGPL3
 	GNU Lesser General Public License for more details.
 	
 	You should have received a copy of the GNU Lesser General Public License
-	along with this library; if not, write to the Free Software Foundation,
-	Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+	along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 	${3}
 snippet BSD2
diff --git a/snippets/c.snippets b/snippets/c.snippets
index c476de4ab..bf8a8fc93 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -226,8 +226,7 @@ snippet gpl
 	 * GNU General Public License for more details.
 	 *
 	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+	 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 	 *
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
diff --git a/snippets/go.snippets b/snippets/go.snippets
index d02aa8fdf..77d7ea0b7 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -53,8 +53,7 @@ snippet gpl
 	 * GNU General Public License for more details.
 	 *
 	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+	 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 	 *
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */

From 7238147272683441d55e9b6d1e163a63f6e3e966 Mon Sep 17 00:00:00 2001
From: indi <1334@shadowproject.net>
Date: Tue, 22 Jan 2013 18:20:04 +0100
Subject: [PATCH 0025/1587] add reqr to expand to require_relative

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 1a77d397a..a9b45ad49 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -28,6 +28,8 @@ snippet beg
 
 snippet req require
 	require "${1}"${2}
+snippet reqr
+	require_relative "${1}"${2}
 snippet #
 	# =>
 snippet end

From e9904d0845111f24ae435512c910d33b0ed7131d Mon Sep 17 00:00:00 2001
From: Jens Hoepken <jhoepken@gmail.com>
Date: Tue, 19 Mar 2013 23:13:26 +0100
Subject: [PATCH 0026/1587] Initial commit for OpenFOAM snippets

---
 snippets/openfoam.snippets | 53 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 snippets/openfoam.snippets

diff --git a/snippets/openfoam.snippets b/snippets/openfoam.snippets
new file mode 100644
index 000000000..ff690cca2
--- /dev/null
+++ b/snippets/openfoam.snippets
@@ -0,0 +1,53 @@
+# 0/*
+snippet fv
+	type		fixedValue;
+	value		uniform ${1};
+snippet zg
+	type		zeroGradient;
+snippet sym
+	type		symmetryPlane;
+# system/controlDict
+snippet forces
+	forces
+	{
+		type				forces;
+		functionObjectLibs	("libforces.so");
+		enabled				true;
+		outputControl		${1:timeStep};
+		outputInterval		${2:1};
+		patches				(${3});
+		log					${4:true};
+		CofR				(${5:0 0 0});
+	}
+# system/fvSolution
+# solvers
+snippet gamg
+	${1:p}
+	{
+		solver          GAMG;
+		tolerance       1e-${2:6};
+		relTol          ${3:0.0};
+		smoother        GaussSeidel;
+		cacheAgglomeration true;
+		nCellsInCoarsestLevel 10;
+		agglomerator    faceAreaPair;
+		mergeLevels     1;
+	}
+snippet pbicg
+	${1:U}
+	{
+		solver          PBiCG;
+		preconditioner  DILU;
+		tolerance       1e-${2:6};
+		relTol          ${3:0.0};
+	}
+# PIMPLE
+snippet pimple
+	PIMPLE
+	{
+		nOuterCorrectors 	${1:outer};
+		nCorrectors     	${2:inner};
+		nNonOrthogonalCorrectors ${3:nonOrtho};
+		pRefCell        	${4:cell};
+		pRefValue       	${5:value for $4};
+	}

From 62ac466722eefadff15eb259258763ea7688a0fa Mon Sep 17 00:00:00 2001
From: Pirogov Evgenij <iamexile@gmail.com>
Date: Sun, 24 Mar 2013 00:09:49 +0200
Subject: [PATCH 0027/1587] Turn = into :=

---
 snippets/go.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 77d7ea0b7..c64db91f9 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -116,7 +116,7 @@ snippet ie
 	${4}
 # for loop
 snippet fo
-	for ${2:i} = 0; $2 < ${1:count}; $2${3:++} {
+	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
 		${4:/* code */}
 	}
 	${5}

From eb7fccc55864a976fe7c942c76c8439b29334f0c Mon Sep 17 00:00:00 2001
From: Joey Curtin <jbcurtincode@gmail.com>
Date: Sat, 30 Mar 2013 11:08:09 -0400
Subject: [PATCH 0028/1587] added email and github to python.snippte-docs

---
 snippets/python.snippets | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 508a51b0a..9cb21135b 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -6,11 +6,13 @@ snippet from
 	from ${1:package} import ${2:module}
 # Module Docstring
 snippet docs
-	'''
+	"""
 	File: ${1:`Filename('$1.py', 'foo.py')`}
-	Author: ${2:`g:snips_author`}
-	Description: ${3}
-	'''
+	Author: `g:snips_author`
+	Email: `g:snips_email`
+	Github: `g:snips_github`
+	Description: ${2}
+	"""
 snippet wh
 	while ${1:condition}:
 		${2:# TODO: write code...}

From 93a06c235ac892974d0acf1c0a227b7227f43855 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 2 Apr 2013 22:00:55 +0200
Subject: [PATCH 0029/1587] adding ocaml /xml snippets from UltiSnips

---
 UltiSnips/ocaml.snippets | 172 +++++++++++++++++++++++++++++++++++++++
 UltiSnips/xml.snippets   |   9 ++
 2 files changed, 181 insertions(+)
 create mode 100644 UltiSnips/ocaml.snippets
 create mode 100644 UltiSnips/xml.snippets

diff --git a/UltiSnips/ocaml.snippets b/UltiSnips/ocaml.snippets
new file mode 100644
index 000000000..8aefef3a0
--- /dev/null
+++ b/UltiSnips/ocaml.snippets
@@ -0,0 +1,172 @@
+snippet rs "raise" b
+raise (${1:Not_found})
+endsnippet
+
+snippet open "open"
+let open ${1:module} in
+${2:e}
+endsnippet
+
+snippet try "try"
+try ${1:e}
+with ${2:Not_found} -> ${3:()}
+endsnippet
+
+snippet ref "ref"
+let ${1:name} = ref ${2:val} in
+${3:e}
+endsnippet
+
+snippet matchl "pattern match on a list"
+match ${1:list} with
+| [] -> ${2:()}
+| x::xs -> ${3:()}
+endsnippet
+
+snippet matcho "pattern match on an option type"
+match ${1:x} with
+| Some(${2:y}) -> ${3:()}
+| None -> ${4:()}
+endsnippet
+
+snippet fun "anonymous function"
+(fun ${1:x} -> ${2:x})
+endsnippet
+
+snippet cc "commment"
+(* ${1:comment} *)
+endsnippet
+
+snippet let "let .. in binding"
+let ${1:x} = ${2:v} in
+${3:e}
+endsnippet
+
+snippet lr "let rec"
+let rec ${1:f} =
+  ${2:expr}
+endsnippet
+
+snippet if "if"
+if ${1:(* condition *)} then
+  ${2:(* A *)}
+else
+  ${3:(* B *)}
+endsnippet
+
+snippet If "If"
+if ${1:(* condition *)} then
+  ${2:(* A *)}
+endsnippet
+
+snippet while "while"
+while ${1:(* condition *)} do
+  ${2:(* A *)}
+done
+endsnippet
+
+snippet for "for"
+for ${1:i} = ${2:1} to ${3:10} do
+  ${4:(* BODY *)}
+done
+endsnippet
+
+snippet match "match"
+match ${1:(* e1 *)} with
+| ${2:p} -> ${3:e2}
+endsnippet
+
+snippet Match "match"
+match ${1:(* e1 *)} with
+| ${2:p} -> ${3:e2}
+endsnippet
+
+snippet class "class"
+class ${1:name} = object
+  ${2:methods}
+end
+endsnippet
+
+snippet obj "obj"
+object
+  ${2:methods}
+end
+endsnippet
+
+snippet Obj "object"
+object (self)
+  ${2:methods}
+end
+endsnippet
+
+snippet {{ "object functional update"
+{< ${1:x} = ${2:y} >}
+endsnippet
+
+snippet beg "beg"
+begin
+  ${1:block}
+end
+endsnippet
+
+snippet ml "module instantiantion with functor"
+module ${1:Mod} = ${2:Functor}(${3:Arg})
+endsnippet
+
+snippet mod "module - no signature"
+module ${1:(* Name *)} = struct
+  ${2:(* BODY *)}
+end
+endsnippet
+
+snippet Mod "module with signature"
+module ${1:(* Name *)} : ${2:(* SIG *)} = struct
+  ${3:(* BODY *)}
+end
+endsnippet
+
+snippet sig "anonymous signature"
+sig
+  ${2:(* BODY *)}
+end
+endsnippet
+
+snippet sigf "functor signature or anonymous functor"
+functor (${1:Arg} : ${2:ARG}) -> ${3:(* BODY *)}
+endsnippet
+
+snippet func "define functor - no signature"
+module ${1:M} (${2:Arg} : ${3:ARG}) = struct
+  ${4:(* BODY *)}
+end
+endsnippet
+
+snippet Func "define functor - with signature"
+module ${1:M} (${2:Arg} : ${3:ARG}) : ${4:SIG} = struct
+  ${5:(* BODY *)}
+end
+endsnippet
+
+snippet mot "Declare module signature"
+module type ${1:(* Name *)} = sig
+  ${2:(* BODY *)}
+end
+endsnippet
+
+snippet module "Module with anonymous signature"
+module ${1:(* Name *)} : sig
+  ${2:(* SIGNATURE *)}
+end = struct
+  ${3:(* BODY *)}
+end
+endsnippet
+
+snippet oo "odoc"
+(** ${1:odoc} *)
+endsnippet
+
+snippet qt "inline qtest"
+(*$T ${1:name}
+   ${2:test}
+*)
+endsnippet
diff --git a/UltiSnips/xml.snippets b/UltiSnips/xml.snippets
new file mode 100644
index 000000000..80b017cea
--- /dev/null
+++ b/UltiSnips/xml.snippets
@@ -0,0 +1,9 @@
+snippet t "Simple tag" b
+<${1:tag}>
+	${2:content}
+</${1/([\w:._-]+).*/$1/}>
+endsnippet
+
+snippet ti "Inline tag" b
+<${1:tag}>${2:content}</${1/([\w:._-]+).*/$1/}>
+endsnippet

From ef8fa2b97e63ef95b8e48a58a10ea1aad0c791a9 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 2 Apr 2013 22:10:32 +0200
Subject: [PATCH 0030/1587] MarcWeber's UltiSnips does no longer understand
 extends, drop it. See its Quickstart.txt file BUG [1]

---
 UltiSnips/cpp.snippets   | 2 --
 UltiSnips/tex.snippets   | 1 -
 UltiSnips/xhtml.snippets | 1 -
 UltiSnips/zsh.snippets   | 2 --
 4 files changed, 6 deletions(-)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index 9d2eb868c..6999c1f97 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -1,5 +1,3 @@
-extends c
-
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index d6e62fce9..97ea8a82e 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -1,4 +1,3 @@
-extends texmath
 
 ###########################################################################
 #                             LATEX SNIPPETS                              #
diff --git a/UltiSnips/xhtml.snippets b/UltiSnips/xhtml.snippets
index cc31dbc73..e69de29bb 100644
--- a/UltiSnips/xhtml.snippets
+++ b/UltiSnips/xhtml.snippets
@@ -1 +0,0 @@
-extends html
diff --git a/UltiSnips/zsh.snippets b/UltiSnips/zsh.snippets
index 18a2989ee..803945970 100644
--- a/UltiSnips/zsh.snippets
+++ b/UltiSnips/zsh.snippets
@@ -1,5 +1,3 @@
-extends sh
-
 snippet #! "shebang" !
 #!/bin/zsh
 

From 73cab09e6a30fc25a3d0d042925a9f6f9b5f69ef Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 4 Apr 2013 04:45:37 +0200
Subject: [PATCH 0031/1587] talk about additional snippet repositories

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 395dcc95d..d812b9412 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,13 @@ of the snippets by setting the "always_use_first_snippet" option to 1.
 If you have VimL only (vim without python support) your best option is using
 garbas/vim-snipmate and cope with the minor bugs found in the engine.
 
+Related repositories
+====================
+github.com/garbas/vim-snipmate -> README lists additional repositories
+containing snipmate-snippets
+
+This list should eventually be moved here now
+
 Historical notes
 ================
 

From a5990defd738c02902a0170177d403e065c45270 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 4 Apr 2013 04:55:39 +0200
Subject: [PATCH 0032/1587] actually moving the repository list

---
 README.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d812b9412..17a73739e 100644
--- a/README.md
+++ b/README.md
@@ -52,10 +52,15 @@ garbas/vim-snipmate and cope with the minor bugs found in the engine.
 
 Related repositories
 ====================
-github.com/garbas/vim-snipmate -> README lists additional repositories
-containing snipmate-snippets
+We also encourage people to maintain sets of snippets for particular use cases
+so that all users can benefit from them.  People can list their snippet repositories here:
 
-This list should eventually be moved here now
+     * https://github.com/rbonvall/snipmate-snippets-bib (snippets for BibTeX files)
+     * https://github.com/sudar/vim-arduino-snippets (snippets for Arduino files)
+     * https://github.com/zedr/zope-snipmate-bundle.git (snippets for Python, TAL and ZCML)
+     * https://github.com/bonsaiben/bootstrap-snippets (snippets for Twitter Bootstrap markup, in HTML and Haml)
+
+Installation using VAM: "github:rbonvall/snipmate-snippets-bib"
 
 Historical notes
 ================

From 3fa45cda70ac9b9fcc1685e2091292d1a5347e03 Mon Sep 17 00:00:00 2001
From: Yu Huanbo <yuhuanbo@fabei.net>
Date: Sun, 7 Apr 2013 19:05:25 +0800
Subject: [PATCH 0033/1587] add `nc`(namespace and class) for php
 http://knplabs.com/blog/boost-your-productivity-with-sf2-and-vim

---
 snippets/php.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index e861a5be9..513ee9b60 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -222,6 +222,13 @@ snippet class
 			${8:// code...}
 		}
 	}
+snippet nc
+	namespace ${1:`substitute(substitute(expand("%:h"), '\v^\w+\/(\u)', '\1', ''), '\/', '\\\', 'g')`};
+
+	${2:abstract }class ${3:`Filename()`}
+	{
+		${4}
+	}
 # define(...)
 snippet def
 	define('${1}'${2});${3}

From d052a7d891d07d2a638dc96ded412fa6c0c73f57 Mon Sep 17 00:00:00 2001
From: Yu Huanbo <yuhuanbo@fabei.net>
Date: Sun, 7 Apr 2013 19:05:25 +0800
Subject: [PATCH 0034/1587] add `nc`(namespace and class) for php
 http://knplabs.com/blog/boost-your-productivity-with-sf2-and-vim

---
 snippets/php.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index e861a5be9..513ee9b60 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -222,6 +222,13 @@ snippet class
 			${8:// code...}
 		}
 	}
+snippet nc
+	namespace ${1:`substitute(substitute(expand("%:h"), '\v^\w+\/(\u)', '\1', ''), '\/', '\\\', 'g')`};
+
+	${2:abstract }class ${3:`Filename()`}
+	{
+		${4}
+	}
 # define(...)
 snippet def
 	define('${1}'${2});${3}

From 4962bca954c2ad89e3f8626c4c2c78270e02066d Mon Sep 17 00:00:00 2001
From: ALX-Liu-Xiao <hhdxlx@gmail.com>
Date: Wed, 10 Apr 2013 00:39:52 +0800
Subject: [PATCH 0035/1587] Fix c.snippets:else

There is no ${2} in snippet el, but insteaded is a ${3}.
Change 3 to 2;
---
 snippets/c.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index bf8a8fc93..de6d6a933 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -59,7 +59,7 @@ snippet if
 snippet el
 	else {
 		${1}
-	}${3}
+	}${2}
 # else if
 snippet elif
 	else if (${1:/* condition */}) {

From 755b3a816a2f2ba910e20bac839ae1c2b2374b02 Mon Sep 17 00:00:00 2001
From: linduxed <linduxed@gmail.com>
Date: Wed, 10 Apr 2013 17:44:53 +0200
Subject: [PATCH 0036/1587] Added missing line to WTFPL snippet.

---
 snippets/_.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index cb51536c3..857598483 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -235,3 +235,5 @@ snippet WTFPL
 
 			DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 	TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+	 0. You just DO WHAT THE FUCK YOU WANT TO.

From 6ade12ac150ac41d9d955488e712d456d7d14a38 Mon Sep 17 00:00:00 2001
From: Michael Thessel <michael.thessel@gmx.de>
Date: Fri, 12 Apr 2013 01:16:52 +0000
Subject: [PATCH 0037/1587] Changed method snippet

---
 snippets/php.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 31ebdfa83..614bbbc7e 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -46,9 +46,9 @@ snippet f
 	}
 # method
 snippet m
-	${1:abstract }${2:protected}${3: static} function ${4:foo}(${5:array }${6:$bar})
+	${1:protected} function ${2:foo}()
 	{
-		${7}
+		${3}
 	}
 # setter method
 snippet sm 

From 41644d72e5cc29845acf34ec5bc98b72db1adedf Mon Sep 17 00:00:00 2001
From: Michael Thessel <michael.thessel@gmx.de>
Date: Fri, 12 Apr 2013 01:18:57 +0000
Subject: [PATCH 0038/1587] Whitespace cleanup

---
 snippets/php.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 614bbbc7e..6be149568 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -51,7 +51,7 @@ snippet m
 		${3}
 	}
 # setter method
-snippet sm 
+snippet sm
 	/**
 	 * Sets the value of ${1:foo}
 	 *
@@ -104,7 +104,7 @@ snippet S
 	$_SERVER['${1:variable}']${2}
 snippet SS
 	$_SESSION['${1:variable}']${2}
-	
+
 # the following are old ones
 snippet inc
 	include '${1:file}';${2}
@@ -205,7 +205,7 @@ snippet doc_h
 	 * @copyright ${4:$2}, `strftime('%d %B, %Y')`
 	 * @package ${5:default}
 	 */
-	
+
 # Interface
 snippet interface
 	/**
@@ -344,8 +344,8 @@ snippet vd
 snippet vdd
 	var_dump(${1}); die(${2:});
 snippet http_redirect
-	header ("HTTP/1.1 301 Moved Permanently"); 
-	header ("Location: ".URL); 
+	header ("HTTP/1.1 301 Moved Permanently");
+	header ("Location: ".URL);
 	exit();
 # Getters & Setters
 snippet gs
@@ -375,7 +375,7 @@ snippet gs
 snippet ags
 	/**
 	 * ${1:description}
-	 * 
+	 *
 	 * @${7}
 	 */
 	${2:protected} $${3:foo};

From 95b1a81d6ea334002b3af263acf616feac6ef598 Mon Sep 17 00:00:00 2001
From: Michael Thessel <michael.thessel@gmx.de>
Date: Fri, 12 Apr 2013 01:20:42 +0000
Subject: [PATCH 0039/1587] Changed class snippet

---
 snippets/php.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 6be149568..6ca1f582c 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -28,9 +28,9 @@ snippet use
 	use ${1:Foo\Bar\Baz};
 	${2}
 snippet	c
-	${1:abstract }class ${2:`Filename()`}
+	class ${1:`Filename()`}
 	{
-		${3}
+		${2}
 	}
 snippet i
 	interface ${1:`Filename()`}

From 613f3c1b258907c713d6c6baa7b4aef197825e13 Mon Sep 17 00:00:00 2001
From: Michael Thessel <michael.thessel@gmx.de>
Date: Fri, 12 Apr 2013 02:46:37 +0000
Subject: [PATCH 0040/1587] Added array_map() snippet

---
 snippets/php.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 6ca1f582c..3e5a9becd 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -394,3 +394,8 @@ snippet rett
 	return true;
 snippet retf
 	return false;
+snippet am
+	array_map(function($${1:v}) {
+		${3}
+		return $$1;
+	}, $${2:foo});

From 2c858bb724c3cec61094f26f3ccf5bf28a8da8bb Mon Sep 17 00:00:00 2001
From: Michael Thessel <michael.thessel@gmx.de>
Date: Fri, 12 Apr 2013 02:50:15 +0000
Subject: [PATCH 0041/1587] Added return array placeholder

---
 snippets/php.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 3e5a9becd..f8a406ff0 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -395,7 +395,7 @@ snippet rett
 snippet retf
 	return false;
 snippet am
-	array_map(function($${1:v}) {
+	$${1:foo} = array_map(function($${2:v}) {
 		${3}
-		return $$1;
-	}, $${2:foo});
+		return $$2;
+	}, $$1);

From 8ec2e4ce7aab2fd84826d13dd6af9e4dc5453e46 Mon Sep 17 00:00:00 2001
From: Michael Thessel <michael.thessel@gmx.de>
Date: Fri, 12 Apr 2013 02:57:14 +0000
Subject: [PATCH 0042/1587] Added array_walk snippet

---
 snippets/php.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index f8a406ff0..793c2a572 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -399,3 +399,7 @@ snippet am
 		${3}
 		return $$2;
 	}, $$1);
+snippet aw
+	array_walk($${1:foo}, function(&$${2:v}, $${3:k}) {
+		$$2 = ${4};
+	});

From c9336b759af5f21a8ff82a678bfa967168869bb6 Mon Sep 17 00:00:00 2001
From: Michael Thessel <der.thes@gmail.com>
Date: Sat, 13 Apr 2013 15:57:44 +0000
Subject: [PATCH 0043/1587] Added snippet for to print wa variable to a file

---
 snippets/php.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 793c2a572..5ca502de8 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -343,6 +343,8 @@ snippet vd
 	var_dump(${1});
 snippet vdd
 	var_dump(${1}); die(${2:});
+snippet vdf
+	error_log(print_r($${1:foo}, true), 3, '${2:/tmp/debug.log}');${3}
 snippet http_redirect
 	header ("HTTP/1.1 301 Moved Permanently");
 	header ("Location: ".URL);

From 17f194c2047b81a6646b55c8361bdd9d9e2b492e Mon Sep 17 00:00:00 2001
From: Jinzhu <wosmvp@gmail.com>
Date: Tue, 16 Apr 2013 14:08:14 +0800
Subject: [PATCH 0044/1587] Fix issues in eruby.snippets

---
 UltiSnips/eruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index 1fdcfc167..c6b201eae 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -14,9 +14,9 @@ def textmate_var(var, snip):
     lookup = dict(
        TM_RAILS_TEMPLATE_START_RUBY_EXPR = snip.opt('g:tm_rails_template_start_ruby_expr', '<%= '),
        TM_RAILS_TEMPLATE_END_RUBY_EXPR = snip.opt('g:tm_rails_template_end_ruby_expr', ' %>'),
-       TM_RAILS_TEMPLATE_START_RUBY_INLINE = snip.opt('g:tm_rails_template_start_ruby_inline', ' %>'),
+       TM_RAILS_TEMPLATE_START_RUBY_INLINE = snip.opt('g:tm_rails_template_start_ruby_inline', '<% '),
        TM_RAILS_TEMPLATE_END_RUBY_INLINE = snip.opt('g:tm_rails_template_end_ruby_inline', ' %>'),
-       TM_RAILS_TEMPLATE_END_RUBY_BLOCK = 'end'
+       TM_RAILS_TEMPLATE_END_RUBY_BLOCK = '<% end %>'
     )
 
     snip.rv = lookup[var]

From 42168b1c1711551800100c6b9b7e42b86edacc75 Mon Sep 17 00:00:00 2001
From: Nicklasos <nicklasos@gmail.com>
Date: Wed, 17 Apr 2013 00:44:48 +0300
Subject: [PATCH 0045/1587] Update php.snippets

Add php template snippets.
---
 snippets/php.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 513ee9b60..d803e663b 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -9,6 +9,18 @@ snippet <?e
 # this one is for php5.4
 snippet <?=
 	<?=${1}?>
+snippet ?=
+	<?= ${1} ?>
+snippet ?
+	<?php ${1} ?>
+snippet ?f
+	<?php foreach (${1:$vars} as ${2:$var}): ?>
+		${3}
+	<?php endforeach ?>
+snippet ?i
+	<?php if (${1}): ?>
+		${2}
+	<?php endif ?>
 snippet ns
 	namespace ${1:Foo\Bar\Baz};
 	${2}

From b66dd896e1f07489c0bfc98f3d8de9a7043312a7 Mon Sep 17 00:00:00 2001
From: Nicklasos <nicklasos@gmail.com>
Date: Wed, 17 Apr 2013 00:52:43 +0300
Subject: [PATCH 0046/1587] Update php.snippets

---
 snippets/php.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index d803e663b..31ebdfa83 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -14,11 +14,11 @@ snippet ?=
 snippet ?
 	<?php ${1} ?>
 snippet ?f
-	<?php foreach (${1:$vars} as ${2:$var}): ?>
+	<?php foreach ($${1:vars} as $${2:$var}): ?>
 		${3}
 	<?php endforeach ?>
 snippet ?i
-	<?php if (${1}): ?>
+	<?php if ($${1:var}): ?>
 		${2}
 	<?php endif ?>
 snippet ns

From 5525e94d09e7b3a6344de356ed3f8591ba10edc2 Mon Sep 17 00:00:00 2001
From: Honza Pokorny <me@honza.ca>
Date: Tue, 23 Apr 2013 09:57:09 -0300
Subject: [PATCH 0047/1587] Add @gorodinskiy as the scala maintainer

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 17a73739e..6846edb23 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@ Snipmate & UltiSnip Snippets
 
 This repository contains snippets files for various programming languages.
 
-It is community-maintained and many people have contributed snippet files and other
-improvements already.
+It is community-maintained and many people have contributed snippet files and
+other improvements already.
 
 Contents
 ========
@@ -82,6 +82,7 @@ to maintain snippets for a language, please get in touch.
 * Markdown - [honza](http://github.com/honza)
 * Ruby - [taq](http://github.com/taq)
 * PHP - [chrisyue](http://github.com/chrisyue)
+* Scala - [gorodinskiy](https://github.com/gorodinskiy)
 
 Contributing notes
 ------------------

From 4e4c7f48cf35a9e3f9c2a30a0ffe28e8f06b50c0 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Thu, 25 Apr 2013 14:30:58 -0300
Subject: [PATCH 0048/1587] Fix missing = on some eruby snippets.

---
 snippets/eruby.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index f96ca8462..592e490bd 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -50,15 +50,15 @@ snippet cs
 snippet ct
 	<%= content_tag '${1:DIV}', ${2:content}${3:,options} %>
 snippet ff
-	<% form_for @${1:model} do |f| %>
+	<%= form_for @${1:model} do |f| %>
 		${2}
 	<% end %>
 snippet ffcb
 	<%= ${1:f}.check_box :${2:attribute} %>
 snippet ffe
 	<% error_messages_for :${1:model} %>
-	
-	<% form_for @${2:model} do |f| %>
+
+	<%= form_for @${2:model} do |f| %>
 		${3}
 	<% end %>
 snippet ffff
@@ -78,7 +78,7 @@ snippet ffta
 snippet fftf
 	<%= ${1:f}.text_field :${2:attribute} %>
 snippet fields
-	<% fields_for :${1:model}, @$1 do |${2:f}| %>
+	<%= fields_for :${1:model}, @$1 do |${2:f}| %>
 		${3}
 	<% end %>
 snippet i18

From f81901d027d56455fea6b4bdb72f1c81b1496f7d Mon Sep 17 00:00:00 2001
From: Konstantin Gorodinskiy <gor.konstantin@gmail.com>
Date: Thu, 25 Apr 2013 22:59:03 +0400
Subject: [PATCH 0049/1587] fix for comments in coffeescript snippets for
 snipmate

---
 snippets/coffee.snippets | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/snippets/coffee.snippets b/snippets/coffee.snippets
index 83b77ebab..11c82e7db 100644
--- a/snippets/coffee.snippets
+++ b/snippets/coffee.snippets
@@ -6,33 +6,33 @@ snippet forindo
 # Array comprehension
 snippet fora
 	for ${1:name} in ${2:array}
-		${3:// body...}
+		${3:# body...}
 # Object comprehension
 snippet foro
 	for ${1:key}, ${2:value} of ${3:object}
-		${4:// body...}
+		${4:# body...}
 # Range comprehension (inclusive)
 snippet forr
 	for ${1:name} in [${2:start}..${3:finish}]
-		${4:// body...}
+		${4:# body...}
 snippet forrb
 	for ${1:name} in [${2:start}..${3:finish}] by ${4:step}
-		${5:// body...}
+		${5:# body...}
 # Range comprehension (exclusive)
 snippet forrex
 	for ${1:name} in [${2:start}...${3:finish}]
-		${4:// body...}
+		${4:# body...}
 snippet forrexb
 	for ${1:name} in [${2:start}...${3:finish}] by ${4:step}
-		${5:// body...}
+		${5:# body...}
 # Function
 snippet fun
 	(${1:args}) ->
-		${2:// body...}
+		${2:# body...}
 # Function (bound)
 snippet bfun
 	(${1:args}) =>
-		${2:// body...}
+		${2:# body...}
 # Class
 snippet cla class ..
 	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
@@ -55,17 +55,17 @@ snippet cla class .. extends .. constructor: ..
 # If
 snippet if
 	if ${1:condition}
-		${2:// body...}
+		${2:# body...}
 # If __ Else
 snippet ife
 	if ${1:condition}
-		${2:// body...}
+		${2:# body...}
 	else
-		${3:// body...}
+		${3:# body...}
 # Else if
 snippet elif
 	else if ${1:condition}
-		${2:// body...}
+		${2:# body...}
 # Ternary If
 snippet ifte
 	if ${1:condition} then ${2:value} else ${3:other}
@@ -76,7 +76,7 @@ snippet unl
 snippet swi
 	switch ${1:object}
 		when ${2:value}
-			${3:// body...}
+			${3:# body...}
 
 # Log
 snippet log

From 339128057027bb7595beb9971d4e335b92df1fa8 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Sun, 28 Apr 2013 15:47:48 -0300
Subject: [PATCH 0050/1587] Refactor snippet to create new collumn in a
 migration(mccc -> mnc)

---
 snippets/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index a9b45ad49..802b6edd5 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -890,8 +890,8 @@ snippet mrnc
 	rename_column :${1:table_name}, :${2:old_column_name}, :${3:new_column_name}
 snippet mcc
 	change_column :${1:table}, :${2:column}, :${3:type}
-snippet mccc
-	t.column :${1:title}, :${2:string}
+snippet mnc
+	t.${1:string} :${2:title}${3:, null: false}${4}
 snippet mct
 	create_table :${1:table_name} do |t|
 		t.column :${2:name}, :${3:type}

From 76f2ff8337577bb8ffa2698769e96b0dc45be328 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Sun, 28 Apr 2013 15:50:34 -0300
Subject: [PATCH 0051/1587] Remove empty column in mct snippet

---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 802b6edd5..efb707568 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -894,7 +894,7 @@ snippet mnc
 	t.${1:string} :${2:title}${3:, null: false}${4}
 snippet mct
 	create_table :${1:table_name} do |t|
-		t.column :${2:name}, :${3:type}
+		${2}
 	end
 snippet migration
 	class ${1:class_name} < ActiveRecord::Migration

From 0312e12c29ba6946b9c203b758824ce071a6b0d2 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Sun, 28 Apr 2013 15:51:55 -0300
Subject: [PATCH 0052/1587] Refactor old migration creation snippet and an
 alternative one

---
 snippets/ruby.snippets | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index efb707568..fdf479a2b 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -896,16 +896,21 @@ snippet mct
 	create_table :${1:table_name} do |t|
 		${2}
 	end
-snippet migration
+snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
 	class ${1:class_name} < ActiveRecord::Migration
-		def self.up
+		def up
 			${2}
 		end
 
-		def self.down
+		def down
+		end
+	end
+snippet migration class .. < ActiveRecord::Migration .. def change .. end
+	class ${1:class_name} < ActiveRecord::Migration
+		def change
+			${2}
 		end
 	end
-
 snippet trc
 	t.remove :${1:column}
 snippet tre
@@ -913,7 +918,6 @@ snippet tre
 	${3}
 snippet tref
 	t.references :${1:model}
-
 #rspec
 snippet it
 	it "${1:spec_name}" do

From 5edc9786e497fafc9f9ff4151db4d1e59aacb269 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 29 Apr 2013 20:15:42 +0200
Subject: [PATCH 0053/1587] document how version differences could be coped
 with

---
 README.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/README.md b/README.md
index 6846edb23..0cd0f90d6 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,33 @@ Historical notes
 unfortunately abandoned the project. [Rok Garbas][3] is now maintaining a
 [fork][4] of the project in hopes of improving the existing code base.
 
+Versions / dialects / ..
+========================
+There are some issues, such as newer language versions may require other
+snippets than older. If this exists we currently recommend doing this:
+
+add snippets/ruby.snippets (common snippets)
+add snippets/ruby-1.8.snippets (1.8 only)
+add snippets/ruby-1.9.snippets (1.9 only)
+
+then configure github.com/garbas/vim-snipmate this way:
+
+    let g:snipMate = {}
+    let g:snipMate.scope_aliases = {}
+    let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails,ruby-1.9'
+
+or github.com/MarcWeber/UltiSnips this way:
+
+
+    let g:UltiSnips = {}
+
+    let g:UltiSnips.snipmate_ft_filter = {
+                \ 'default' : {'filetypes': ["FILETYPE"] },
+                \ 'ruby'    : {'filetypes': ["ruby", "ruby-rails", "ruby-1.9"] },
+
+
+If it happens that you work on a project requiring ruby-1.8 snippets instead,
+consider using vim-addon-local-vimrc and override the filetypes.
 
 Language maintainers
 --------------------
@@ -76,6 +103,11 @@ Language maintainers
 No one can really be proficient in all programming languages. If you would like
 to maintain snippets for a language, please get in touch.
 
+Notes: People are interested in snippets - and their interest may stop again
+at will. So its ok if people maintain a language only for a short period of
+time - or jump in and get things done - don't let the flow stop :)
+vim-snippets is not like the "linux kernel".
+
 * Python - [honza](http://github.com/honza)
 * Javascript - [honza](http://github.com/honza)
 * HTML Django - [honza](http://github.com/honza)

From c4d45b83f1f877f85e153425eefded4bd0af450e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 29 Apr 2013 22:40:16 +0200
Subject: [PATCH 0054/1587] what about libraries? postfixes may do it

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 0cd0f90d6..720c58b3b 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,14 @@ or github.com/MarcWeber/UltiSnips this way:
 If it happens that you work on a project requiring ruby-1.8 snippets instead,
 consider using vim-addon-local-vimrc and override the filetypes.
 
+Well - of course it may not make sense to create a new file for each
+ruby-library-version triplet. Sometimes postfixing a name such as
+
+    migrate_lib_20_down
+    migrate_lib_20_up
+
+will do it then if syntax has changed.
+
 Language maintainers
 --------------------
 

From c89448fcada3a9bdca2ac3f22c7ac9491cce14b4 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Thu, 2 May 2013 10:09:31 -0300
Subject: [PATCH 0055/1587] Add ruby snippet btp for polymorphic belongs_to

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index fdf479a2b..2bcc9de8e 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -589,6 +589,8 @@ snippet bf
 	before_filter :${1:method}
 snippet bt
 	belongs_to :${1:association}
+snippet btp
+	belongs_to :${1:association}, :polymorphic => true${2}
 snippet crw
 	cattr_accessor :${1:attr_names}
 snippet defcreate

From d01c475b297d9dfd693bc0321ad47dcdf1608418 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Fri, 3 May 2013 10:26:29 -0300
Subject: [PATCH 0056/1587] Add let! and remove brackets from let.

The user must choose which block syntax to be used.
---
 snippets/ruby.snippets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 2bcc9de8e..aa7627277 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -950,7 +950,9 @@ snippet aft
 		${2}
 	end
 snippet let
-	let(:${1:method}) { ${2} }
+	let(:${1:object}) ${2:block}
+snippet let!
+	let!(:${1:object}) ${2:block}
 snippet subj
 	subject { ${1} }
 snippet spec

From 53e003901e7088bfaea78cf75f4b978ea48a674b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 5 May 2013 22:13:24 +0200
Subject: [PATCH 0057/1587] advertise git based wiki - either it will be a
 success - or it will fail - anyway I want to know soon

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 720c58b3b..41f199733 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,12 @@ so that all users can benefit from them.  People can list their snippet reposito
 
 Installation using VAM: "github:rbonvall/snipmate-snippets-bib"
 
+
+## If you believe in the success of vim-snipmate
+then you may also want to have a look at [vim-git-wiki](github.com/MarcWeber/vim-git-wiki)
+If you contribute to this git based wiki editable by Vim we have a chance
+making it official ot www.vim.org.
+
 Historical notes
 ================
 

From 6d8d34442d2482647f21762dd3e4d50fd2a406f9 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Sun, 5 May 2013 22:08:07 -0300
Subject: [PATCH 0058/1587] Update README.md

Fix link to vim-git-wiki and minor typos
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 41f199733..1c9497851 100644
--- a/README.md
+++ b/README.md
@@ -64,9 +64,9 @@ Installation using VAM: "github:rbonvall/snipmate-snippets-bib"
 
 
 ## If you believe in the success of vim-snipmate
-then you may also want to have a look at [vim-git-wiki](github.com/MarcWeber/vim-git-wiki)
+then you may also want to have a look at [vim-git-wiki](http://github.com/MarcWeber/vim-git-wiki).
 If you contribute to this git based wiki editable by Vim we have a chance
-making it official ot www.vim.org.
+of making it official at www.vim.org.
 
 Historical notes
 ================

From 38cb74198d194dbdda85c6579050db6afb079dd8 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Mon, 13 May 2013 10:32:32 -0300
Subject: [PATCH 0059/1587] Add ruby snippet for accepts_nested_attributes_for

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index aa7627277..95b6fa96e 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -967,3 +967,5 @@ snippet shared
 	shared_examples "${1:shared examples name}" ${2}
 snippet itb
 	it_behaves_like "${1:shared examples name}"${2}
+snippet ana
+	accepts_nested_attributes_for :${1:association}

From 5dd73100c7d5e82af66908e61feac5f2c05612f0 Mon Sep 17 00:00:00 2001
From: mwcz <mwc@clayto.org>
Date: Thu, 18 Apr 2013 23:30:40 -0400
Subject: [PATCH 0060/1587] add datetime snippet

---
 snippets/_.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index cb51536c3..c11539faf 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -9,6 +9,8 @@ snippet ddate
 	`strftime("%B %d, %Y")`
 snippet time
 	`strftime("%H:%M")`
+snippet datetime
+	`strftime("%Y-%m-%d %H:%M")`
 snippet lorem
 	Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 snippet GPL2

From 645a99fe240bb17a872bc6ede9a6cdcef2246f41 Mon Sep 17 00:00:00 2001
From: mwcz <mwc@clayto.com>
Date: Mon, 13 May 2013 11:19:05 -0400
Subject: [PATCH 0061/1587] add snippets for property descriptors

---
 snippets/javascript.snippets | 37 ++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index 2901587f0..801968fcd 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -161,3 +161,40 @@ snippet obj
 		F.prototype = o;
 		return new F();
 	}
+# Define multiple properties
+snippet props
+	var ${1:my_object} = Object.defineProperties(
+		${2:new Object()}, 
+		{
+			${3:property} : {
+				get : function $1_$3_getter() {
+					// getter code
+				},
+				set : function $1_$3_setter(value) {
+					// setter code
+				},
+				value        : ${4:value},
+				writeable    : ${5:boolean},
+				enumerable   : ${6:boolean},
+				configurable : ${7:boolean}
+			}
+		}
+	);
+# Define single property
+snippet prop
+	Object.defineProperty( 
+		${1:object},
+		"${2:property}", 
+		{
+			get : function $1_$2_getter() {
+				// getter code
+			},
+			set : function $1_$2_setter(value) {
+				// setter code
+			},
+			value        : ${3:value},
+			writeable    : ${4:boolean},
+			enumerable   : ${5:boolean},
+			configurable : ${6:boolean}
+		}
+	);

From 36d57ca156ea6146f4a66bf65134a8349d9c5e3c Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Fri, 17 May 2013 11:19:50 +0800
Subject: [PATCH 0062/1587] add logging in python snippets

---
 snippets/python.snippets | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 9cb21135b..5f719dfb0 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -162,3 +162,18 @@ snippet getopt
 			${4}
 		elif option in ("-v", "--verbose"):
 			verbose = argument
+# logging
+# glog = get log
+snippet glog
+	import logging
+	logger = logging.getLogger(${2:__name__})
+snippet le
+	logger.error(${1:msg})
+snippet ld
+	logger.debug(${1:msg})
+snippet lw
+	logger.warning(${1:msg})
+snippet lc
+	logger.critical(${1:msg})
+snippet li
+	logger.info(${1:msg})

From aabd2d94ca3995cde8217c6b8896066d1488ac6a Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Fri, 17 May 2013 11:28:28 +0800
Subject: [PATCH 0063/1587] fix glog $2 not right

---
 snippets/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 5f719dfb0..ed1155f3f 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -166,7 +166,7 @@ snippet getopt
 # glog = get log
 snippet glog
 	import logging
-	logger = logging.getLogger(${2:__name__})
+	logger = logging.getLogger(${1:__name__})
 snippet le
 	logger.error(${1:msg})
 snippet ld

From 1d04040a19ec3a11b4ea9fc664a3fde9ab33893f Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Sun, 19 May 2013 18:00:59 -0300
Subject: [PATCH 0064/1587] Add has_one ... dependent: ... ruby snippet

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 95b6fa96e..13522e3b6 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -680,6 +680,8 @@ snippet hmt
 	has_many :${1:object}, :through => :${2:object}
 snippet ho
 	has_one :${1:object}
+snippet hod
+	has_one :${1:object}, dependent: :${2:destroy}
 snippet i18
 	I18n.t('${1:type.key}')${2}
 snippet ist

From 1c060f7b1284d9d32ffd4f30f5e4c4329d8cd9d0 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Fri, 24 May 2013 17:00:04 +0800
Subject: [PATCH 0065/1587] fix lambda conflict with logger.debug

---
 snippets/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index ed1155f3f..b8593602f 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -79,7 +79,7 @@ snippet clatin1
 snippet cascii
 	# -*- coding: ascii -*-
 # Lambda
-snippet ld
+snippet lda
 	${1:var} = lambda ${2:vars} : ${3:action}
 snippet .
 	self.

From 3a93e890ebd660fa65fc53373b73cff6ad67f3f9 Mon Sep 17 00:00:00 2001
From: Enric Lluelles <enric@lluell.es>
Date: Sun, 26 May 2013 23:33:29 +0200
Subject: [PATCH 0066/1587] Adding span# and span. snippets

---
 snippets/html.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index cfc44ad1d..9693fe003 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -730,6 +730,10 @@ snippet source
 	<source src="${1}" type="${2}" media="${3}" />
 snippet span
 	<span>${1}</span>
+snippet span#
+	<span id="${1}">${2}</span>
+snippet span.
+	<span class="${1}">${2}</span>
 snippet strong
 	<strong>${1}</strong>
 snippet style

From 72eeef77dec4d243ecf955fa55f88355a402c3bd Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Mon, 27 May 2013 10:51:49 +0800
Subject: [PATCH 0067/1587] fix lambda conflict #208 with alter logger.debug
 into lg

---
 snippets/python.snippets | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index b8593602f..518d2d664 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -79,7 +79,7 @@ snippet clatin1
 snippet cascii
 	# -*- coding: ascii -*-
 # Lambda
-snippet lda
+snippet ld
 	${1:var} = lambda ${2:vars} : ${3:action}
 snippet .
 	self.
@@ -169,7 +169,8 @@ snippet glog
 	logger = logging.getLogger(${1:__name__})
 snippet le
 	logger.error(${1:msg})
-snippet ld
+# conflict with lambda=ld, therefor we change into Logger.debuG
+snippet lg
 	logger.debug(${1:msg})
 snippet lw
 	logger.warning(${1:msg})

From b2dbd2ac4bf9dacad3583b40765e3e88f9b75ecf Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Fri, 31 May 2013 09:45:28 +0800
Subject: [PATCH 0068/1587] add CJK support

---
 snippets/rst.snippets | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index 97845de3f..46405f7f1 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -19,4 +19,10 @@ snippet -
 	${3}
 snippet cont:
 	.. contents::
-	
+
+# CJK optimize, CJK has no space between charaters
+snippet *c
+	\ *${1:Emphasis}*\ 
+snippet **c
+	\ **${1:Strong emphasis}**\ 
+

From b6074fab15ac8cdaa44cef8eaf313e86dff1346c Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Fri, 31 May 2013 11:06:43 +0800
Subject: [PATCH 0069/1587] add some directives

---
 snippets/rst.snippets | 43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index 46405f7f1..b99f6d4f5 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -3,9 +3,9 @@
 snippet :
 	:${1:field name}: ${2:field body}
 snippet *
-	*${1:Emphasis}*
+	*${1:Emphasis}* ${2}
 snippet **
-	**${1:Strong emphasis}**
+	**${1:Strong emphasis}** ${2}
 snippet _
 	\`${1:hyperlink-name}\`_
 	.. _\`$1\`: ${2:link-block}
@@ -17,12 +17,45 @@ snippet -
 	${1:Title}
 	-----${2:-}
 	${3}
+#some directive
+snippet img:
+	.. |${2:alias}| image:: ${1:img}
 snippet cont:
 	.. contents::
-
+		${1:content}
+snippet code:
+	.. code:: ${1:type}
+		${2:write some code}
+snippet tip:
+	.. tip::
+		${1:my tips}
+snippet not:
+	.. note::
+		${1:my notes}
+snippet	war:
+	.. warning::
+		${1:attention!}
+snippet imp:
+	.. important::
+		${1:this is importatnt}
+snippet att:
+	.. attention::
+		${1:hey!}
+snippet dan:
+	.. danger::
+		${1:ah!}
+snippet err:
+	.. error::
+		${1:Error occur}
+snippet cau:
+	.. caution::
+		${1:Watch out!}
+snippet sid:
+	.. sidebar:: ${1:Title}
+	
 # CJK optimize, CJK has no space between charaters
 snippet *c
-	\ *${1:Emphasis}*\ 
+	\ *${1:Emphasis}*\ ${2} 
 snippet **c
-	\ **${1:Strong emphasis}**\ 
+	\ **${1:Strong emphasis}**\ ${2}
 

From 12e4eab2a7f76a0ec48cc18b52c958f2ef5de222 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Fri, 31 May 2013 11:12:17 +0800
Subject: [PATCH 0070/1587] fix code section failed

---
 snippets/rst.snippets | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index b99f6d4f5..ca0c15589 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -25,6 +25,7 @@ snippet cont:
 		${1:content}
 snippet code:
 	.. code:: ${1:type}
+		
 		${2:write some code}
 snippet tip:
 	.. tip::
@@ -50,9 +51,11 @@ snippet err:
 snippet cau:
 	.. caution::
 		${1:Watch out!}
+#Spinx only
 snippet sid:
 	.. sidebar:: ${1:Title}
-	
+		
+		${2}	
 # CJK optimize, CJK has no space between charaters
 snippet *c
 	\ *${1:Emphasis}*\ ${2} 

From 20d65b0617b4580f19f15c6e22b82b55888454d0 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Fri, 31 May 2013 11:18:29 +0800
Subject: [PATCH 0071/1587] add figure

---
 snippets/rst.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index ca0c15589..d97fa5738 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -20,6 +20,11 @@ snippet -
 #some directive
 snippet img:
 	.. |${2:alias}| image:: ${1:img}
+snippet fig:
+	.. figure:: ${1:img}
+		:alt: ${2:alter text}
+
+		$2
 snippet cont:
 	.. contents::
 		${1:content}

From 234ddb7e702f3e4fdb127ed8fb8a916503da3fce Mon Sep 17 00:00:00 2001
From: babybeasimple <babybeasimple@gmail.com>
Date: Fri, 31 May 2013 23:42:10 +0400
Subject: [PATCH 0072/1587] refactor ruby on rails validations with new style

---
 snippets/ruby.snippets | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 13522e3b6..ac97f33c1 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -849,24 +849,24 @@ snippet tctss
 	${1}
 snippet va
 	validates_associated :${1:attribute}
-snippet vao
-	validates_acceptance_of :${1:terms}
+snippet va
+	validates :${1:terms}, :acceptance => true
 snippet vc
-	validates_confirmation_of :${1:attribute}
+	validates :${1:attribute}, :confirmation => true
 snippet ve
-	validates_exclusion_of :${1:attribute}, :in => ${2:%w( mov avi )}
+	validates :${1:attribute}, :exclusion => { :in => ${2:%w( mov avi )} }
 snippet vf
-	validates_format_of :${1:attribute}, :with => /${2:regex}/
+	validates :${1:attribute}, :format => { :with => /${2:regex}/ }
 snippet vi
-	validates_inclusion_of :${1:attribute}, :in => %w(${2: mov avi })
+	validates :${1:attribute}, :inclusion => { :in => %w(${2: mov avi }) }
 snippet vl
-	validates_length_of :${1:attribute}, :within => ${2:3}..${3:20}
+	validates :${1:attribute}, :length => { :in => ${2:3}..${3:20} }
 snippet vn
-	validates_numericality_of :${1:attribute}
-snippet vpo
-	validates_presence_of :${1:attribute}
+	validates :${1:attribute}, :numericality => true
+snippet vp
+	validates :${1:attribute}, :presence => true
 snippet vu
-	validates_uniqueness_of :${1:attribute}
+	validates :${1:attribute}, :uniqueness => true
 snippet wants
 	wants.${1:js|xml|html} { ${2} }
 snippet wc

From 2f72d327ecc6e8bc47adc946be6a961cb7c66e44 Mon Sep 17 00:00:00 2001
From: Eduardo Gurgel <edgurgel@gmail.com>
Date: Sat, 1 Jun 2013 04:13:23 -0300
Subject: [PATCH 0073/1587] Add syntax highlighting to README.md

---
 README.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 1c9497851..cb9074bed 100644
--- a/README.md
+++ b/README.md
@@ -86,19 +86,23 @@ add snippets/ruby-1.9.snippets (1.9 only)
 
 then configure github.com/garbas/vim-snipmate this way:
 
-    let g:snipMate = {}
-    let g:snipMate.scope_aliases = {}
-    let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails,ruby-1.9'
 
-or github.com/MarcWeber/UltiSnips this way:
+```vim
+let g:snipMate = {}
+let g:snipMate.scope_aliases = {}
+let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails,ruby-1.9'
+```
 
+or github.com/MarcWeber/UltiSnips this way:
 
-    let g:UltiSnips = {}
 
-    let g:UltiSnips.snipmate_ft_filter = {
-                \ 'default' : {'filetypes': ["FILETYPE"] },
-                \ 'ruby'    : {'filetypes': ["ruby", "ruby-rails", "ruby-1.9"] },
+```vim
+let g:UltiSnips = {}
 
+let g:UltiSnips.snipmate_ft_filter = {
+            \ 'default' : {'filetypes': ["FILETYPE"] },
+            \ 'ruby'    : {'filetypes': ["ruby", "ruby-rails", "ruby-1.9"] },
+```
 
 If it happens that you work on a project requiring ruby-1.8 snippets instead,
 consider using vim-addon-local-vimrc and override the filetypes.

From b1bca66a11f21027d3f041943446ee280775dbad Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Sat, 1 Jun 2013 10:39:30 -0300
Subject: [PATCH 0074/1587] Add elixir snippets.

---
 snippets/elixir.snippets | 93 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 snippets/elixir.snippets

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
new file mode 100644
index 000000000..449071cde
--- /dev/null
+++ b/snippets/elixir.snippets
@@ -0,0 +1,93 @@
+snippet if if .. do .. end
+	if ${1} do
+		${2}
+	end
+
+snippet if if .. do: ..
+	if ${1:condition}, do: ${2}
+
+snippet ife if .. do .. else .. end
+	if ${1:condition} do
+		${2}
+	else
+		${3}
+	end
+
+snippet ife if .. do: .. else:
+	if ${1:condition}, do: ${2}, else: ${3}
+
+snippet case
+	case ${1} do
+	match: ${2}
+		${3}
+	end
+
+snippet def
+	def ${1:name} do
+		${2}
+	end
+
+snippet defim
+	defimpl ${1:protocol_name}, for: ${2:data_type} do
+		${3}
+	end
+
+snippet defma
+	defmacro ${1:name} do
+		${2}
+	end
+
+snippet defmo
+	defmodule ${1:module_name} do
+		${2}
+	end
+
+snippet defp
+	defp ${1:name} do
+		${2}
+	end
+
+snippet defpr
+	defprotocol ${1:name}, [${2:function}]
+
+snippet defr
+	defrecord ${1:record_name}, ${2:functions}
+
+snippet doc
+	@doc """
+	${1}
+	"""
+
+snippet fn
+	fn(${1:args}) -> ${2} end
+
+snippet loop
+	loop ${1:values}, ${2:initial} do
+	match: ${3}
+		${4}
+	end
+
+snippet mdoc
+	@moduledoc """
+	${1}
+	"""
+
+snippet rec
+	receive do
+	match: ${1}
+		${2}
+	end
+
+snippet req
+	require ${1:module_name}, as: ${2:alias}
+
+snippet test
+	test "${1:test_name}" do
+		${2}
+	end
+
+snippet try
+	try do
+	catch: ${1}
+		${2}
+	end

From 4b42fc04b625338819f8fbc26ef7f2267aed5f30 Mon Sep 17 00:00:00 2001
From: Eduardo Gurgel <edgurgel@gmail.com>
Date: Sat, 1 Jun 2013 22:43:20 -0300
Subject: [PATCH 0075/1587] Update elixir snippets to stable Elixir lang

---
 snippets/elixir.snippets | 51 ++++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 449071cde..9c562adda 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -16,9 +16,33 @@ snippet ife if .. do .. else .. end
 snippet ife if .. do: .. else:
 	if ${1:condition}, do: ${2}, else: ${3}
 
+snippet unless unless .. do .. end
+	unless ${1} do
+		${2}
+	end
+
+snippet unless unless .. do: ..
+	unless ${1:condition}, do: ${2}
+
+snippet unlesse unless .. do .. else .. end
+	unless ${1:condition} do
+		${2}
+	else
+		${3}
+	end
+
+snippet unlesse unless .. do: .. else:
+	unless ${1:condition}, do: ${2}, else: ${3}
+
+snippet cond
+	cond do
+	${1} ->
+		${2}
+	end
+
 snippet case
 	case ${1} do
-	match: ${2}
+	${2} ->
 		${3}
 	end
 
@@ -51,7 +75,7 @@ snippet defpr
 	defprotocol ${1:name}, [${2:function}]
 
 snippet defr
-	defrecord ${1:record_name}, ${2:functions}
+	defrecord ${1:record_name}, ${2:fields}
 
 snippet doc
 	@doc """
@@ -61,12 +85,6 @@ snippet doc
 snippet fn
 	fn(${1:args}) -> ${2} end
 
-snippet loop
-	loop ${1:values}, ${2:initial} do
-	match: ${3}
-		${4}
-	end
-
 snippet mdoc
 	@moduledoc """
 	${1}
@@ -74,20 +92,27 @@ snippet mdoc
 
 snippet rec
 	receive do
-	match: ${1}
+	${1} ->
 		${2}
 	end
 
 snippet req
-	require ${1:module_name}, as: ${2:alias}
+	require ${1:module_name}
+
+snippet imp
+	import ${1:module_name}
+
+snippet ali
+	alias ${1:module_name}
 
 snippet test
 	test "${1:test_name}" do
 		${2}
 	end
 
-snippet try
+snippet try try .. rescue .. end
 	try do
-	catch: ${1}
-		${2}
+		${1}
+	rescue
+		${2} -> ${3}
 	end

From dbf583d697b6552cb8b97ffdbe9ea41fbad76e2c Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Tue, 4 Jun 2013 17:08:29 +0800
Subject: [PATCH 0076/1587] unity all directives, peel off ":"

---
 snippets/rst.snippets | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index d97fa5738..a6558f055 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -18,46 +18,46 @@ snippet -
 	-----${2:-}
 	${3}
 #some directive
-snippet img:
+snippet img
 	.. |${2:alias}| image:: ${1:img}
-snippet fig:
+snippet fig
 	.. figure:: ${1:img}
 		:alt: ${2:alter text}
 
 		$2
-snippet cont:
+snippet con
 	.. contents::
 		${1:content}
-snippet code:
+snippet cod
 	.. code:: ${1:type}
 		
 		${2:write some code}
-snippet tip:
+snippet tip
 	.. tip::
 		${1:my tips}
-snippet not:
+snippet not
 	.. note::
 		${1:my notes}
-snippet	war:
+snippet	war
 	.. warning::
 		${1:attention!}
-snippet imp:
+snippet imp
 	.. important::
 		${1:this is importatnt}
-snippet att:
+snippet att
 	.. attention::
 		${1:hey!}
-snippet dan:
+snippet dan
 	.. danger::
 		${1:ah!}
-snippet err:
+snippet err
 	.. error::
 		${1:Error occur}
-snippet cau:
+snippet cau
 	.. caution::
 		${1:Watch out!}
 #Spinx only
-snippet sid:
+snippet sid
 	.. sidebar:: ${1:Title}
 		
 		${2}	

From c5f0409182bdb81d291588a1fe52d9e094a7081f Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Tue, 4 Jun 2013 17:11:17 +0800
Subject: [PATCH 0077/1587] fix `**` conflict with `*`, triggered while typing
 `**<tab>` snippet will expand into `* *{e}*`. I change into `*&` user still
 don't have to release their Shift key

---
 snippets/rst.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index a6558f055..657d8b5a5 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -4,7 +4,7 @@ snippet :
 	:${1:field name}: ${2:field body}
 snippet *
 	*${1:Emphasis}* ${2}
-snippet **
+snippet *&
 	**${1:Strong emphasis}** ${2}
 snippet _
 	\`${1:hyperlink-name}\`_
@@ -62,8 +62,8 @@ snippet sid
 		
 		${2}	
 # CJK optimize, CJK has no space between charaters
-snippet *c
+snippet *!
 	\ *${1:Emphasis}*\ ${2} 
-snippet **c
+snippet *&!
 	\ **${1:Strong emphasis}**\ ${2}
 

From bc17b3d0231316962144fbdc3619a98f15c9e6d6 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Tue, 4 Jun 2013 10:30:10 -0300
Subject: [PATCH 0078/1587] Fix ruby snippets with the same name

---
 snippets/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index ac97f33c1..027edf48e 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -847,9 +847,9 @@ snippet tcts
 snippet tctss
 	t.timestamps
 	${1}
-snippet va
+snippet va validates_associated
 	validates_associated :${1:attribute}
-snippet va
+snippet va validates .., :acceptance => true
 	validates :${1:terms}, :acceptance => true
 snippet vc
 	validates :${1:attribute}, :confirmation => true

From 8f9010d21638dacf0839589f066eed31c5468d66 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Wed, 5 Jun 2013 10:45:38 +0800
Subject: [PATCH 0079/1587] reverse original ** for em

---
 snippets/rst.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index 657d8b5a5..46e2215ee 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -4,7 +4,7 @@ snippet :
 	:${1:field name}: ${2:field body}
 snippet *
 	*${1:Emphasis}* ${2}
-snippet *&
+snippet **
 	**${1:Strong emphasis}** ${2}
 snippet _
 	\`${1:hyperlink-name}\`_
@@ -64,6 +64,6 @@ snippet sid
 # CJK optimize, CJK has no space between charaters
 snippet *!
 	\ *${1:Emphasis}*\ ${2} 
-snippet *&!
+snippet *&
 	\ **${1:Strong emphasis}**\ ${2}
 

From fb20738cf4082212d5021c031f1d621352308a7c Mon Sep 17 00:00:00 2001
From: babybeasimple <babybeasimple@gmail.com>
Date: Thu, 6 Jun 2013 01:20:03 +0400
Subject: [PATCH 0080/1587] fix haml render snipets

---
 snippets/haml.snippets | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/snippets/haml.snippets b/snippets/haml.snippets
index 61e9cf287..4491c2bd5 100644
--- a/snippets/haml.snippets
+++ b/snippets/haml.snippets
@@ -11,10 +11,12 @@ snippet ul
 		%li
 			${1:item}
 		%li
-snippet =rp
-	= render :partial => '${1:partial}'
-snippet =rpl
-	= render :partial => '${1:partial}', :locals => {}
-snippet =rpc
-	= render :partial => '${1:partial}', :collection => @$1
+snippet rp
+	= render :partial => "${1:item}"
+snippet rpc
+	= render :partial => "${1:item}", :collection => ${2:@$1s}
+snippet rpl
+	= render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}
+snippet rpo
+	= render :partial => "${1:item}", :object => ${2:@$1}
 

From c8783fd02f0688612abc9cbd85edacaea2f3f319 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 6 Jun 2013 13:44:17 +0200
Subject: [PATCH 0081/1587] adding alternative html-minimal snippets
 illustrating a somewhat minimal setup which is useful to me

---
 UltiSnips/html_minimal.snippets | 31 ++++++++++++++
 snippets/html_minimal.snippets  | 74 +++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 UltiSnips/html_minimal.snippets
 create mode 100644 snippets/html_minimal.snippets

diff --git a/UltiSnips/html_minimal.snippets b/UltiSnips/html_minimal.snippets
new file mode 100644
index 000000000..1f77ad7b9
--- /dev/null
+++ b/UltiSnips/html_minimal.snippets
@@ -0,0 +1,31 @@
+# more can be found in snippets/html_minimal.snippets
+# these UltiSnips override snippets because nested placeholders are being used
+
+snippet id
+id="${1}"${2}
+endsnippet
+
+snippet idn
+id="${1}" name="${2:$1}"
+endsnippet
+
+snippet label_and_input
+<label for="${2:$1}">${1}</label>
+<input type="${3:text}" name="${4:$2}"${5: id="${6:$2}"} value="${7}" />${8}
+endsnippet
+
+snippet input
+<input type="${1:text}" value="${2}" name="${3}"${4: id="${5:$3}}/>${7}
+endsnippet
+
+snippet submit
+<input type="submit" value="${2}" ${3}/>${7}
+endsnippet
+
+snippet textarea
+<textarea name="$2"${3: id="$4"}>$5</textarea>
+endsnippet
+
+snippet img
+	<img src="$1"${2: alt="$3"}/>
+endsnippet
diff --git a/snippets/html_minimal.snippets b/snippets/html_minimal.snippets
new file mode 100644
index 000000000..ce971ef54
--- /dev/null
+++ b/snippets/html_minimal.snippets
@@ -0,0 +1,74 @@
+# file containing most useful mappings only
+# when editing this file please be aware that there is ZenCoding and sparkup
+
+# html 5 is recommended from now on
+snippet html5
+	<!doctype html>
+	<html>
+	<head>
+		<title>$2</title>
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+		$3
+	</head>
+	<body>
+	$4
+	</body>
+	</html>
+
+# ==== TAGS
+# you always need these:
+snippet .
+	class="${1}"${2}
+snippet n
+	name="${1}"${2}
+snippet r
+	rel="${1}"${2}
+snippet t
+	title="${1}"${2}
+
+# not using # because id is faster to type
+snippet id
+	id="${1}"${2}
+snippet idn
+	id="${1}" name="${2:$1}"
+
+snippet label_and_input
+	<label for="${2:$1}">${1}</label>
+	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}" />${7}
+
+
+# FORMS
+# use idn . or n to add id
+snippet input
+	<input type="${1:text}" value="${2}" ${3}/>${7}
+snippet submit
+	<input type="submit" value="${2}" ${3}/>${7}
+snippet textarea
+	<textarea $1>$2</textarea>
+
+# if you need id or class use snippets above
+snippet form
+	<form method="${1:post/get}" action="$2">
+        $3
+	</form>
+
+# other tags
+snippet br
+	<br/>
+snippet a
+	<a href="#" $2>$3</a>
+snippet img
+	<img src="$1" alt="$2"/>
+# JS/CSS
+snippet css_file
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />${3}
+snippet css_block
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
+        </link>
+
+snippet script_block
+	<script type="text/javascript" charset="utf-8">
+	</script>
+snippet script_file
+	<script type="text/javascript" charset="utf-8">
+	</script>

From c3a924d77270269ace7c990ce80179c805ace266 Mon Sep 17 00:00:00 2001
From: babybeasimple <babybeasimple@gmail.com>
Date: Fri, 7 Jun 2013 13:13:19 +0400
Subject: [PATCH 0082/1587] added haml if statements

---
 snippets/haml.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/haml.snippets b/snippets/haml.snippets
index 4491c2bd5..939158d55 100644
--- a/snippets/haml.snippets
+++ b/snippets/haml.snippets
@@ -19,4 +19,12 @@ snippet rpl
 	= render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}
 snippet rpo
 	= render :partial => "${1:item}", :object => ${2:@$1}
+snippet ife
+	- if ${1:condition}
+		${2}
+	- else
+		${3}
+snippet ifp
+	- if ${1:condition}.presence?
+		${2}
 

From 1871372934ce78f2fa7d047d0647ff7633398032 Mon Sep 17 00:00:00 2001
From: Steven Oliver <oliver.steven@icloud.com>
Date: Fri, 7 Jun 2013 14:43:24 -0300
Subject: [PATCH 0083/1587] Add myself as maintainer of the Falcon snippets

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index cb9074bed..99bd98036 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,7 @@ vim-snippets is not like the "linux kernel".
 * Ruby - [taq](http://github.com/taq)
 * PHP - [chrisyue](http://github.com/chrisyue)
 * Scala - [gorodinskiy](https://github.com/gorodinskiy)
+* Falcon - [steveno](https://github.com/steveno)
 
 Contributing notes
 ------------------

From e92b1e83f9e5d02713b80efdc1dd047467f531dc Mon Sep 17 00:00:00 2001
From: Donny Yang <yydonny@gmail.com>
Date: Sat, 8 Jun 2013 08:14:52 +0900
Subject: [PATCH 0084/1587] binding function should be usable in middle of a
 line

---
 UltiSnips/coffee.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
index 8f347f1fa..371859f81 100644
--- a/UltiSnips/coffee.snippets
+++ b/UltiSnips/coffee.snippets
@@ -5,7 +5,7 @@ ${1:name} = (${2:args}) ->
 	${0:# body...}
 endsnippet
 
-snippet bfun "Function (bound)" b
+snippet bfun "Function (bound)"
 ${1:(${2:args}) }=>
 	${0:# body...}
 endsnippet

From f216cebf5479e91db3a007d30d12e1f7430f2783 Mon Sep 17 00:00:00 2001
From: Donny Yang <yydonny@gmail.com>
Date: Sat, 8 Jun 2013 08:25:02 +0900
Subject: [PATCH 0085/1587] Interpolated Code should be usable as in-word
 snippet

---
 UltiSnips/coffee.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
index 371859f81..a61dc5ca1 100644
--- a/UltiSnips/coffee.snippets
+++ b/UltiSnips/coffee.snippets
@@ -80,7 +80,7 @@ snippet req "Require" b
 ${1/^'?(\w+)'?$/\L$1\E/} = require(${1:'${2:sys}'})
 endsnippet
 
-snippet # "Interpolated Code"
+snippet # "Interpolated Code" i
 #{$1}$0
 endsnippet
 

From f16295f3c135b151192d0020c36b6ba2cc07a559 Mon Sep 17 00:00:00 2001
From: Donny Yang <yydonny@gmail.com>
Date: Sat, 8 Jun 2013 08:29:31 +0900
Subject: [PATCH 0086/1587] It is better to have an else clause in a switch

---
 UltiSnips/coffee.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
index a61dc5ca1..db7e985b5 100644
--- a/UltiSnips/coffee.snippets
+++ b/UltiSnips/coffee.snippets
@@ -58,6 +58,8 @@ endsnippet
 snippet swi "Switch" b
 switch ${1:object}
 	when ${2:value}
+		${3:# body...}
+	else
 		${0:# body...}
 endsnippet
 

From 81f85934428472c8965bb5c6ca8810f52475c4f9 Mon Sep 17 00:00:00 2001
From: Donny Yang <yydonny@gmail.com>
Date: Sat, 8 Jun 2013 23:45:35 +0900
Subject: [PATCH 0087/1587] inline snippets, arg-less function, new swit
 snippet

---
 UltiSnips/coffee.snippets | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
index db7e985b5..3e923dcf3 100644
--- a/UltiSnips/coffee.snippets
+++ b/UltiSnips/coffee.snippets
@@ -1,7 +1,8 @@
 # From the TextMate bundle
+# with some modification
 
 snippet fun "Function" b
-${1:name} = (${2:args}) ->
+${1:name} = ${2:(${3:args}) }->
 	${0:# body...}
 endsnippet
 
@@ -10,12 +11,12 @@ ${1:(${2:args}) }=>
 	${0:# body...}
 endsnippet
 
-snippet if "If" b
+snippet if "If"
 if ${1:condition}
 	${0:# body...}
 endsnippet
 
-snippet ife "If .. Else" b
+snippet ife "If .. Else"
 if ${1:condition}
 	${2:# body...}
 else
@@ -27,40 +28,46 @@ else if ${1:condition}
 	${0:# body...}
 endsnippet
 
-snippet ifte "Ternary if" b
+snippet ifte "Ternary if"
 if ${1:condition} then ${2:value} else ${3:other}
 endsnippet
 
-snippet unl "Unless" b
+snippet unl "Unless"
 ${1:action} unless ${2:condition}
 endsnippet
 
-snippet fora "Array Comprehension" b
+snippet fora "Array Comprehension"
 for ${1:name} in ${2:array}
 	${0:# body...}
 endsnippet
 
-snippet foro "Object Comprehension" b
+snippet foro "Object Comprehension"
 for ${1:key}, ${2:value} of ${3:Object}
 	${0:# body...}
 endsnippet
 
-snippet forr "Range Comprehension (inclusive)" b
+snippet forr "Range Comprehension (inclusive)"
 for ${1:name} in [${2:start}..${3:finish}]${4: by ${5:step}}
 	${0:# body...}
 endsnippet
 
-snippet forrex "Range Comprehension (exclusive)" b
+snippet forrex "Range Comprehension (exclusive)"
 for ${1:name} in [${2:start}...${3:finish}]${4: by ${5:step}}
 	${0:# body...}
 endsnippet
 
-snippet swi "Switch" b
+snippet swi "Switch"
 switch ${1:object}
 	when ${2:value}
 		${3:# body...}
 	else
-		${0:# body...}
+		$0
+endsnippet
+
+snippet swit "Switch when .. then"
+switch ${1:object}
+	when ${2:${3:condition} then ${4:value}}
+	else ${0:value}
 endsnippet
 
 snippet cla "Class" b
@@ -71,7 +78,7 @@ class ${1:ClassName}${2: extends ${3:Ancestor}}
 	$7
 endsnippet
 
-snippet try "Try .. Catch" b
+snippet try "Try .. Catch"
 try
 	$1
 catch ${2:error}

From beedbaa29b5c9a5ab6df20c5b182f118c9b29aa7 Mon Sep 17 00:00:00 2001
From: Donny Yang <yydonny@gmail.com>
Date: Mon, 10 Jun 2013 00:46:27 +0900
Subject: [PATCH 0088/1587] apply some python magic to reduce the tabstops
 needed

---
 UltiSnips/coffee.snippets | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
index 3e923dcf3..dab4608ae 100644
--- a/UltiSnips/coffee.snippets
+++ b/UltiSnips/coffee.snippets
@@ -2,13 +2,12 @@
 # with some modification
 
 snippet fun "Function" b
-${1:name} = ${2:(${3:args}) }->
+${1:name} = `!p snip.rv = "(" if t[2] else ""`${2:args}`!p snip.rv = ") " if t[2] else ""`->
 	${0:# body...}
 endsnippet
 
-snippet bfun "Function (bound)"
-${1:(${2:args}) }=>
-	${0:# body...}
+snippet bfun "Function (bound)" i
+`!p snip.rv = "(" if t[1] else ""`${1:args}`!p snip.rv = ") " if t[1] else ""`=>`!p snip.rv = " " if t[2] else ""`${2:expr}
 endsnippet
 
 snippet if "If"
@@ -47,12 +46,12 @@ for ${1:key}, ${2:value} of ${3:Object}
 endsnippet
 
 snippet forr "Range Comprehension (inclusive)"
-for ${1:name} in [${2:start}..${3:finish}]${4: by ${5:step}}
+for ${1:name} in [${2:start}..${3:finish}]`!p snip.rv = " by " if t[4] else ""`${4:step}
 	${0:# body...}
 endsnippet
 
 snippet forrex "Range Comprehension (exclusive)"
-for ${1:name} in [${2:start}...${3:finish}]${4: by ${5:step}}
+for ${1:name} in [${2:start}...${3:finish}]`!p snip.rv = " by " if t[4] else ""`${4:step}
 	${0:# body...}
 endsnippet
 
@@ -66,16 +65,16 @@ endsnippet
 
 snippet swit "Switch when .. then"
 switch ${1:object}
-	when ${2:${3:condition} then ${4:value}}
-	else ${0:value}
+	when ${2:condition}`!p snip.rv = " then " if t[3] else ""`${3:value}
+	else`!p snip.rv = " " if t[4] else ""`${4:value}
 endsnippet
 
 snippet cla "Class" b
-class ${1:ClassName}${2: extends ${3:Ancestor}}
+class ${1:ClassName}`!p snip.rv = " extends " if t[2] else ""`${2:Ancestor}
 
-	${4:constructor: (${5:args}) ->
-		${6:# body...}}
-	$7
+	${3:constructor:`!p snip.rv = " (" if t[4] else ""`${4:args}`!p snip.rv = ")" if t[4] else ""` ->
+		${5:# body...}}
+	$0
 endsnippet
 
 snippet try "Try .. Catch"

From ee2a486dacfa5210ce4554e3c27ff034b9fb21fe Mon Sep 17 00:00:00 2001
From: Donny Yang <yydonny@gmail.com>
Date: Mon, 10 Jun 2013 02:08:39 +0900
Subject: [PATCH 0089/1587] add newline checks to avoid leaving trailing
 whitespace

---
 UltiSnips/coffee.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
index dab4608ae..bb451aac3 100644
--- a/UltiSnips/coffee.snippets
+++ b/UltiSnips/coffee.snippets
@@ -7,7 +7,7 @@ ${1:name} = `!p snip.rv = "(" if t[2] else ""`${2:args}`!p snip.rv = ") " if t[2
 endsnippet
 
 snippet bfun "Function (bound)" i
-`!p snip.rv = "(" if t[1] else ""`${1:args}`!p snip.rv = ") " if t[1] else ""`=>`!p snip.rv = " " if t[2] else ""`${2:expr}
+`!p snip.rv = "(" if t[1] else ""`${1:args}`!p snip.rv = ") " if t[1] else ""`=>`!p snip.rv = " " if t[2] and not t[2].startswith("\n") else ""`${2:expr}
 endsnippet
 
 snippet if "If"
@@ -66,7 +66,7 @@ endsnippet
 snippet swit "Switch when .. then"
 switch ${1:object}
 	when ${2:condition}`!p snip.rv = " then " if t[3] else ""`${3:value}
-	else`!p snip.rv = " " if t[4] else ""`${4:value}
+	else`!p snip.rv = " " if t[4] and not t[4].startswith("\n") else ""`${4:value}
 endsnippet
 
 snippet cla "Class" b

From 057a066f9c549e445fcbd519e7785db0bf16a380 Mon Sep 17 00:00:00 2001
From: George Lee <mclee@foolme.net>
Date: Mon, 10 Jun 2013 21:37:09 +0800
Subject: [PATCH 0090/1587] add if/ife snippets to eruby

---
 snippets/eruby.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index 592e490bd..721116c66 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -111,3 +111,13 @@ snippet slt
 	<%= stylesheet_link_tag ${1::all}, :cache => ${2:true} %>
 snippet sslt
 	<%= stylesheet_link_tag "${1}" %>
+snippet if
+	<% if ${1} %>
+		${2}
+	<% end %>
+snippet ife
+	<% if ${1} %>
+		${2}
+	<% else %>
+		${3}
+	<% end %>

From 8ede47133fe8bb225a8f29c948e408ec713f4b98 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 18 Jun 2013 13:59:14 +0200
Subject: [PATCH 0091/1587] Tons of improvements to TeX snippets

(rebased by Marc Weber), pull/182
---
 snippets/tex.snippets | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 10fa82eff..1b3a8e458 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -1,16 +1,16 @@
 #PREAMBLE
 #newcommand
 snippet nc
-	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}}${4}
+	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}} ${4}
 #usepackage
 snippet up
-	\usepackage[${1:[options}]{${2:package}}
+	\usepackage[${1:options}]{${2:package}} ${3}
 #newunicodechar
 snippet nuc
-	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}}
+	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${4}
 #DeclareMathOperator
 snippet dmo
-	\DeclareMathOperator{${1}}{${2}}
+	\DeclareMathOperator{${1}}{${2}} ${3}
 
 #DOCUMENT
 # \begin{}...\end{}
@@ -66,6 +66,8 @@ snippet itemize
 	\begin{itemize}
 		\item ${1}
 	\end{itemize}
+snippet item
+	\item ${1}
 # Description
 snippet desc
 	\begin{description}
@@ -123,6 +125,9 @@ snippet subp
 	\subparagraph{${1:subparagraph name}}
 	\label{subp:${2:$1}}
 	${3}
+snippet ni
+	\noindent
+	${1}
 #References
 snippet itd
 	\item[${1:description}] ${2:item}
@@ -133,14 +138,21 @@ snippet table
 snippet listing
 	${1:Listing}~\ref{${2:list}}${3}
 snippet section
-	${1:Section}~\ref{${2:sec:}}${3}
+	${1:Section}~\ref{sec:${2}} ${3}
 snippet page
-	${1:page}~\pageref{${2}}${3}
+	${1:page}~\pageref{${2}} ${3}
 snippet index
-	\index{${1:index}}${2}
+	\index{${1:index}} ${2}
 #Citations
+snippet citen
+	\cite{$1} ${2}
+# bibtex commands
+snippet citep
+	\citep{$1} ${2}
+snippet citet
+	\citet{$1} ${2}
 snippet cite
-	\cite[${1}]{${2}}${3}
+	\cite[${1}]{${2}} ${3}
 snippet fcite
 	\footcite[${1}]{${2}}${3}
 #Formating text: italic, bold, underline, small capital, emphase ..
@@ -172,6 +184,7 @@ snippet fig
 	\caption{${3}}
 	\label{fig:${4}}
 	\end{figure}
+	${5}
 snippet tikz
 	\begin{figure}
 	\begin{center}
@@ -182,10 +195,14 @@ snippet tikz
 	\caption{${3}}
 	\label{fig:${4}}
 	\end{figure}
+	${5}
 #math
 snippet stackrel
 	\stackrel{${1:above}}{${2:below}} ${3}
 snippet frac
-	\frac{${1:num}}{${2:denom}}
+	\frac{${1:num}}{${2:denom}} ${3}
 snippet sum
-	\sum^{${1:n}}_{${2:i=1}}{${3}}
\ No newline at end of file
+	\sum^{${1:n}}_{${2:i=1}} ${3}
+snippet lim
+	\lim_{${1:x \to +\infty}} ${2}
+

From 2ed243e2f798877ad651c5b6c9d9ac49cb6d0ca3 Mon Sep 17 00:00:00 2001
From: George Lee <mclee@foolme.net>
Date: Wed, 19 Jun 2013 11:27:01 +0800
Subject: [PATCH 0092/1587] add in migration index / simple_form input

---
 snippets/eruby.snippets | 2 ++
 snippets/ruby.snippets  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index 721116c66..d99cf0b6e 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -53,6 +53,8 @@ snippet ff
 	<%= form_for @${1:model} do |f| %>
 		${2}
 	<% end %>
+snippet ffi
+	<%= ${1:f}.input :${2:attribute} %>
 snippet ffcb
 	<%= ${1:f}.check_box :${2:attribute} %>
 snippet ffe
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 027edf48e..417a4f440 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -888,6 +888,8 @@ snippet test
 #migrations
 snippet mac
 	add_column :${1:table_name}, :${2:column_name}, :${3:data_type}
+snippet mai
+	add_index :${1:table_name}, :${2:column_name}
 snippet mrc
 	remove_column :${1:table_name}, :${2:column_name}
 snippet mrnc

From af19fb1d85bd15f028d9143019b44c36f99fd699 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Wed, 19 Jun 2013 15:35:26 +0800
Subject: [PATCH 0093/1587] update UltiSnips/rst.snippets

---
 UltiSnips/rst.snippets | 99 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 717451015..58e5a5584 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -58,4 +58,103 @@ snippet cb "Code Block" b
 $0
 endsnippet
 
+snippet img "Image Block" b
+.. |${2:alias}| image:: ${1:img}
+endsnippet
+
+snippet fig "Figure Block" b
+.. figure:: ${1:img}
+    :alt: ${2:alter text}
+    
+    ${3}
+
+$0
+endsnippet
+
+snippet cont "Content Block" b
+.. contents::
+    
+	${1:content}
+
+$0
+endsnippet
+
+snippet tip "Tip Block" b
+.. tip::
+    
+	${1:some tips}
+
+$0
+endsnippet
+
+snippet not "Note Block" b
+.. note::
+    
+	${1:some notes}
+
+$0
+endsnippet
+
+snippet war "Warning Block" b
+.. warning::
+    
+	${1:Warning!}
+
+$0
+endsnippet
+
+snippet imp "Important Block" b
+.. important::
+    
+	${1:This is important}
+
+$0
+endsnippet
+
+snippet att "Attention " b
+.. attention::
+    
+	${1:Attention!}
+
+$0
+endsnippet
+
+snippet dan "Danger" b
+.. danger::
+    
+	${1:Danger}
+
+$0
+endsnippet
+
+snippet err "Error Block" b
+.. error::
+    
+	${1:Errors!}
+
+$0
+endsnippet
+
+snippet cau "Cautions Block" b
+.. caution::
+    
+	${1:Cautions!}
+
+$0
+endsnippet
+
+snippet top "Topic" b
+.. topic:: ${1:title}
+
+    ${2:contents}
+
+$0
+endsnippet
+
+# Spinx Only
+snippet sid "SideBar" b
+.. sidebar:: ${1:SideBar Title}
+
+    ${2:SideBar Content}
+endsnippet
 # vim:ft=snippets:

From f2e535fd94c3f0ddf9e6ccac5356405a6dd2372e Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Wed, 19 Jun 2013 17:37:01 +0800
Subject: [PATCH 0094/1587] add emphasize

---
 UltiSnips/rst.snippets | 50 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 58e5a5584..e3808b81e 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -47,6 +47,47 @@ ${1:Paragraph name}
 $0
 endsnippet
 
+snippet em "Emphasize string" i
+*${1:Em}* $0
+endsnippet
+
+snippet ec "Emphasize string (CJK)" w
+\ *${1:Em}*\ $0
+endsnippet
+
+snippet st "Strong string" i
+**${1:Strong}** $0
+endsnippet
+
+snippet sc "Strong string (CJK)" w
+\ **${1:Strong}**\ $0
+endsnippet
+
+global !p
+def	make_items(times, leading='+'):
+    times = int(times)
+    if leading == 1:
+        msg = ""
+        for x in xrange(1, times+1):
+            msg += "%s. Item\n" % x
+        return msg
+    else:
+        return ("%s Item\n" % leading) * times
+endglobal
+
+snippet "li(st)? (?P<num>\d+)" "List" br
+$0
+`!p
+snip.rv = make_items(match.groupdict()['num'])
+`
+endsnippet
+
+snippet "ol(st)? (?P<num>\d+)" "Order List" br
+$0
+`!p
+snip.rv = make_items(match.groupdict()['num'], 1)
+`
+endsnippet
 ###########################################################################
 #                         More Specialized Stuff.                         #
 ###########################################################################
@@ -72,9 +113,7 @@ $0
 endsnippet
 
 snippet cont "Content Block" b
-.. contents::
-    
-	${1:content}
+.. contents:: ${1:Contents Title}
 
 $0
 endsnippet
@@ -151,7 +190,10 @@ snippet top "Topic" b
 $0
 endsnippet
 
-# Spinx Only
+############
+#  Sphinx  #
+############
+
 snippet sid "SideBar" b
 .. sidebar:: ${1:SideBar Title}
 

From d41ca9e656dfed11aff4c51ac6de66033830e1b8 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Wed, 19 Jun 2013 18:08:51 +0800
Subject: [PATCH 0095/1587] add rst auto complie most common code type

---
 UltiSnips/rst.snippets | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index e3808b81e..ec11b7fea 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -91,8 +91,21 @@ endsnippet
 ###########################################################################
 #                         More Specialized Stuff.                         #
 ###########################################################################
+global !p
+import re
+from collections import Counter
+def find_all_code_type(path):
+    with open(path) as source:
+        types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', source.read())
+    try:
+        popular_type = Counter(types).most_common()[0][0]
+    except KeyError:
+        popular_type = "lua" # Don't break default
+
+    return popular_type
+endglobal
 snippet cb "Code Block" b
-.. code-block:: ${1:lua}
+.. code-block:: ${1:`!p snip.rv = find_all_code_type(path)`}
 
    ${2:code}
 

From 1c80d84e9cc4d0d26edacbe354ad204192ca6332 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Wed, 19 Jun 2013 18:12:12 +0800
Subject: [PATCH 0096/1587] fix Out of Code detetction indexerror

---
 UltiSnips/rst.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index ec11b7fea..ea70d8190 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -99,7 +99,7 @@ def find_all_code_type(path):
         types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', source.read())
     try:
         popular_type = Counter(types).most_common()[0][0]
-    except KeyError:
+    except IndexError:
         popular_type = "lua" # Don't break default
 
     return popular_type

From 382ad016d30fca3819bc30ba0efc4218ba925d39 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Thu, 20 Jun 2013 10:15:00 +0800
Subject: [PATCH 0097/1587] set a proper name to function

---
 UltiSnips/rst.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index ea70d8190..1eba27493 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -94,7 +94,7 @@ endsnippet
 global !p
 import re
 from collections import Counter
-def find_all_code_type(path):
+def get_popular_code_type(path):
     with open(path) as source:
         types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', source.read())
     try:
@@ -105,7 +105,7 @@ def find_all_code_type(path):
     return popular_type
 endglobal
 snippet cb "Code Block" b
-.. code-block:: ${1:`!p snip.rv = find_all_code_type(path)`}
+.. code-block:: ${1:`!p snip.rv = get_popular_code_type(path)`}
 
    ${2:code}
 

From eaeada33c5e9cef2b9818c03ccb2bf82a1aab2f7 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Thu, 20 Jun 2013 10:21:33 +0800
Subject: [PATCH 0098/1587] revert rst snippets

---
 snippets/rst.snippets | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index 46e2215ee..d97fa5738 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -18,52 +18,52 @@ snippet -
 	-----${2:-}
 	${3}
 #some directive
-snippet img
+snippet img:
 	.. |${2:alias}| image:: ${1:img}
-snippet fig
+snippet fig:
 	.. figure:: ${1:img}
 		:alt: ${2:alter text}
 
 		$2
-snippet con
+snippet cont:
 	.. contents::
 		${1:content}
-snippet cod
+snippet code:
 	.. code:: ${1:type}
 		
 		${2:write some code}
-snippet tip
+snippet tip:
 	.. tip::
 		${1:my tips}
-snippet not
+snippet not:
 	.. note::
 		${1:my notes}
-snippet	war
+snippet	war:
 	.. warning::
 		${1:attention!}
-snippet imp
+snippet imp:
 	.. important::
 		${1:this is importatnt}
-snippet att
+snippet att:
 	.. attention::
 		${1:hey!}
-snippet dan
+snippet dan:
 	.. danger::
 		${1:ah!}
-snippet err
+snippet err:
 	.. error::
 		${1:Error occur}
-snippet cau
+snippet cau:
 	.. caution::
 		${1:Watch out!}
 #Spinx only
-snippet sid
+snippet sid:
 	.. sidebar:: ${1:Title}
 		
 		${2}	
 # CJK optimize, CJK has no space between charaters
-snippet *!
+snippet *c
 	\ *${1:Emphasis}*\ ${2} 
-snippet *&
+snippet **c
 	\ **${1:Strong emphasis}**\ ${2}
 

From d666cfc6a5042c1fb1832941a734bdde7adbfd92 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Thu, 20 Jun 2013 10:27:05 +0800
Subject: [PATCH 0099/1587] add usage for enumberic items

---
 UltiSnips/rst.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 1eba27493..c8b62e59f 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -75,6 +75,7 @@ def	make_items(times, leading='+'):
         return ("%s Item\n" % leading) * times
 endglobal
 
+# usage: li 3<tab>
 snippet "li(st)? (?P<num>\d+)" "List" br
 $0
 `!p
@@ -82,6 +83,7 @@ snip.rv = make_items(match.groupdict()['num'])
 `
 endsnippet
 
+# usage: ol 3<tab>
 snippet "ol(st)? (?P<num>\d+)" "Order List" br
 $0
 `!p

From 6ac725a309217a3a0417783043f40ab1a371bc49 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Thu, 20 Jun 2013 11:29:44 +0800
Subject: [PATCH 0100/1587] fix CJK lens

---
 UltiSnips/rst.snippets | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index c8b62e59f..0fed43fe2 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -3,46 +3,52 @@
 ###########################################################################
 #                              General Stuff                              #
 ###########################################################################
+global !p
+import re
+def rst_char_len(char):
+	return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
+
+endglobal
 snippet part "Part" b
-`!p snip.rv = len(t[1])*'#'`
+`!p snip.rv = rst_char_len(t[1])*'#'`
 ${1:Part name}
-`!p snip.rv = len(t[1])*'#'`
+`!p snip.rv = rst_char_len(t[1])*'#'`
 
 $0
 endsnippet
 
 snippet sec "Section" b
 ${1:Section name}
-`!p snip.rv = len(t[1])*'='`
+`!p snip.rv = rst_char_len(t[1])*'='`
 
 $0
 endsnippet
 
 snippet ssec "Subsection" b
 ${1:Section name}
-`!p snip.rv = len(t[1])*'-'`
+`!p snip.rv = rst_char_len(t[1])*'-'`
 
 $0
 endsnippet
 
 snippet sssec "Subsubsection" b
 ${1:Section name}
-`!p snip.rv = len(t[1])*'^'`
+`!p snip.rv = rst_char_len(t[1])*'^'`
 
 $0
 endsnippet
 
 snippet chap "Chapter" b
-`!p snip.rv = len(t[1])*'*'`
+`!p snip.rv = rst_char_len(t[1])*'*'`
 ${1:Chapter name}
-`!p snip.rv = len(t[1])*'*'`
+`!p snip.rv = rst_char_len(t[1])*'*'`
 
 $0
 endsnippet
 
 snippet para "Paragraph" b
 ${1:Paragraph name}
-`!p snip.rv = len(t[1])*'"'`
+`!p snip.rv = rst_char_len(t[1])*'"'`
 
 $0
 endsnippet
@@ -94,7 +100,6 @@ endsnippet
 #                         More Specialized Stuff.                         #
 ###########################################################################
 global !p
-import re
 from collections import Counter
 def get_popular_code_type(path):
     with open(path) as source:

From ab97140f5ddb30d46f22ac20616293a754a102a2 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Thu, 20 Jun 2013 11:31:41 +0800
Subject: [PATCH 0101/1587] get python code together

---
 UltiSnips/rst.snippets | 49 +++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 0fed43fe2..126f59b9a 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -5,9 +5,33 @@
 ###########################################################################
 global !p
 import re
+from collections import Counter
+
+
 def rst_char_len(char):
 	return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
 
+
+def	make_items(times, leading='+'):
+    times = int(times)
+    if leading == 1:
+        msg = ""
+        for x in xrange(1, times+1):
+            msg += "%s. Item\n" % x
+        return msg
+    else:
+        return ("%s Item\n" % leading) * times
+
+
+def get_popular_code_type(path):
+    with open(path) as source:
+        types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', source.read())
+    try:
+        popular_type = Counter(types).most_common()[0][0]
+    except IndexError:
+        popular_type = "lua" # Don't break default
+
+    return popular_type
 endglobal
 snippet part "Part" b
 `!p snip.rv = rst_char_len(t[1])*'#'`
@@ -69,19 +93,6 @@ snippet sc "Strong string (CJK)" w
 \ **${1:Strong}**\ $0
 endsnippet
 
-global !p
-def	make_items(times, leading='+'):
-    times = int(times)
-    if leading == 1:
-        msg = ""
-        for x in xrange(1, times+1):
-            msg += "%s. Item\n" % x
-        return msg
-    else:
-        return ("%s Item\n" % leading) * times
-endglobal
-
-# usage: li 3<tab>
 snippet "li(st)? (?P<num>\d+)" "List" br
 $0
 `!p
@@ -99,18 +110,6 @@ endsnippet
 ###########################################################################
 #                         More Specialized Stuff.                         #
 ###########################################################################
-global !p
-from collections import Counter
-def get_popular_code_type(path):
-    with open(path) as source:
-        types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', source.read())
-    try:
-        popular_type = Counter(types).most_common()[0][0]
-    except IndexError:
-        popular_type = "lua" # Don't break default
-
-    return popular_type
-endglobal
 snippet cb "Code Block" b
 .. code-block:: ${1:`!p snip.rv = get_popular_code_type(path)`}
 

From 317dddc096deb7af7839facf3cbe35bc8acf721c Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Thu, 20 Jun 2013 15:40:12 +0800
Subject: [PATCH 0102/1587] add docstring

---
 UltiSnips/rst.snippets | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 126f59b9a..0490c319c 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 
 ###########################################################################
 #                              General Stuff                              #
@@ -7,12 +7,23 @@ global !p
 import re
 from collections import Counter
 
-
 def rst_char_len(char):
-	return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
+    """ 
+    return len of string which fit in rst
+    For instance:chinese "我" decode as only one character, 
+    However, the rst interpreter needs 2 "=" instead of 1.
 
+    :param: char needs to be count
+    """
+    return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
 
 def	make_items(times, leading='+'):
+    """
+    make lines with leading char multitimes
+    
+    :param: times, how many times you need
+    :param: leading, leading character
+    """
     times = int(times)
     if leading == 1:
         msg = ""
@@ -24,6 +35,11 @@ def	make_items(times, leading='+'):
 
 
 def get_popular_code_type(path):
+    """
+    As function name, it will get most popular code type in given file
+
+    :param: path, to path to rst file
+    """
     with open(path) as source:
         types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', source.read())
     try:
@@ -33,6 +49,7 @@ def get_popular_code_type(path):
 
     return popular_type
 endglobal
+
 snippet part "Part" b
 `!p snip.rv = rst_char_len(t[1])*'#'`
 ${1:Part name}
@@ -78,19 +95,22 @@ $0
 endsnippet
 
 snippet em "Emphasize string" i
-*${1:Em}* $0
+*${1:${VISUAL:Em}}* $0
 endsnippet
 
+# the CJK characters doesn't had space to sperate them, like "我强调"
+# should be "我\ *强调*\ "
+# Therefor we need special snippet
 snippet ec "Emphasize string (CJK)" w
-\ *${1:Em}*\ $0
+\ *${1:${VISUAL:Em}}*\ $0
 endsnippet
 
 snippet st "Strong string" i
-**${1:Strong}** $0
+**${1:${VISUAL:Strong}}** $0
 endsnippet
 
 snippet sc "Strong string (CJK)" w
-\ **${1:Strong}**\ $0
+\ **${1:${VISUAL:Strong}}**\ $0
 endsnippet
 
 snippet "li(st)? (?P<num>\d+)" "List" br

From ab4daaf4ce6ba6b20b1088e35be68253fcca51a2 Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Thu, 20 Jun 2013 16:21:04 +0800
Subject: [PATCH 0103/1587] change blocks into sa

---
 UltiSnips/rst.snippets | 81 ++++++++----------------------------------
 1 file changed, 14 insertions(+), 67 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 0490c319c..c70dccc83 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -48,6 +48,14 @@ def get_popular_code_type(path):
         popular_type = "lua" # Don't break default
 
     return popular_type
+
+def complete(t, opts):
+    if t:
+        opts = [ m[len(t):] for m in opts if m.startswith(t) ]
+    if len(opts) == 1:
+        return opts[0]
+    return "({0})".format("|".join(opts))
+
 endglobal
 
 snippet part "Part" b
@@ -157,74 +165,13 @@ snippet cont "Content Block" b
 $0
 endsnippet
 
-snippet tip "Tip Block" b
-.. tip::
-    
-	${1:some tips}
-
-$0
-endsnippet
-
-snippet not "Note Block" b
-.. note::
-    
-	${1:some notes}
-
-$0
-endsnippet
-
-snippet war "Warning Block" b
-.. warning::
-    
-	${1:Warning!}
-
-$0
-endsnippet
-
-snippet imp "Important Block" b
-.. important::
-    
-	${1:This is important}
-
-$0
-endsnippet
-
-snippet att "Attention " b
-.. attention::
-    
-	${1:Attention!}
-
-$0
-endsnippet
-
-snippet dan "Danger" b
-.. danger::
-    
-	${1:Danger}
-
-$0
-endsnippet
-
-snippet err "Error Block" b
-.. error::
+#http://docutils.sourceforge.net/docs/ref/rst/directives.html#specific-admonitions
+snippet sa "Specific Admonitions" b
+.. $1`!p snip.rv =complete(t[1], ["attention", "caution", "danger", 
+                                  "error", "hint", "important", "note", 
+                                  "tip", "warning"])`::
     
-	${1:Errors!}
-
-$0
-endsnippet
-
-snippet cau "Cautions Block" b
-.. caution::
-    
-	${1:Cautions!}
-
-$0
-endsnippet
-
-snippet top "Topic" b
-.. topic:: ${1:title}
-
-    ${2:contents}
+    ${2:Content}
 
 $0
 endsnippet

From dbfcb24f15dd498f3f37110f0b14aa00ffc0e7fd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 20 Jun 2013 12:57:09 +0200
Subject: [PATCH 0104/1587] replace vim-git-wiki link by link to snippet engine
 page

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 99bd98036..984cdb646 100644
--- a/README.md
+++ b/README.md
@@ -63,10 +63,11 @@ so that all users can benefit from them.  People can list their snippet reposito
 Installation using VAM: "github:rbonvall/snipmate-snippets-bib"
 
 
-## If you believe in the success of vim-snipmate
-then you may also want to have a look at [vim-git-wiki](http://github.com/MarcWeber/vim-git-wiki).
-If you contribute to this git based wiki editable by Vim we have a chance
-of making it official at www.vim.org.
+Future - ideas - examples
+=========================
+[overview snippet engines](http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html)
+If you have ideas you can add them to that list of "snippet engine features by example".
+
 
 Historical notes
 ================

From df74813351e319012be0c8a0f5205141d875e266 Mon Sep 17 00:00:00 2001
From: Michael Thessel <michael@gt.net>
Date: Thu, 20 Jun 2013 14:33:44 -0700
Subject: [PATCH 0105/1587] Removed comment blocks from placeholders

---
 snippets/actionscript.snippets      | 12 +++----
 snippets/c.snippets                 | 14 ++++----
 snippets/cpp.snippets               | 10 +++---
 snippets/dart.snippets              |  8 ++---
 snippets/falcon.snippets            | 14 ++++----
 snippets/go.snippets                | 30 ++++++++---------
 snippets/java.snippets              |  2 +-
 snippets/javascript-jquery.snippets |  4 +--
 snippets/javascript.snippets        | 20 ++++++------
 snippets/make.snippets              |  2 +-
 snippets/objc.snippets              |  2 +-
 snippets/perl.snippets              |  2 +-
 snippets/php.snippets               | 30 ++++++++---------
 snippets/processing.snippets        |  6 ++--
 snippets/python.snippets            | 40 +++++++++++------------
 snippets/r.snippets                 | 10 +++---
 snippets/scala.snippets             | 50 ++++++++++++++---------------
 snippets/vim.snippets               |  8 ++---
 18 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/snippets/actionscript.snippets b/snippets/actionscript.snippets
index af9611c3f..cd2ab0ebd 100644
--- a/snippets/actionscript.snippets
+++ b/snippets/actionscript.snippets
@@ -109,17 +109,17 @@ snippet try
 # For Loop (same as c.snippet)
 snippet for for (..) {..}
 	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4:/* code */}
+		${4}
 	}
 # Custom For Loop
 snippet forr
 	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
-		${5:/* code */}
+		${5}
 	}
 # If Condition
 snippet if
 	if (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}
 snippet el
 	else {
@@ -131,7 +131,7 @@ snippet t
 snippet fun
 	function ${1:function_name}(${2})${3}
 	{
-		${4:/* code */}
+		${4}
 	}
 # FlxSprite (usefull when using the flixel library)
 snippet FlxSprite
@@ -144,13 +144,13 @@ snippet FlxSprite
 			public function $1(${3: X:Number, Y:Number}):void
 			{
 				super(X,Y);
-				${4: //code...}
+				${4}
 			}
 
 			override public function update():void
 			{
 				super.update();
-				${5: //code...}
+				${5}
 			}
 		}
 	}
diff --git a/snippets/c.snippets b/snippets/c.snippets
index de6d6a933..85e7ac2b0 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -53,7 +53,7 @@ snippet once
 # if
 snippet if
 	if (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}${3}
 # else
 snippet el
@@ -63,7 +63,7 @@ snippet el
 # else if
 snippet elif
 	else if (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}${3}
 # ternary
 snippet t
@@ -94,22 +94,22 @@ snippet case
 # for
 snippet for
 	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4:/* code */}
+		${4}
 	}${5}
 # for (custom)
 snippet forr
 	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
-		${5:/* code */}
+		${5}
 	}${6}
 # while
 snippet wh
 	while (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}${3}
 # do... while
 snippet do
 	do {
-		${2:/* code */}
+		${2}
 	} while (${1:/* condition */});${3}
 ##
 ## Functions
@@ -117,7 +117,7 @@ snippet do
 snippet fun
 	${1:void} ${2:function_name}(${3})
 	{
-		${4:/* code */}
+		${4}
 	}${5}
 # function declaration
 snippet fund
diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index c3e19fe93..048671246 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -80,7 +80,7 @@ snippet cl
 # member function implementation
 snippet mfun
 	${4:void} ${1:`Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
-		${5:/* code */}
+		${5}
 	}
 # namespace
 snippet ns
@@ -100,13 +100,13 @@ snippet cin
 # for i 
 snippet fori
 	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4:/* code */}
+		${4}
 	}${5}
 
 # foreach
 snippet fore
 	for (${1:auto} ${2:i} : ${3:container}) {
-		${4:/* code */}
+		${4}
 	}${5}
 # iterator
 snippet iter
@@ -123,9 +123,9 @@ snippet itera
 ## Lambdas
 # lamda (one line)
 snippet ld
-	[${1}](${2}){${3:/* code */}}${4}
+	[${1}](${2}){${3}}${4}
 # lambda (multi-line)
 snippet lld
 	[${1}](${2}){
-		${3:/* code */}
+		${3}
 	}${4}
diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index 6f0b8ac5e..c7b56daf6 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -9,7 +9,7 @@ snippet so
 	${2}
 snippet main
 	static void main() {
-	  ${1:/* code */}
+	  ${1}
 	}
 snippet st
 	static ${1}
@@ -57,15 +57,15 @@ snippet for
 	}
 snippet fore
 	for (final ${2:item} in ${1:itemList}) {
-	  ${3:/* code */}
+	  ${3}
 	}
 snippet wh
 	while (${1:/* condition */}) {
-	  ${2:/* code */}
+	  ${2}
 	}
 snippet dowh
 	do {
-	  ${2:/* code */}
+	  ${2}
 	} while (${1:/* condition */});
 snippet as
 	assert(${1:/* condition */});
diff --git a/snippets/falcon.snippets b/snippets/falcon.snippets
index 85fb918dd..93aba1983 100644
--- a/snippets/falcon.snippets
+++ b/snippets/falcon.snippets
@@ -8,7 +8,7 @@ snippet imp
 # Function
 snippet fun
 	function ${2:function_name}(${3})	
-		${4:/* code */}
+		${4}
 	end	
 
 # Class
@@ -20,13 +20,13 @@ snippet class
 # If 
 snippet if
 	if ${1:condition}
-		${2:/* code */}		
+		${2}		
 	end
 
 # If else
 snippet ife
 	if ${1:condition}
-		${2:/* code */}		
+		${2}		
 	else
 	    ${1}	
 	end
@@ -34,7 +34,7 @@ snippet ife
 # If else if	
 snippet elif
 	elif ${1:condition}
-		${2:/* code */}	        
+		${2}	        
 
 # Switch case
 snippet switch
@@ -55,17 +55,17 @@ snippet select
 # For/in Loop
 snippet forin
 	for ${1:element} in ${2:container}
-		${3:/* code */}
+		${3}
 	end
 
 # For/to Loop
 snippet forto
 	for ${1:lowerbound} to ${2:upperbound}
-		${3:/* code */}
+		${3}
 	end
 
 # While Loop
 snippet while 
 	while ${1:conidition}
-		${2:/* code */}	
+		${2}	
 	end
diff --git a/snippets/go.snippets b/snippets/go.snippets
index c64db91f9..a88d8d069 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -16,7 +16,7 @@ snippet ch
 # case
 snippet cs
 	case ${1:value}:
-		${2:/* code */}
+		${2}
 # const
 snippet c
 	const ${1:NAME} = ${2:0}
@@ -36,7 +36,7 @@ snippet df
 snippet dfr
 	defer func() {
 		if err := recover(); err != nil {
-			${1:/* code */}
+			${1}
 		}
 	}()
 # gpl
@@ -78,7 +78,7 @@ snippet inf
 # if condition
 snippet if
 	if ${1:/* condition */} {
-		${2:/* code */}
+		${2}
 	}${2}
 # else snippet
 snippet el
@@ -109,7 +109,7 @@ snippet f6
 # if else
 snippet ie
 	if ${1:/* condition */} {
-		${2:/* code */}
+		${2}
 	} else {
 		${3}
 	}
@@ -117,25 +117,25 @@ snippet ie
 # for loop
 snippet fo
 	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
-		${4:/* code */}
+		${4}
 	}
 	${5}
 # for range loop
 snippet fr
 	for ${1:k}, ${2:v} := range ${3} {
-		${4:/* code */}
+		${4}
 	}
 	${5}
 # function simple 
 snippet fun
 	func ${1:funcName}(${2}) ${3:error} {
-		${4:/* code */}
+		${4}
 	}
 	${5}
 # function on receiver 
 snippet fum
 	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
-		${5:/* code */}
+		${5}
 	}
 	${6}
 # log printf
@@ -153,7 +153,7 @@ snippet mp
 # main()
 snippet main
 	func main() {
-		${1:/* code */}
+		${1}
 	}
 	${2}
 # new
@@ -178,11 +178,11 @@ snippet rs
 snippet sl
 	select {
 	case ${1:v1} := <-${2:chan1}
-		${3:/* code */}
+		${3}
 	case ${4:v2} := <-${5:chan2}
-		${6:/* code */}
+		${6}
 	default:
-		${7:/* code */}
+		${7}
 	}
 # string
 snippet sr
@@ -197,11 +197,11 @@ snippet st
 snippet sw
 	switch ${1:var} {
 	case ${2:value1}:
-		${3:/* code */}
+		${3}
 	case ${4:value2}:
-		${5:/* code */}
+		${5}
 	default:
-		${6:/* code */}
+		${6}
 	}
 snippet sp
 	fmt.Sprintf("%${1:s}", ${2:var})${3}
diff --git a/snippets/java.snippets b/snippets/java.snippets
index 854f14ac2..daf8928b7 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -171,7 +171,7 @@ snippet wh
 ## Main method
 snippet main
 	public static void main (String[] args) {
-		${1:/* code */}
+		${1}
 	}
 ##
 ## Print Methods
diff --git a/snippets/javascript-jquery.snippets b/snippets/javascript-jquery.snippets
index ce247a005..014c6158d 100644
--- a/snippets/javascript-jquery.snippets
+++ b/snippets/javascript-jquery.snippets
@@ -260,7 +260,7 @@ snippet filter
 	${1:obj}.filter('${2:selector expression}')${3}
 snippet filtert
 	${1:obj}.filter(function (${2:index}) {
-		${3:// test code}
+		${3}
 	})${4}
 snippet find
 	${1:obj}.find('${2:selector expression}')${3}
@@ -291,7 +291,7 @@ snippet getscript
 	});
 snippet grep
 	$.grep(${1:array}, function (item, index) {
-		${2:// test code}
+		${2}
 	}${3:, true});
 snippet hasc
 	${1:obj}.hasClass('${2:className}')${3}
diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index 801968fcd..e9dd58b94 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -17,7 +17,7 @@ snippet f
 # Immediate function
 snippet (f
 	(function (${1}) {
-		${3:/* code */}
+		${3}
 	}(${2}));
 # if
 snippet if
@@ -38,16 +38,16 @@ snippet ter
 snippet switch
 	switch (${1:expression}) {
 		case '${3:case}':
-			${4:// code}
+			${4}
 			break;
 		${5}
 		default:
-			${2:// code}
+			${2}
 	}
 # case
 snippet case
 	case '${1:case}':
-		${2:// code}
+		${2}
 		break;
 	${3}
 # for (...) {...}
@@ -63,19 +63,19 @@ snippet forr
 # while (...) {...}
 snippet wh
 	while (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}
 # try
 snippet try
 	try {
-		${1:/* code */}
+		${1}
 	} catch (${2:e}) {
 		${3:/* handle error */}
 	}
 # do...while
 snippet do
 	do {
-		${2:/* code */}
+		${2}
 	} while (${1:/* condition */});
 # Object Method
 snippet :f
@@ -124,10 +124,10 @@ snippet jsons
 # self-defining function
 snippet sdf
 	var ${1:function_name} = function (${2:argument}) {
-		${3:// initial code ...}
+		${3}
 
 		$1 = function ($2) {
-			${4:// main code}
+			${4}
 		};
 	};
 # singleton
@@ -150,7 +150,7 @@ snippet sing
 		// reset the constructor pointer
 		instance.constructor = $1;
 
-		${3:// code ...}
+		${3}
 
 		return instance;
 	}
diff --git a/snippets/make.snippets b/snippets/make.snippets
index 436481363..ba8e2b292 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -1,4 +1,4 @@
 snippet ifeq
 	ifeq (${1:cond0},${2:cond1})
-		${3:code}
+		${3}
 	endif
diff --git a/snippets/objc.snippets b/snippets/objc.snippets
index 85b80d9e6..3cf5a0a6d 100644
--- a/snippets/objc.snippets
+++ b/snippets/objc.snippets
@@ -207,7 +207,7 @@ snippet arel
 # autorelease pool
 snippet pool
 	NSAutoreleasePool *${1:pool} = [[NSAutoreleasePool alloc] init];
-	${2:/* code */}
+	${2}
 	[$1 drain];
 # Throw an exception
 snippet except
diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index 9cebedeac..ef83e0f5e 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -326,7 +326,7 @@ snippet tsub
 snippet trsub
 	test ${1:test_name} => { description => '${2:Description of test.}'} => sub {
 		my ($self) = @_;
-		${3:# test code}
+		${3}
 	};
 
 #prep test method
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 5ca502de8..97ec3e317 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -231,7 +231,7 @@ snippet class
 		 */
 		${5:public} function ${6:__construct}(${7:argument})
 		{
-			${8:// code...}
+			${8}
 		}
 	}
 snippet nc
@@ -249,26 +249,26 @@ snippet def?
 	${1}defined('${2}')${3}
 snippet wh
 	while (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	}
 # do ... while
 snippet do
 	do {
-		${2:// code... }
+		${2}
 	} while (${1:/* condition */});
 snippet if
 	if (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	}
 snippet ifil
 	<?php if (${1:/* condition */}): ?>
-		${2:<!-- code... -->}
+		${2}
 	<?php endif; ?>
 snippet ife
 	if (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	} else {
-		${3:// code...}
+		${3}
 	}
 	${4}
 snippet ifeil
@@ -280,33 +280,33 @@ snippet ifeil
 	${4}
 snippet else
 	else {
-		${1:// code...}
+		${1}
 	}
 snippet elseif
 	elseif (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	}
 snippet switch
 	switch ($${1:variable}) {
 		case '${2:value}':
-			${3:// code...}
+			${3}
 			break;
 		${5}
 		default:
-			${4:// code...}
+			${4}
 			break;
 	}
 snippet case
 	case '${1:value}':
-		${2:// code...}
+		${2}
 		break;${3}
 snippet for
 	for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4: // code...}
+		${4}
 	}
 snippet foreach
 	foreach ($${1:variable} as $${2:value}) {
-		${3:// code...}
+		${3}
 	}
 snippet foreachil
 	<?php foreach ($${1:variable} as $${2:value}): ?>
@@ -314,7 +314,7 @@ snippet foreachil
 	<?php endforeach; ?>
 snippet foreachk
 	foreach ($${1:variable} as $${2:key} => $${3:value}) {
-		${4:// code...}
+		${4}
 	}
 snippet foreachkil
 	<?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
diff --git a/snippets/processing.snippets b/snippets/processing.snippets
index b0aa93ced..27f3e005a 100755
--- a/snippets/processing.snippets
+++ b/snippets/processing.snippets
@@ -65,7 +65,7 @@ snippet for
 #loop while
 snippet while
 	while (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}
 #break
 snippet break
@@ -84,11 +84,11 @@ snippet default
 snippet switch
 	switch(${1:expression}) {
 		case '${3:case}':
-			${4:// code}
+			${4}
 			break;
 		${5}
 		default:
-			${2:// code}
+			${2}
 	}
 #try
 snippet try
diff --git a/snippets/python.snippets b/snippets/python.snippets
index 518d2d664..c29b340ef 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -15,16 +15,16 @@ snippet docs
 	"""
 snippet wh
 	while ${1:condition}:
-		${2:# TODO: write code...}
+		${2}
 # dowh - does the same as do...while in other languages
 snippet dowh
 	while True:
-		${1:# TODO: write code...}
+		${1}
 		if ${2:condition}:
 			break
 snippet with
 	with ${1:expr} as ${2:var}:
-		${3:# TODO: write code...}
+		${3}
 # New Class
 snippet cl
 	class ${1:ClassName}(${2:object}):
@@ -37,14 +37,14 @@ snippet cl
 snippet def
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
 		"""${3:docstring for $1}"""
-		${4:# TODO: write code...}
+		${4}
 snippet deff
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
-		${3:# TODO: write code...}
+		${3}
 # New Method
 snippet defs
 	def ${1:mname}(self, ${2:arg}):
-		${3:# TODO: write code...}
+		${3}
 # New Property
 snippet property
 	def ${1:foo}():
@@ -60,17 +60,17 @@ snippet property
 # Ifs
 snippet if
 	if ${1:condition}:
-		${2:# TODO: write code...}
+		${2}
 snippet el
 	else:
-		${1:# TODO: write code...}
+		${1}
 snippet ei
 	elif ${1:condition}:
-		${2:# TODO: write code...}
+		${2}
 # For
 snippet for
 	for ${1:item} in ${2:items}:
-		${3:# TODO: write code...}
+		${3}
 # Encodes
 snippet cutf8
 	# -*- coding: utf-8 -*-
@@ -85,32 +85,32 @@ snippet .
 	self.
 snippet try Try/Except
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 snippet try Try/Except/Else
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	else:
-		${5:# TODO: write code...}
+		${5}
 snippet try Try/Except/Finally
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	finally:
-		${5:# TODO: write code...}
+		${5}
 snippet try Try/Except/Else/Finally
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	else:
-		${5:# TODO: write code...}
+		${5}
 	finally:
-		${6:# TODO: write code...}
+		${6}
 # if __name__ == '__main__':
 snippet ifmain
 	if __name__ == '__main__':
@@ -136,13 +136,13 @@ snippet "
 # test function/method
 snippet test
 	def test_${1:description}(${2:`indent('.') ? 'self' : ''`}):
-		${3:# TODO: write code...}
+		${3}
 # test case
 snippet testcase
 	class ${1:ExampleCase}(unittest.TestCase):
 		
 		def test_${2:description}(self):
-			${3:# TODO: write code...}
+			${3}
 snippet fut
 	from __future__ import ${1}
 #getopt
diff --git a/snippets/r.snippets b/snippets/r.snippets
index 71186e35b..95079650f 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -12,24 +12,24 @@ snippet source
 # conditionals
 snippet if
 	if (${1:condition}) {
-		${2:code}
+		${2}
 	}
 snippet el
 	else {
-		${1:code}
+		${1}
 	}
 snippet ei
 	else if (${1:condition}) {
-		${2:code}
+		${2}
 	}
 
 # functions
 snippet fun
 	${1:name} = function (${2:variables}) {
-		${3:code}
+		${3}
 	}
 snippet ret
-	return(${1:code})
+	return(${1})
 
 # dataframes, lists, etc
 snippet df
diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index c342228a2..9a71ec2c9 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -7,61 +7,61 @@
 #if
 snippet if
 	if(${1:obj}) {
-		${2:/* code */}
+		${2}
 	}
 #if not
 snippet ifn
 	if(!${1:obj}) {
-		${2:/* code */}
+		${2}
 	}
 #if-else
 snippet ifel
 	if(${1:obj}) {
-		${2:/* code */}
+		${2}
 	} else {
-		${3:/* code */}
+		${3}
 	}
 #if-else-if
 snippet ifelif
 	if(${1:obj}) {
-		${2:/* code */}
+		${2}
 	} else if(${3:obj}) {
-		${4:/* code */}
+		${4}
 	}
 #while loop
 snippet while
 	while (${1:obj}) {
-		${2:/* code */}
+		${2}
 	}
 #for loop(classic)
 snippet for
 	for (${1:item} <- ${2:obj}) {
-		${3:/* code */}
+		${3}
 	}
 #for loop(indexed)
 snippet fori
 	for (${1:i} <- ${2:0} to ${3:obj}.length) {
-		${4:/* code */}
+		${4}
 	}
 #exceptions
 snippet try
 	try {
-		${1:/* code */}
+		${1}
 	} catch {
-		case e: FileNotFoundException => ${2:/* code */}
-		case e: IOException => ${3:/* code */}
+		case e: FileNotFoundException => ${2}
+		case e: IOException => ${3}
 	} finally {
-		${4:/* code */}
+		${4}
 	}
 #match
 snippet match
 	${1: obj} match {
-		case ${2:e} => ${3:/* code */}
-		case _ => ${4:/* code */}
+		case ${2:e} => ${3}
+		case _ => ${4}
 	}
 #case
 snippet case
-	case ${1:value} => ${2:/* code */}
+	case ${1:value} => ${2}
 ############################
 # methods and arguments
 #
@@ -82,9 +82,9 @@ snippet ovdef
 	override def ${1:name}(${2:arg}) = ${3:}
 #first class function(see scalabook p 188)
 snippet fcf
-	(${1:a}: ${2:T}) => $1 ${3:/* code */}
+	(${1:a}: ${2:T}) => $1 ${3}
 snippet =>
-	${1:name} => ${2:/* code */}
+	${1:name} => ${2}
 #recursion
 snippet rec
 	def ${1:name}(${2:arg}) =
@@ -196,11 +196,11 @@ snippet as
 
 #scope() with one arg
 snippet (a
-	(${1:a} => ${2:/* code */})
+	(${1:a} => ${2})
 #scope() with two args
 snippet {(
 	{(${1:a},${2:b}) =>
-		${3:/* code */}
+		${3}
 	}
 #filter
 snippet filter
@@ -220,10 +220,10 @@ snippet fldr
 #fold left operator(if u wanna reduce readability of ur code)
 #use wildcard symbols
 snippet /:
-	(${1:first}/:${2:name})(${3:/* code */})
+	(${1:first}/:${2:name})(${3})
 #fold right operator
 snippet :\
-	(${1:first}:\${2:name})(${3:/* code */})
+	(${1:first}:\${2:name})(${3})
 #reduce left
 snippet redl
 	${1:name}.reduceLeft[${2:T}] {(
@@ -258,13 +258,13 @@ snippet athis
 snippet abstract
 	abstract class ${1:name}${2:(arg)}${3: extends }${4: with} {
 		${5:override def toString = "$1"}
-		${6:/* code */}
+		${6}
 	}
 #class
 snippet class
 	class ${1:name}${2:(arg)}${3: extends }${4: with} {
 		${5:override def toString = "$1"}
-		${6:/* code */}
+		${6}
 	}
 #object
 snippet object
@@ -279,7 +279,7 @@ snippet ordered
 	class ${1:name}${2:(arg)} extends Ordered[$1] ${3: with} {
 		${4:override def toString = "$1"}
 		def compare(that: $1) = ${5:this - that}
-		${6:/* code */}
+		${6}
 	}
 #case class
 snippet casecl
diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index 329d1e9f2..728c40208 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -10,7 +10,7 @@ snippet guard
 	let $1 = 1${3}
 snippet f
 	fun! ${1:`expand('%') =~ 'autoload' ? substitute(matchstr(expand('%:p'),'autoload/\zs.*\ze.vim'),'[/\\]','#','g').'#' : ''`}${2:function_name}(${3})
-		${4:" code}
+		${4}
 	endf
 snippet t
 	try
@@ -20,15 +20,15 @@ snippet t
 	endtry
 snippet for
 	for ${1:needle} in ${2:haystack}
-		${3:" code}
+		${3}
 	endfor
 snippet wh
 	while ${1:condition}
-		${2:" code}
+		${2}
 	endw
 snippet if
 	if ${1:condition}
-		${2:" code}
+		${2}
 	endif
 snippet ife
 	if ${1:condition}

From b6ba92b409b37684983bca76f53859c6ca514298 Mon Sep 17 00:00:00 2001
From: Michael Thessel <michael@gt.net>
Date: Thu, 20 Jun 2013 14:39:31 -0700
Subject: [PATCH 0106/1587] Removed unnecessary whitespace from the end of the
 line

---
 snippets/_.snippets            |  68 +++++++++----------
 snippets/actionscript.snippets |   8 +--
 snippets/apache.snippets       |   2 +-
 snippets/c.snippets            |   4 +-
 snippets/chef.snippets         |   6 +-
 snippets/clojure.snippets      |   2 +-
 snippets/cmake.snippets        |   6 +-
 snippets/cpp.snippets          |   6 +-
 snippets/cs.snippets           |  14 ++--
 snippets/django.snippets       |  12 ++--
 snippets/erlang.snippets       |   8 +--
 snippets/falcon.snippets       |  26 ++++----
 snippets/go.snippets           |  32 ++++-----
 snippets/haskell.snippets      |   2 +-
 snippets/htmltornado.snippets  |   2 +-
 snippets/java.snippets         |   2 +-
 snippets/javascript.snippets   |  10 +--
 snippets/markdown.snippets     |   4 +-
 snippets/progress.snippets     |   2 +-
 snippets/puppet.snippets       |   8 +--
 snippets/python.snippets       |   4 +-
 snippets/r.snippets            |   2 +-
 snippets/rst.snippets          |   8 +--
 snippets/sh.snippets           |  12 ++--
 snippets/tcl.snippets          |   2 +-
 snippets/textile.snippets      |   2 +-
 snippets/xslt.snippets         |   8 +--
 snippets/yii-chtml.snippets    | 118 ++++++++++++++++-----------------
 snippets/yii.snippets          |  82 +++++++++++------------
 29 files changed, 231 insertions(+), 231 deletions(-)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index c72974801..6204aee5d 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -16,17 +16,17 @@ snippet lorem
 snippet GPL2
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation; either version 2 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, see <http://www.gnu.org/licenses/>.
 
@@ -34,17 +34,17 @@ snippet GPL2
 snippet LGPL2
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	This library is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as published
 	by the Free Software Foundation; either version 2.1 of the License, or
 	(at your option) any later version.
-	
+
 	This library is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU Lesser General Public License for more details.
-	
+
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
 
@@ -52,35 +52,35 @@ snippet LGPL2
 snippet GPL3
 	${1:one line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
+
 	${3}
 snippet LGPL3
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	This library is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as published
 	by the Free Software Foundation; either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This library is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU Lesser General Public License for more details.
-	
+
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
 
@@ -89,7 +89,7 @@ snippet BSD2
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 	1. Redistributions of source code must retain the above copyright
@@ -97,7 +97,7 @@ snippet BSD2
 	2. Redistributions in binary form must reproduce the above copyright
 	notice, this list of conditions and the following disclaimer in the
 	documentation and/or other materials provided with the distribution.
-	
+
 	THIS SOFTWARE IS PROVIDED BY $2 ''AS IS'' AND ANY
 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -108,9 +108,9 @@ snippet BSD2
 	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	
-	
-	The views and conclusions contained in the software and documentation 
+
+
+	The views and conclusions contained in the software and documentation
 	are those of the authors and should not be interpreted as representing
 	official policies, either expressedor implied, of $2.
 
@@ -119,7 +119,7 @@ snippet BSD3
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 	1. Redistributions of source code must retain the above copyright
@@ -130,7 +130,7 @@ snippet BSD3
 	3. Neither the name of the ${3:organization} nor the
 	names of its contributors may be used to endorse or promote products
 	derived from this software without specific prior written permission.
-	
+
 	THIS SOFTWARE IS PROVIDED BY $2 ''AS IS'' AND ANY
 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -147,7 +147,7 @@ snippet BSD4
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 	1. Redistributions of source code must retain the above copyright
@@ -161,7 +161,7 @@ snippet BSD4
 	4. Neither the name of the $3 nor the
 	names of its contributors may be used to endorse or promote products
 	derived from this software without specific prior written permission.
-	
+
 	THIS SOFTWARE IS PROVIDED BY $2 ''AS IS'' AND ANY
 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -177,17 +177,17 @@ snippet BSD4
 snippet MIT
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	Permission is hereby granted, free of charge, to any person obtaining
 	a copy of this software and associated documentation files (the "Software"),
 	to deal in the Software without restriction, including without limitation
 	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-	and/or sell copies of the Software, and to permit persons to whom the 
+	and/or sell copies of the Software, and to permit persons to whom the
 	Software is furnished to do so, subject to the following conditions:
-	
+
 	The above copyright notice and this permission notice shall be included
 	in all copies or substantial portions of the Software.
-	
+
 	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 	OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -200,13 +200,13 @@ snippet MIT
 snippet APACHE
 	${1:one line to give the program's name and a brief description}
 	Copyright `strftime("%Y")` ${2:copyright holder}
-	
+
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
 	You may obtain a copy of the License at
-	
+
 		http://www.apache.org/licenses/LICENSE-2.0
-	
+
 	Unless required by applicable law or agreed to in writing, software
 	distributed under the License is distributed on an "AS IS" BASIS,
 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -214,14 +214,14 @@ snippet APACHE
 	limitations under the License.
 
 	${3}
-snippet BEERWARE 
+snippet BEERWARE
 	${2:one line to give the program's name and a brief description}
 	Copyright `strftime("%Y")` ${3:copyright holder}
-	
+
 	Licensed under the "THE BEER-WARE LICENSE" (Revision 42):
 	${1:`g:snips_author`} wrote this file. As long as you retain this notice you
 	can do whatever you want with this stuff. If we meet some day, and you think
-	this stuff is worth it, you can buy me a beer or coffee in return 
+	this stuff is worth it, you can buy me a beer or coffee in return
 
 	${4}
 
diff --git a/snippets/actionscript.snippets b/snippets/actionscript.snippets
index cd2ab0ebd..5385d115d 100644
--- a/snippets/actionscript.snippets
+++ b/snippets/actionscript.snippets
@@ -2,22 +2,22 @@ snippet main
 	package {
 		import flash.display.*;
 		import flash.Events.*;
-	
+
 		public class Main extends Sprite {
 			public function Main (	) {
 				trace("start");
 				stage.scaleMode = StageScaleMode.NO_SCALE;
 				stage.addEventListener(Event.RESIZE, resizeListener);
 			}
-	
+
 			private function resizeListener (e:Event):void {
 				trace("The application window changed size!");
 				trace("New width:  " + stage.stageWidth);
 				trace("New height: " + stage.stageHeight);
 			}
-	
+
 		}
-	
+
 	}
 snippet class
 	${1:public|internal} class ${2:name} ${3:extends } {
diff --git a/snippets/apache.snippets b/snippets/apache.snippets
index a9e53e197..6f0c8873f 100644
--- a/snippets/apache.snippets
+++ b/snippets/apache.snippets
@@ -6,7 +6,7 @@ snippet dir
 		Order Deny,Allow
 		Deny from All
 	</Directory>
-# <FilesMatch>   
+# <FilesMatch>
 snippet filesmatch
 	<FilesMatch "${1:regex}">
 		${2}
diff --git a/snippets/c.snippets b/snippets/c.snippets
index 85e7ac2b0..21c265d68 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -14,7 +14,7 @@ snippet mainn
 		return 0;
 	}
 ##
-## Preprocessor 
+## Preprocessor
 # #include <...>
 snippet inc
 	#include <${1:stdio}.h>${2}
@@ -230,5 +230,5 @@ snippet gpl
 	 *
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
-	
+
 	${2}
diff --git a/snippets/chef.snippets b/snippets/chef.snippets
index 51036135a..d44f535ec 100644
--- a/snippets/chef.snippets
+++ b/snippets/chef.snippets
@@ -141,7 +141,7 @@ snippet svn
 		${12:#}svn_username ${13} # (Subversion only) Username for Subversion operations
 		${14:#}svn_password ${15} # (Subversion only) Password for Subversion operations
 		${16:#}svn_arguments ${17} # (Subversion only) Extra arguments passed to the subversion command
-		
+
 		${18:#}${19:action :sync} # Update the source to the specified revision, or get a new checkout (Default)
 		${20:#}${21:action :checkout} # Checkout the source. Does nothing if a checkout is available
 		${22:#}${23:action :export} # Export the source, excluding or removing any version control artifacts
@@ -159,7 +159,7 @@ snippet git
 		${14:#}enable_submodules ${15:"false"} # (Git only) performs a submodule init and submodule update
 		${16:#}remote ${17:"origin"} # (Git only) remote repository to use for syncing an existing clone
 		${18:#}ssh_wrapper ${19} # (Git only) path to a wrapper script for running SSH with git. GIT_SSH environment variable is set to this.
-		
+
 		${20:#}${21:action :sync} # Update the source to the specified revision, or get a new clone (Default)
 		${22:#}${23:action :checkout} # Clone the source. Does nothing if a checkout is available
 		${24:#}${25:action :export} # Export the source, excluding or removing any version control artifacts
@@ -197,7 +197,7 @@ snippet deploy
 		${54:#}before_symlink ${55:"deploy/before_symlink.rb"} # A block or path to a file containing chef code to run before symlinking
 		${56:#}before_restart ${57:"deploy/before_restart.rb"} # A block or path to a file containing chef code to run before restarting
 		${58:#}after_restart ${59:"deploy/after_restart.rb"} # A block or path to a file containing chef code to run after restarting
-		
+
 		${60:#}${61::deploy} # Deploy the application (Default)
 		${62:#}${63::force_deploy} # For the revision deploy strategy, this removes any existing release of the same code version and re-deploys in its place
 		${64:#}${65::rollback} # Rollback the application to the previous release
diff --git a/snippets/clojure.snippets b/snippets/clojure.snippets
index e247debf6..59867b755 100644
--- a/snippets/clojure.snippets
+++ b/snippets/clojure.snippets
@@ -43,7 +43,7 @@ snippet if
 	(if ${1:test-expr}
 	  ${2:then-expr}
 	  ${3:else-expr})
-snippet if-let 
+snippet if-let
 	(if-let [${1:result} ${2:test-expr}]
 		(${3:then-expr} $1)
 		(${4:else-expr}))
diff --git a/snippets/cmake.snippets b/snippets/cmake.snippets
index 26aa9ac9d..0c3a21576 100644
--- a/snippets/cmake.snippets
+++ b/snippets/cmake.snippets
@@ -39,7 +39,7 @@ snippet link
 	TARGET_LINK_LIBRARIES(${1:bin}
 		${2:somelib}
 	)
-	
+
 snippet bin
 	ADD_EXECUTABLE(${1:bin})
 
@@ -52,7 +52,7 @@ snippet dep
 	)
 
 snippet props
-	SET_TARGET_PROPERTIES(${1:target} 
-		${2:PROPERTIES} ${3:COMPILE_FLAGS} 
+	SET_TARGET_PROPERTIES(${1:target}
+		${2:PROPERTIES} ${3:COMPILE_FLAGS}
 		${4:"-O3 -Wall -pedantic"}
 	)
diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 048671246..52148e786 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -64,11 +64,11 @@ snippet fr
 # mutable
 snippet mu
 	mutable
-## 
+##
 ## Class
 # class
 snippet cl
-	class ${1:`Filename('$1', 'name')`} 
+	class ${1:`Filename('$1', 'name')`}
 	{
 	public:
 		$1(${2});
@@ -97,7 +97,7 @@ snippet cin
 	std::cin >> ${1};${2}
 ##
 ## Iteration
-# for i 
+# for i
 snippet fori
 	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
 		${4}
diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 725f8b7d3..d93435141 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -1,12 +1,12 @@
 # cs.snippets
 # ===========
-# 
+#
 # Standard C-Sharp snippets for snipmate.
 #
 # Largely ported over from Visual Studio 2010 snippets plus
 # a few snippets from Resharper plus a few widely known snippets.
 #
-# Most snippets on elements (i.e. classes, properties) 
+# Most snippets on elements (i.e. classes, properties)
 # follow suffix conventions. The order of suffixes to a snippet
 # is fixed.
 #
@@ -55,13 +55,13 @@
 # * Events
 #
 # Feedback is welcome!
-# 
+#
 # entry point
 snippet sim
 	public static int Main(string[] args) {
 		${1}
 		return 0;
-	} 
+	}
 snippet simc
 	public class Application {
 		public static int Main(string[] args) {
@@ -73,13 +73,13 @@ snippet simc
 snippet if
 	if (${1}) {
 		${2}
-	} 
+	}
 snippet el
 	else {
 		${1}
-	} 
+	}
 snippet ifs
-	if (${1}) 
+	if (${1})
 		${2}
 # ternary conditional
 snippet t
diff --git a/snippets/django.snippets b/snippets/django.snippets
index 8296cce25..5c72b2b9e 100644
--- a/snippets/django.snippets
+++ b/snippets/django.snippets
@@ -73,16 +73,16 @@ snippet model
 	class ${1:ModelName}(models.Model):
 		"""${2:docstring}"""
 		${3}
-		
+
 		class Meta:
 			${4}
-		
+
 		def __unicode__(self):
 			${5}
-		
+
 		def save(self, force_insert=False, force_update=False):
 			${6}
-		
+
 		@models.permalink
 		def get_absolute_url(self):
 			return ('${7:view_or_url_name}' ${8})
@@ -90,9 +90,9 @@ snippet model
 snippet modeladmin
 	class ${1:ModelName}Admin(admin.ModelAdmin):
 		${2}
-	
+
 	admin.site.register($1, $1Admin)
-	
+
 snippet tabularinline
 	class ${1:ModelName}Inline(admin.TabularInline):
 		model = $1
diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index acc6fd195..1199e8443 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -1,12 +1,12 @@
 # module and export all
 snippet mod
 	-module(${1:`Filename('', 'my')`}).
-	
+
 	-compile([export_all]).
-	
+
 	start() ->
 	    ${2}
-	
+
 	stop() ->
 	    ok.
 # define directive
@@ -81,7 +81,7 @@ snippet application
 	    end.
 
 	stop(_State) ->
-	    ok.	
+	    ok.
 # OTP supervisor
 snippet supervisor
 	-module(${1:`Filename('', 'my')`}).
diff --git a/snippets/falcon.snippets b/snippets/falcon.snippets
index 93aba1983..3fe4caca7 100644
--- a/snippets/falcon.snippets
+++ b/snippets/falcon.snippets
@@ -1,15 +1,15 @@
 snippet #!
 	#!/usr/bin/env falcon
 
-# Import	
+# Import
 snippet imp
 	import ${1:module}
 
 # Function
 snippet fun
-	function ${2:function_name}(${3})	
+	function ${2:function_name}(${3})
 		${4}
-	end	
+	end
 
 # Class
 snippet class
@@ -17,35 +17,35 @@ snippet class
 		${3:/* members/methods */}
 	end
 
-# If 
+# If
 snippet if
 	if ${1:condition}
-		${2}		
+		${2}
 	end
 
 # If else
 snippet ife
 	if ${1:condition}
-		${2}		
+		${2}
 	else
-	    ${1}	
+	    ${1}
 	end
 
-# If else if	
+# If else if
 snippet elif
 	elif ${1:condition}
-		${2}	        
+		${2}
 
 # Switch case
 snippet switch
 	switch ${1:expression}
 		case ${2:item}
 		case ${3:item}
-		default 
+		default
 	end
 
 # Select
-snippet select 
+snippet select
 	select ${1:variable}
 		case ${2:TypeSpec}
 		case ${3:TypeSpec}
@@ -65,7 +65,7 @@ snippet forto
 	end
 
 # While Loop
-snippet while 
+snippet while
 	while ${1:conidition}
-		${2}	
+		${2}
 	end
diff --git a/snippets/go.snippets b/snippets/go.snippets
index a88d8d069..1d7d4f595 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -4,7 +4,7 @@ snippet ap
 # bool
 snippet bl
 	bool
-# byte 
+# byte
 snippet bt
 	byte
 # break
@@ -29,7 +29,7 @@ snippet co
 # continue
 snippet cn
 	continue
-# defer 
+# defer
 snippet df
 	defer ${1:func}()
 # defer recover
@@ -57,20 +57,20 @@ snippet gpl
 	 *
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
-	
+
 	${2}
 # int
 snippet i
 	int
-# import 
+# import
 snippet im
 	import (
-		"${1:package}" 
+		"${1:package}"
 	)${2}
-# interface 
+# interface
 snippet in
 	interface{}
-# full interface snippet 
+# full interface snippet
 snippet inf
 	interface ${1:name} {
 		${2:/* methods */}
@@ -126,13 +126,13 @@ snippet fr
 		${4}
 	}
 	${5}
-# function simple 
+# function simple
 snippet fun
 	func ${1:funcName}(${2}) ${3:error} {
 		${4}
 	}
 	${5}
-# function on receiver 
+# function on receiver
 snippet fum
 	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
 		${5}
@@ -147,7 +147,7 @@ snippet lp
 # make
 snippet mk
 	make(${1:[]string}, ${2:0})
-# map 
+# map
 snippet mp
 	map[${1:string}]${2:int}
 # main()
@@ -159,19 +159,19 @@ snippet main
 # new
 snippet nw
 	new(${1:type})
-# panic 
+# panic
 snippet pn
 	panic("${1:msg}")
 # print
 snippet pr
 	fmt.Printf("%${1:s}\n", ${2:var})${3}
-# range 
+# range
 snippet rn
 	range ${1}
-# return 
+# return
 snippet rt
 	return ${1}
-# result 
+# result
 snippet rs
 	result
 # select
@@ -193,7 +193,7 @@ snippet st
 		${2:/* data */}
 	}
 	${3}
-# switch 
+# switch
 snippet sw
 	switch ${1:var} {
 	case ${2:value1}:
@@ -205,7 +205,7 @@ snippet sw
 	}
 snippet sp
 	fmt.Sprintf("%${1:s}", ${2:var})${3}
-# true 
+# true
 snippet t
 	true
 # variable declaration
diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index bcda8a5b4..3857d8b4e 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -48,7 +48,7 @@ snippet ap
 	${1:map} ${2:fn} ${3:list}
 snippet do
 	do
-		
+
 snippet λ
 	\${1:x} -> ${2}
 snippet \
diff --git a/snippets/htmltornado.snippets b/snippets/htmltornado.snippets
index de9915363..9685b1f93 100644
--- a/snippets/htmltornado.snippets
+++ b/snippets/htmltornado.snippets
@@ -28,7 +28,7 @@ snippet if
 	  ${2}
 	{% end %}
 snippet elif
-	{% elif ${1:condition} %} 
+	{% elif ${1:condition} %}
 snippet else
 	{% else %}
 snippet import
diff --git a/snippets/java.snippets b/snippets/java.snippets
index daf8928b7..c34010c5b 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -47,7 +47,7 @@ snippet tc
 ##
 ## Class Enhancements
 snippet ext
-	extends 
+	extends
 snippet imp
 	implements
 ##
diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index e9dd58b94..fedb943df 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -140,7 +140,7 @@ snippet sing
 		$1 = function $1($2) {
 			return instance;
 		};
-		
+
 		// carry over the prototype properties
 		$1.prototype = this;
 
@@ -154,7 +154,7 @@ snippet sing
 
 		return instance;
 	}
-# Crockford's object function 
+# Crockford's object function
 snippet obj
 	function object(o) {
 		function F() {}
@@ -164,7 +164,7 @@ snippet obj
 # Define multiple properties
 snippet props
 	var ${1:my_object} = Object.defineProperties(
-		${2:new Object()}, 
+		${2:new Object()},
 		{
 			${3:property} : {
 				get : function $1_$3_getter() {
@@ -182,9 +182,9 @@ snippet props
 	);
 # Define single property
 snippet prop
-	Object.defineProperty( 
+	Object.defineProperty(
 		${1:object},
-		"${2:property}", 
+		"${2:property}",
 		{
 			get : function $1_$2_getter() {
 				// getter code
diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index e4efd3c2d..9788959f6 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -24,11 +24,11 @@ snippet ![:*
 
 snippet ===
 	`repeat('=', strlen(getline(line(".") - 1)))`
-	
+
 	${1}
 snippet ---
 	`repeat('-', strlen(getline(line(".") - 1)))`
-	
+
 	${1}
 
 snippet blockquote
diff --git a/snippets/progress.snippets b/snippets/progress.snippets
index 0e6d47bb9..0f1f436d3 100644
--- a/snippets/progress.snippets
+++ b/snippets/progress.snippets
@@ -55,4 +55,4 @@ snippet log
 snippet dec
 	DECIMAL
 snippet sep
-	/* ------------------------------------------------------------------------- */ 
+	/* ------------------------------------------------------------------------- */
diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index f3499321e..29fe6b37e 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -1,6 +1,6 @@
 # Snippets for use with VIM and http://www.vim.org/scripts/script.php?script_id=2540
 #
-# Please contact R.I.Pienaar <rip@devco.net> for additions and feedback, 
+# Please contact R.I.Pienaar <rip@devco.net> for additions and feedback,
 # see it in action @ http://www.devco.net/archives/2009/09/22/vim_and_puppet.php
 
 # Language Constructs
@@ -25,7 +25,7 @@ snippet ife
 snippet if
 	if $${1:variable} {
 		${2}
-	} 
+	}
 snippet else
 	else {
 		${1}
@@ -34,7 +34,7 @@ snippet ?
 	? {
 		'${1}'	=> ${2}
 	  }
-# 
+#
 # blocks etc and general syntax sugar
 snippet [
 	[ ${1} ]${2}
@@ -54,7 +54,7 @@ snippet defined
 	defined(${1:Resource}["${2:name}"])${3}
 snippet emerg
 	emerg("${1:message}")${2}
-snippet extlookup Simple extlookup 
+snippet extlookup Simple extlookup
 	extlookup("${1:variable}")${2}
 snippet extlookup Extlookup with defaults
 	extlookup("${1:variable}", "${2:default}")${3}
diff --git a/snippets/python.snippets b/snippets/python.snippets
index c29b340ef..fcce99fec 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -140,7 +140,7 @@ snippet test
 # test case
 snippet testcase
 	class ${1:ExampleCase}(unittest.TestCase):
-		
+
 		def test_${2:description}(self):
 			${3}
 snippet fut
@@ -151,7 +151,7 @@ snippet getopt
 		# Short option syntax: "hv:"
 		# Long option syntax: "help" or "verbose="
 		opts, args = getopt.getopt(sys.argv[1:], "${1:short_options}", [${2:long_options}])
-	
+
 	except getopt.GetoptError, err:
 		# Print debug info
 		print str(err)
diff --git a/snippets/r.snippets b/snippets/r.snippets
index 95079650f..2436f56ed 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -117,5 +117,5 @@ snippet cor
 	cor.test(${1:x}, ${2:y})
 snippet fte
 	var.test(${1:x}, ${2:y})
-snippet kvt 
+snippet kvt
 	kv.test(${1:x}, ${2:y})
diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index d97fa5738..6cb799228 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -30,7 +30,7 @@ snippet cont:
 		${1:content}
 snippet code:
 	.. code:: ${1:type}
-		
+
 		${2:write some code}
 snippet tip:
 	.. tip::
@@ -59,11 +59,11 @@ snippet cau:
 #Spinx only
 snippet sid:
 	.. sidebar:: ${1:Title}
-		
-		${2}	
+
+		${2}
 # CJK optimize, CJK has no space between charaters
 snippet *c
-	\ *${1:Emphasis}*\ ${2} 
+	\ *${1:Emphasis}*\ ${2}
 snippet **c
 	\ **${1:Strong emphasis}**\ ${2}
 
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index b07362081..83e78482d 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -1,7 +1,7 @@
 # Shebang. Executing bash via /usr/bin/env makes scripts more portable.
 snippet #!
 	#!/usr/bin/env bash
-	
+
 snippet if
 	if [[ ${1:condition} ]]; then
 		${2:#statements}
@@ -30,9 +30,9 @@ snippet case
 		${2:pattern})
 			${3};;
 	esac
-snippet go 
-	while getopts '${1:o}' ${2:opts} 
-	do 
+snippet go
+	while getopts '${1:o}' ${2:opts}
+	do
 		case $$2 in
 		${3:o0})
 			${4:#staments};;
@@ -53,9 +53,9 @@ snippet getopt
 	{
 			cat <<- EOT
 
-	  Usage :  $${0:0} [options] [--] 
+	  Usage :  $${0:0} [options] [--]
 
-	  Options: 
+	  Options:
 	  -h|help       Display this message
 	  -v|version    Display script version
 
diff --git a/snippets/tcl.snippets b/snippets/tcl.snippets
index 1fe1cb960..4d456de07 100644
--- a/snippets/tcl.snippets
+++ b/snippets/tcl.snippets
@@ -1,7 +1,7 @@
 # #!/usr/bin/env tclsh
 snippet #!
 	#!/usr/bin/env tclsh
-	
+
 # Process
 snippet pro
 	proc ${1:function_name} {${2:args}} {
diff --git a/snippets/textile.snippets b/snippets/textile.snippets
index c78d6ec81..9ad97be5b 100644
--- a/snippets/textile.snippets
+++ b/snippets/textile.snippets
@@ -27,4 +27,4 @@ snippet fn
 	[${1:ref number}] ${3}
 
 	fn$1. ${2:footnote}
-	
+
diff --git a/snippets/xslt.snippets b/snippets/xslt.snippets
index e7abdf3fc..6e25fd594 100644
--- a/snippets/xslt.snippets
+++ b/snippets/xslt.snippets
@@ -50,7 +50,7 @@ snippet import
 
 snippet include
 	<xsl:include href="${1:stylesheet}" />${2}
-	
+
 snippet otherwise
 	<xsl:otherwise>${1}
 	</xsl:otherwise>
@@ -64,7 +64,7 @@ snippet stylesheet
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">${1}
 	</xsl:stylesheet>
 
-snippet template 
+snippet template
 	<xsl:template match="${1:*}">${3}
 	</xsl:template>
 
@@ -91,7 +91,7 @@ snippet when
 
 snippet with-param
 	<xsl:with-param name="${1:name}">${2}</xsl:with-param>
-	
+
 snippet with-param select
 	<xsl:with-param name="${1:name}" select="${2:*}" />
-	
+
diff --git a/snippets/yii-chtml.snippets b/snippets/yii-chtml.snippets
index 91c65b923..df5d5eb73 100644
--- a/snippets/yii-chtml.snippets
+++ b/snippets/yii-chtml.snippets
@@ -1,59 +1,59 @@
 #--------------------Yii CHtml---------------------------------
 #Yii CHtml::radioButton
 snippet yhrb
-	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${4:optionValue} ); 
+	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${4:optionValue} );
 
 #Yii CHtml::asset
 snippet yhass
-	echo CHtml::asset('${1:path}'); 
+	echo CHtml::asset('${1:path}');
 
 #Yii CHtml::activeLabelEx
 snippet yhale
-	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::encodeArray
 snippet yheca
-	echo CHtml::encodeArray(array(${1})); 
+	echo CHtml::encodeArray(array(${1}));
 
 #Yii CHtml::normalizeUrl
 snippet yhnurl
-	echo CHtml::normalizeUrl(array('${1}')); 
+	echo CHtml::normalizeUrl(array('${1}'));
 
 #Yii CHtml::resetButton
 snippet yhsb
-	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::linkButton
 snippet yhlinkb
-	echo CHtml::linkButton('${1:lable}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::linkButton('${1:lable}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::activeTextArea
 snippet yhata
-	echo CHtml::activeTextArea(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeTextArea(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::ajaxButton
 snippet yhajb
-	echo CHtml::ajaxButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::ajaxButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::activeId
 snippet yhai
-	echo CHtml::activeId(${1:model}, '${2:attribute}'); 
+	echo CHtml::activeId(${1:model}, '${2:attribute}');
 
 #Yii CHtml::activeCheckBox
 snippet yhacb
-	echo CHtml::activeCheckBox(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeCheckBox(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeHiddenField
 snippet yhahf
-	echo CHtml::activeHiddenField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeHiddenField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::encode
 snippet yhec
-	echo CHtml::encode(${1:text}); 
+	echo CHtml::encode(${1:text});
 
 #Yii CHtml::metaTag
 snippet yhmtag
-	echo CHtml::metaTag('${1:content}', '${2:name}', '${3:httpEquiv}',array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::metaTag('${1:content}', '${2:name}', '${3:httpEquiv}',array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::dropDownList
 snippet yhddl
@@ -61,167 +61,167 @@ snippet yhddl
 
 #Yii CHtml::listBox
 snippet yhlb
-	echo CHtml::listBox('${1:name}', '${2:select}',array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::listBox('${1:name}', '${2:select}',array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::script
 snippet yhjs
-	echo CHtml::script('${1:test}'); 
+	echo CHtml::script('${1:test}');
 
 #Yii CHtml::ajax
 snippet yhaj
-	echo CHtml::ajax(array(${1})); 
+	echo CHtml::ajax(array(${1}));
 
 #Yii CHtml::textField
 snippet yhtf
-	echo CHtml::textField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::textField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activePasswordField
 snippet yhapf
-	echo CHtml::activePasswordField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activePasswordField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::listData
 snippet yhld
-	echo CHtml::listData(array(${1}),'${2:valueField}', '${3:textField}','${4:groupField}'); 
+	echo CHtml::listData(array(${1}),'${2:valueField}', '${3:textField}','${4:groupField}');
 
 #Yii CHtml::mailto
 snippet yhmt
-	echo CHtml::mailto('${1:text}', '${2:email}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::mailto('${1:text}', '${2:email}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::image
 snippet yhimg
-	echo CHtml::image('${1:src}', '${2:alt}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::image('${1:src}', '${2:alt}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeListBox
 snippet yhalb
-	echo CHtml::activeListBox(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeListBox(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::activeFileField
 snippet yhaff
-	echo CHtml::activeFileField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeFileField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::closeTag
 snippet yhct
-	echo CHtml::closeTag('${1:tag}'); 
+	echo CHtml::closeTag('${1:tag}');
 
 #Yii CHtml::activeInputField
 snippet yhaif
-	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::scriptFile
 snippet yhjsf
-	echo CHtml::scriptFile('${1:url}'); 
+	echo CHtml::scriptFile('${1:url}');
 
 #Yii CHtml::radioButtonList
 snippet yhrbl
-	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::cssFile
 snippet yhcssf
-	echo CHtml::cssFile('${1:url}','${2:media}'); 
+	echo CHtml::cssFile('${1:url}','${2:media}');
 
 #Yii CHtml::error
 snippet yherr
-	echo CHtml::error(${1:model}, '${2:attribute}'); 
+	echo CHtml::error(${1:model}, '${2:attribute}');
 
 #Yii CHtml::passwordField
 snippet yhpf
-	echo CHtml::passwordField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::passwordField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::hiddenField
 snippet yhhf
-	echo CHtml::hiddenField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::hiddenField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::cdata
 snippet yhc
-	echo CHtml::cdata(${1:text}); 
+	echo CHtml::cdata(${1:text});
 
 #Yii CHtml::link
 snippet yhlink
-	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::errorSummary
 snippet yherrs
-	echo CHtml::errorSummary(${1:model},'${2:headerHtml}','${3:footerHtml}'); 
+	echo CHtml::errorSummary(${1:model},'${2:headerHtml}','${3:footerHtml}');
 
 #Yii CHtml::tag
 snippet yht
-	echo CHtml::tag('${1:tag}',array('${2:optionName}'=>${3:optionValue}),${4:false},${5:true}); 
+	echo CHtml::tag('${1:tag}',array('${2:optionName}'=>${3:optionValue}),${4:false},${5:true});
 
 #Yii CHtml::ajaxLink
 snippet yhajl
-	echo CHtml::ajaxLink('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::ajaxLink('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::label
 snippet yhlabel
-	echo CHtml::label('${1:label}', '${2:for}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::label('${1:label}', '${2:for}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeName
 snippet yhan
-	echo CHtml::activeName(${1:model}, '${2:attribute}'); 
+	echo CHtml::activeName(${1:model}, '${2:attribute}');
 
 #Yii CHtml::statefulForm
 snippet yhsform
-	echo CHtml::statefulForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::statefulForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::fileField
 snippet yhff
-	echo CHtml::fileField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::fileField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeTextField
 snippet yhatf
-	echo CHtml::activeTextField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeTextField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::css
 snippet yhcss
-	echo CHtml::css('${1:test}','${2:media}'); 
+	echo CHtml::css('${1:test}','${2:media}');
 
 #Yii CHtml::imageButton
 snippet yhimgb
-	echo CHtml::imageButton('${1:src}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::imageButton('${1:src}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::ajaxSubmitButton
 snippet yhajsb
-	echo CHtml::ajaxSubmitButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::ajaxSubmitButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::button
 snippet yhb
-	echo CHtml::button('${1:label}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::button('${1:label}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::listOptions
 snippet yhlo
-	echo CHtml::listOptions('${1:selection}', array(${2}), array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::listOptions('${1:selection}', array(${2}), array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeCheckBoxList
 snippet yhacbl
-	echo CHtml::activeCheckBoxList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeCheckBoxList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::openTag
 snippet yhot
-	echo CHtml::openTag('${1:tag}', array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::openTag('${1:tag}', array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::checkBox
 snippet yhcb
-	echo CHtml::checkBox('${1:name}', ${2:false}, array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::checkBox('${1:name}', ${2:false}, array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::textArea
 snippet yhta
-	echo CHtml::textArea('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::textArea('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::linkTag
 snippet yhlinkt
-	echo CHtml::linkTag('${1:relation}', '${2:type}', '${3:href}', '${4:media}',array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::linkTag('${1:relation}', '${2:type}', '${3:href}', '${4:media}',array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::resetButton
 snippet yhrsb
-	echo CHtml::resetButton('${1:label}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::resetButton('${1:label}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::activeRadioButtonList
 snippet yharbl
-	echo CHtml::activeRadioButtonList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeRadioButtonList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::checkBoxList
 snippet yhcbl
-	echo CHtml::checkBoxList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::checkBoxList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::form
 snippet yhform
@@ -231,18 +231,18 @@ snippet yhform
 snippet yhbeform
 	echo CHtml::beginForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
 	${5}
-	echo CHtml::endForm(); 
+	echo CHtml::endForm();
 
 #Yii CHtml::activeDropDownList
 snippet yhaddl
-	echo CHtml::activeDropDownList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeDropDownList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::activeRadioButton
 snippet yharb
-	echo CHtml::activeRadioButton(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeRadioButton(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeLabel
 snippet yhal
-	echo CHtml::activeLabel(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeLabel(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 
diff --git a/snippets/yii.snippets b/snippets/yii.snippets
index 9f29eaf13..da48ee236 100644
--- a/snippets/yii.snippets
+++ b/snippets/yii.snippets
@@ -1,58 +1,58 @@
 #Yii session offset
 snippet yse
-	Yii::app()->session['${1}']; 
+	Yii::app()->session['${1}'];
 
 #Yii renderDynamic
 snippet yrd
-	$this->renderDynamic('${1:callback}'); 
+	$this->renderDynamic('${1:callback}');
 
 #Yii set cache
 snippet ycas
-	Yii::app()->cache->set('${1:key}', ${2:value}, ${3:expire}, new C${4:}CacheDependency(${5})); 
+	Yii::app()->cache->set('${1:key}', ${2:value}, ${3:expire}, new C${4:}CacheDependency(${5}));
 
 #Yii Add cache
 snippet ycad
-	Yii::app()->cache->add('${1:key}', ${2:value}, ${3:expire}, new C${4}CacheDependency(${5})); 
+	Yii::app()->cache->add('${1:key}', ${2:value}, ${3:expire}, new C${4}CacheDependency(${5}));
 
 #Yii register CSS file
 snippet yregcf
-	Yii::app()->clientScript->registerCssFile('${1:file}'); 
+	Yii::app()->clientScript->registerCssFile('${1:file}');
 
 #Yii requestType
 snippet yreqtype
-	Yii::app()->request->requestType 
+	Yii::app()->request->requestType
 
 #Yii isAjaxRequest
 snippet yisajax
-	Yii::app()->request->isAjaxRequest 
+	Yii::app()->request->isAjaxRequest
 
 #Yii translate
 snippet yt
-	Yii::t('${1:category}', '${2:message}',array(${3})); 
+	Yii::t('${1:category}', '${2:message}',array(${3}));
 
 #Yii register CSS
 snippet yregc
-	Yii::app()->clientScript->registerCss('${1:id}', '${2}'); 
+	Yii::app()->clientScript->registerCss('${1:id}', '${2}');
 
 #Yii log
 snippet ylog
-	Yii::log('${1:msg}', '${2:info}'); 
+	Yii::log('${1:msg}', '${2:info}');
 
 #Yii userHostAddress
 snippet yuserip
-	YYii::app()->request->userHostAddress 
+	YYii::app()->request->userHostAddress
 
 #Yii register script file
 snippet yregsf
-	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${2:END}); 
+	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${2:END});
 
 #Yii CLinkPager
 snippet ylinkpager
-	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${1}'})) 
+	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${1}'}))
 
 #Yii CJSON::encode
 snippet yjec
-	CJSON::encode(${1:text}); 
+	CJSON::encode(${1:text});
 
 #CActiveDataProvider
 snippet yadp
@@ -68,23 +68,23 @@ snippet yadp
 		),
 	));
 	${6}
-	// $dataProvider->getData() will return a list of Post objects 
+	// $dataProvider->getData() will return a list of Post objects
 
 #Yii renderDynamic internal
 snippet yrdi
-	$this->renderDynamic('${1:callback}', array('${2:key}'=>${3:value})); 
+	$this->renderDynamic('${1:callback}', array('${2:key}'=>${3:value}));
 
 #Yii register script
 snippet yregs
-	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${3:READY}); 
+	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${3:READY});
 
 #Yii Flush cache
 snippet ycaf
-	Yii::app()->cache->flush(); 
+	Yii::app()->cache->flush();
 
 #Yii Yii::app()->request->cookies
 snippet yco
-	Yii::app()->request->cookies['${1}'] 
+	Yii::app()->request->cookies['${1}']
 
 #Yii user->
 snippet yuser
@@ -92,54 +92,54 @@ snippet yuser
 
 #Yii refresh
 snippet yrf
-	$this->refresh(); 
+	$this->refresh();
 
 #Yii import
 snippet yimp
-	Yii::import('${1}'); 
+	Yii::import('${1}');
 
 #Yii trace
 snippet ytrace
-	Yii::trace('${1:msg}'); 
+	Yii::trace('${1:msg}');
 
 #Yii params
 snippet ypar
-	Yii::app()->params['${1}'] 
+	Yii::app()->params['${1}']
 
 #Yii isPostRequest
 snippet yispost
-	Yii::app()->request->isPostRequest 
+	Yii::app()->request->isPostRequest
 
 #Yii IF isAjaxRequest
 snippet yifisajax
 	if(Yii::app()->request->isAjaxRequest == TRUE)
 	{
 		${1}
-	} 
+	}
 
 #Yii Yii::app()->cache->delete
 snippet ydelcache
-	Yii::app()->cache->delete('${1:key}'); 
+	Yii::app()->cache->delete('${1:key}');
 
 #Yii render view
 snippet yr
-	$this->render('${1:view}',array('${2:key}'=>${3:value})); 
+	$this->render('${1:view}',array('${2:key}'=>${3:value}));
 
 #Yii redirect
 snippet yre
-	$this->redirect(array('${1:controller}/${2:action}')); 
+	$this->redirect(array('${1:controller}/${2:action}'));
 
 #Yii Get cache
 snippet ycag
-	Yii::app()->cache->get('${1:key}'); 
+	Yii::app()->cache->get('${1:key}');
 
 #Yii render text
 snippet yrt
-	$this->renderText('${1}'); 
+	$this->renderText('${1}');
 
 #Yii render partial
 snippet yrp
-	$this->renderPartial('${1:view}',array('${2:key}'=>${3:value})); 
+	$this->renderPartial('${1:view}',array('${2:key}'=>${3:value}));
 
 #----------------Yii Model-----------------------------
 #Yii Model count
@@ -152,7 +152,7 @@ snippet ycountbs
 
 #Yii Model updateAll
 snippet yupdatea
-	${1:ModelName}::model()->updateAll(${2:array('attributes')}, ${3:condition},array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->updateAll(${2:array('attributes')}, ${3:condition},array('${4:key}'=>${5:value}));
 
 #Yii Model updateByPk
 snippet yupdatebp
@@ -164,35 +164,35 @@ snippet ydela
 
 #Yii Model deleteByPk
 snippet ydelbp
-	${1:ModelName}::model()->deleteByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->deleteByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value}));
 
 #Yii Model find
 snippet yfind
-	${1:ModelName}::model()->find(${2:condition},array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->find(${2:condition},array('${3:key}'=>${4:value}));
 
 #Yii Model findAll
 snippet yfinda
-	${1:ModelName}::model()->findAll(${2:condition},array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->findAll(${2:condition},array('${3:key}'=>${4:value}));
 
 #Yii Model findByPk
 snippet yfindbp
-	${1:ModelName}::model()->findByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->findByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value}));
 
 #Yii Model findAllByPk
 snippet yfindabp
-	${1:ModelName}::model()->findAllByPk(${2:pk}, ${3:condition},array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->findAllByPk(${2:pk}, ${3:condition},array('${4:key}'=>${5:value}));
 
 #Yii Model findBySql
 snippet yfindbs
-	${1:ModelName}::model()->findBySql(${2:sql}, array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->findBySql(${2:sql}, array('${3:key}'=>${4:value}));
 
 #Yii Model findAllByAttributes
 snippet yfindaba
-	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), ${4:condition}, array('${5:key}'=>${6:value})); 
+	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), ${4:condition}, array('${5:key}'=>${6:value}));
 
 #Yii Model exists
 snippet yexists
-	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${4:value}));
 
 #Yii Create model class
 snippet ymodel
@@ -245,7 +245,7 @@ snippet ymodel
 		}
 	}
 
-#------------Yii Controller------------------------------------ 
+#------------Yii Controller------------------------------------
 
 #Yii Create controller class
 snippet ycontroller

From 4eb88d79939ad2cb6af04227b180277c631388d3 Mon Sep 17 00:00:00 2001
From: Michael Thessel <michael@gt.net>
Date: Thu, 20 Jun 2013 14:33:44 -0700
Subject: [PATCH 0107/1587] Removed comment blocks from placeholders

---
 snippets/actionscript.snippets      | 12 +++----
 snippets/c.snippets                 | 14 ++++----
 snippets/cpp.snippets               | 10 +++---
 snippets/dart.snippets              |  8 ++---
 snippets/falcon.snippets            | 14 ++++----
 snippets/go.snippets                | 30 ++++++++---------
 snippets/java.snippets              |  2 +-
 snippets/javascript-jquery.snippets |  4 +--
 snippets/javascript.snippets        | 20 ++++++------
 snippets/make.snippets              |  2 +-
 snippets/objc.snippets              |  2 +-
 snippets/perl.snippets              |  2 +-
 snippets/php.snippets               | 30 ++++++++---------
 snippets/processing.snippets        |  6 ++--
 snippets/python.snippets            | 40 +++++++++++------------
 snippets/r.snippets                 | 10 +++---
 snippets/scala.snippets             | 50 ++++++++++++++---------------
 snippets/vim.snippets               |  8 ++---
 18 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/snippets/actionscript.snippets b/snippets/actionscript.snippets
index af9611c3f..cd2ab0ebd 100644
--- a/snippets/actionscript.snippets
+++ b/snippets/actionscript.snippets
@@ -109,17 +109,17 @@ snippet try
 # For Loop (same as c.snippet)
 snippet for for (..) {..}
 	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4:/* code */}
+		${4}
 	}
 # Custom For Loop
 snippet forr
 	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
-		${5:/* code */}
+		${5}
 	}
 # If Condition
 snippet if
 	if (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}
 snippet el
 	else {
@@ -131,7 +131,7 @@ snippet t
 snippet fun
 	function ${1:function_name}(${2})${3}
 	{
-		${4:/* code */}
+		${4}
 	}
 # FlxSprite (usefull when using the flixel library)
 snippet FlxSprite
@@ -144,13 +144,13 @@ snippet FlxSprite
 			public function $1(${3: X:Number, Y:Number}):void
 			{
 				super(X,Y);
-				${4: //code...}
+				${4}
 			}
 
 			override public function update():void
 			{
 				super.update();
-				${5: //code...}
+				${5}
 			}
 		}
 	}
diff --git a/snippets/c.snippets b/snippets/c.snippets
index de6d6a933..85e7ac2b0 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -53,7 +53,7 @@ snippet once
 # if
 snippet if
 	if (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}${3}
 # else
 snippet el
@@ -63,7 +63,7 @@ snippet el
 # else if
 snippet elif
 	else if (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}${3}
 # ternary
 snippet t
@@ -94,22 +94,22 @@ snippet case
 # for
 snippet for
 	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4:/* code */}
+		${4}
 	}${5}
 # for (custom)
 snippet forr
 	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
-		${5:/* code */}
+		${5}
 	}${6}
 # while
 snippet wh
 	while (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}${3}
 # do... while
 snippet do
 	do {
-		${2:/* code */}
+		${2}
 	} while (${1:/* condition */});${3}
 ##
 ## Functions
@@ -117,7 +117,7 @@ snippet do
 snippet fun
 	${1:void} ${2:function_name}(${3})
 	{
-		${4:/* code */}
+		${4}
 	}${5}
 # function declaration
 snippet fund
diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index c3e19fe93..048671246 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -80,7 +80,7 @@ snippet cl
 # member function implementation
 snippet mfun
 	${4:void} ${1:`Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
-		${5:/* code */}
+		${5}
 	}
 # namespace
 snippet ns
@@ -100,13 +100,13 @@ snippet cin
 # for i 
 snippet fori
 	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4:/* code */}
+		${4}
 	}${5}
 
 # foreach
 snippet fore
 	for (${1:auto} ${2:i} : ${3:container}) {
-		${4:/* code */}
+		${4}
 	}${5}
 # iterator
 snippet iter
@@ -123,9 +123,9 @@ snippet itera
 ## Lambdas
 # lamda (one line)
 snippet ld
-	[${1}](${2}){${3:/* code */}}${4}
+	[${1}](${2}){${3}}${4}
 # lambda (multi-line)
 snippet lld
 	[${1}](${2}){
-		${3:/* code */}
+		${3}
 	}${4}
diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index 6f0b8ac5e..c7b56daf6 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -9,7 +9,7 @@ snippet so
 	${2}
 snippet main
 	static void main() {
-	  ${1:/* code */}
+	  ${1}
 	}
 snippet st
 	static ${1}
@@ -57,15 +57,15 @@ snippet for
 	}
 snippet fore
 	for (final ${2:item} in ${1:itemList}) {
-	  ${3:/* code */}
+	  ${3}
 	}
 snippet wh
 	while (${1:/* condition */}) {
-	  ${2:/* code */}
+	  ${2}
 	}
 snippet dowh
 	do {
-	  ${2:/* code */}
+	  ${2}
 	} while (${1:/* condition */});
 snippet as
 	assert(${1:/* condition */});
diff --git a/snippets/falcon.snippets b/snippets/falcon.snippets
index 85fb918dd..93aba1983 100644
--- a/snippets/falcon.snippets
+++ b/snippets/falcon.snippets
@@ -8,7 +8,7 @@ snippet imp
 # Function
 snippet fun
 	function ${2:function_name}(${3})	
-		${4:/* code */}
+		${4}
 	end	
 
 # Class
@@ -20,13 +20,13 @@ snippet class
 # If 
 snippet if
 	if ${1:condition}
-		${2:/* code */}		
+		${2}		
 	end
 
 # If else
 snippet ife
 	if ${1:condition}
-		${2:/* code */}		
+		${2}		
 	else
 	    ${1}	
 	end
@@ -34,7 +34,7 @@ snippet ife
 # If else if	
 snippet elif
 	elif ${1:condition}
-		${2:/* code */}	        
+		${2}	        
 
 # Switch case
 snippet switch
@@ -55,17 +55,17 @@ snippet select
 # For/in Loop
 snippet forin
 	for ${1:element} in ${2:container}
-		${3:/* code */}
+		${3}
 	end
 
 # For/to Loop
 snippet forto
 	for ${1:lowerbound} to ${2:upperbound}
-		${3:/* code */}
+		${3}
 	end
 
 # While Loop
 snippet while 
 	while ${1:conidition}
-		${2:/* code */}	
+		${2}	
 	end
diff --git a/snippets/go.snippets b/snippets/go.snippets
index c64db91f9..a88d8d069 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -16,7 +16,7 @@ snippet ch
 # case
 snippet cs
 	case ${1:value}:
-		${2:/* code */}
+		${2}
 # const
 snippet c
 	const ${1:NAME} = ${2:0}
@@ -36,7 +36,7 @@ snippet df
 snippet dfr
 	defer func() {
 		if err := recover(); err != nil {
-			${1:/* code */}
+			${1}
 		}
 	}()
 # gpl
@@ -78,7 +78,7 @@ snippet inf
 # if condition
 snippet if
 	if ${1:/* condition */} {
-		${2:/* code */}
+		${2}
 	}${2}
 # else snippet
 snippet el
@@ -109,7 +109,7 @@ snippet f6
 # if else
 snippet ie
 	if ${1:/* condition */} {
-		${2:/* code */}
+		${2}
 	} else {
 		${3}
 	}
@@ -117,25 +117,25 @@ snippet ie
 # for loop
 snippet fo
 	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
-		${4:/* code */}
+		${4}
 	}
 	${5}
 # for range loop
 snippet fr
 	for ${1:k}, ${2:v} := range ${3} {
-		${4:/* code */}
+		${4}
 	}
 	${5}
 # function simple 
 snippet fun
 	func ${1:funcName}(${2}) ${3:error} {
-		${4:/* code */}
+		${4}
 	}
 	${5}
 # function on receiver 
 snippet fum
 	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
-		${5:/* code */}
+		${5}
 	}
 	${6}
 # log printf
@@ -153,7 +153,7 @@ snippet mp
 # main()
 snippet main
 	func main() {
-		${1:/* code */}
+		${1}
 	}
 	${2}
 # new
@@ -178,11 +178,11 @@ snippet rs
 snippet sl
 	select {
 	case ${1:v1} := <-${2:chan1}
-		${3:/* code */}
+		${3}
 	case ${4:v2} := <-${5:chan2}
-		${6:/* code */}
+		${6}
 	default:
-		${7:/* code */}
+		${7}
 	}
 # string
 snippet sr
@@ -197,11 +197,11 @@ snippet st
 snippet sw
 	switch ${1:var} {
 	case ${2:value1}:
-		${3:/* code */}
+		${3}
 	case ${4:value2}:
-		${5:/* code */}
+		${5}
 	default:
-		${6:/* code */}
+		${6}
 	}
 snippet sp
 	fmt.Sprintf("%${1:s}", ${2:var})${3}
diff --git a/snippets/java.snippets b/snippets/java.snippets
index 854f14ac2..daf8928b7 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -171,7 +171,7 @@ snippet wh
 ## Main method
 snippet main
 	public static void main (String[] args) {
-		${1:/* code */}
+		${1}
 	}
 ##
 ## Print Methods
diff --git a/snippets/javascript-jquery.snippets b/snippets/javascript-jquery.snippets
index ce247a005..014c6158d 100644
--- a/snippets/javascript-jquery.snippets
+++ b/snippets/javascript-jquery.snippets
@@ -260,7 +260,7 @@ snippet filter
 	${1:obj}.filter('${2:selector expression}')${3}
 snippet filtert
 	${1:obj}.filter(function (${2:index}) {
-		${3:// test code}
+		${3}
 	})${4}
 snippet find
 	${1:obj}.find('${2:selector expression}')${3}
@@ -291,7 +291,7 @@ snippet getscript
 	});
 snippet grep
 	$.grep(${1:array}, function (item, index) {
-		${2:// test code}
+		${2}
 	}${3:, true});
 snippet hasc
 	${1:obj}.hasClass('${2:className}')${3}
diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index 801968fcd..e9dd58b94 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -17,7 +17,7 @@ snippet f
 # Immediate function
 snippet (f
 	(function (${1}) {
-		${3:/* code */}
+		${3}
 	}(${2}));
 # if
 snippet if
@@ -38,16 +38,16 @@ snippet ter
 snippet switch
 	switch (${1:expression}) {
 		case '${3:case}':
-			${4:// code}
+			${4}
 			break;
 		${5}
 		default:
-			${2:// code}
+			${2}
 	}
 # case
 snippet case
 	case '${1:case}':
-		${2:// code}
+		${2}
 		break;
 	${3}
 # for (...) {...}
@@ -63,19 +63,19 @@ snippet forr
 # while (...) {...}
 snippet wh
 	while (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}
 # try
 snippet try
 	try {
-		${1:/* code */}
+		${1}
 	} catch (${2:e}) {
 		${3:/* handle error */}
 	}
 # do...while
 snippet do
 	do {
-		${2:/* code */}
+		${2}
 	} while (${1:/* condition */});
 # Object Method
 snippet :f
@@ -124,10 +124,10 @@ snippet jsons
 # self-defining function
 snippet sdf
 	var ${1:function_name} = function (${2:argument}) {
-		${3:// initial code ...}
+		${3}
 
 		$1 = function ($2) {
-			${4:// main code}
+			${4}
 		};
 	};
 # singleton
@@ -150,7 +150,7 @@ snippet sing
 		// reset the constructor pointer
 		instance.constructor = $1;
 
-		${3:// code ...}
+		${3}
 
 		return instance;
 	}
diff --git a/snippets/make.snippets b/snippets/make.snippets
index 436481363..ba8e2b292 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -1,4 +1,4 @@
 snippet ifeq
 	ifeq (${1:cond0},${2:cond1})
-		${3:code}
+		${3}
 	endif
diff --git a/snippets/objc.snippets b/snippets/objc.snippets
index 85b80d9e6..3cf5a0a6d 100644
--- a/snippets/objc.snippets
+++ b/snippets/objc.snippets
@@ -207,7 +207,7 @@ snippet arel
 # autorelease pool
 snippet pool
 	NSAutoreleasePool *${1:pool} = [[NSAutoreleasePool alloc] init];
-	${2:/* code */}
+	${2}
 	[$1 drain];
 # Throw an exception
 snippet except
diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index 9cebedeac..ef83e0f5e 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -326,7 +326,7 @@ snippet tsub
 snippet trsub
 	test ${1:test_name} => { description => '${2:Description of test.}'} => sub {
 		my ($self) = @_;
-		${3:# test code}
+		${3}
 	};
 
 #prep test method
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 5ca502de8..97ec3e317 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -231,7 +231,7 @@ snippet class
 		 */
 		${5:public} function ${6:__construct}(${7:argument})
 		{
-			${8:// code...}
+			${8}
 		}
 	}
 snippet nc
@@ -249,26 +249,26 @@ snippet def?
 	${1}defined('${2}')${3}
 snippet wh
 	while (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	}
 # do ... while
 snippet do
 	do {
-		${2:// code... }
+		${2}
 	} while (${1:/* condition */});
 snippet if
 	if (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	}
 snippet ifil
 	<?php if (${1:/* condition */}): ?>
-		${2:<!-- code... -->}
+		${2}
 	<?php endif; ?>
 snippet ife
 	if (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	} else {
-		${3:// code...}
+		${3}
 	}
 	${4}
 snippet ifeil
@@ -280,33 +280,33 @@ snippet ifeil
 	${4}
 snippet else
 	else {
-		${1:// code...}
+		${1}
 	}
 snippet elseif
 	elseif (${1:/* condition */}) {
-		${2:// code...}
+		${2}
 	}
 snippet switch
 	switch ($${1:variable}) {
 		case '${2:value}':
-			${3:// code...}
+			${3}
 			break;
 		${5}
 		default:
-			${4:// code...}
+			${4}
 			break;
 	}
 snippet case
 	case '${1:value}':
-		${2:// code...}
+		${2}
 		break;${3}
 snippet for
 	for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4: // code...}
+		${4}
 	}
 snippet foreach
 	foreach ($${1:variable} as $${2:value}) {
-		${3:// code...}
+		${3}
 	}
 snippet foreachil
 	<?php foreach ($${1:variable} as $${2:value}): ?>
@@ -314,7 +314,7 @@ snippet foreachil
 	<?php endforeach; ?>
 snippet foreachk
 	foreach ($${1:variable} as $${2:key} => $${3:value}) {
-		${4:// code...}
+		${4}
 	}
 snippet foreachkil
 	<?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
diff --git a/snippets/processing.snippets b/snippets/processing.snippets
index b0aa93ced..27f3e005a 100755
--- a/snippets/processing.snippets
+++ b/snippets/processing.snippets
@@ -65,7 +65,7 @@ snippet for
 #loop while
 snippet while
 	while (${1:/* condition */}) {
-		${2:/* code */}
+		${2}
 	}
 #break
 snippet break
@@ -84,11 +84,11 @@ snippet default
 snippet switch
 	switch(${1:expression}) {
 		case '${3:case}':
-			${4:// code}
+			${4}
 			break;
 		${5}
 		default:
-			${2:// code}
+			${2}
 	}
 #try
 snippet try
diff --git a/snippets/python.snippets b/snippets/python.snippets
index 518d2d664..c29b340ef 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -15,16 +15,16 @@ snippet docs
 	"""
 snippet wh
 	while ${1:condition}:
-		${2:# TODO: write code...}
+		${2}
 # dowh - does the same as do...while in other languages
 snippet dowh
 	while True:
-		${1:# TODO: write code...}
+		${1}
 		if ${2:condition}:
 			break
 snippet with
 	with ${1:expr} as ${2:var}:
-		${3:# TODO: write code...}
+		${3}
 # New Class
 snippet cl
 	class ${1:ClassName}(${2:object}):
@@ -37,14 +37,14 @@ snippet cl
 snippet def
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
 		"""${3:docstring for $1}"""
-		${4:# TODO: write code...}
+		${4}
 snippet deff
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
-		${3:# TODO: write code...}
+		${3}
 # New Method
 snippet defs
 	def ${1:mname}(self, ${2:arg}):
-		${3:# TODO: write code...}
+		${3}
 # New Property
 snippet property
 	def ${1:foo}():
@@ -60,17 +60,17 @@ snippet property
 # Ifs
 snippet if
 	if ${1:condition}:
-		${2:# TODO: write code...}
+		${2}
 snippet el
 	else:
-		${1:# TODO: write code...}
+		${1}
 snippet ei
 	elif ${1:condition}:
-		${2:# TODO: write code...}
+		${2}
 # For
 snippet for
 	for ${1:item} in ${2:items}:
-		${3:# TODO: write code...}
+		${3}
 # Encodes
 snippet cutf8
 	# -*- coding: utf-8 -*-
@@ -85,32 +85,32 @@ snippet .
 	self.
 snippet try Try/Except
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 snippet try Try/Except/Else
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	else:
-		${5:# TODO: write code...}
+		${5}
 snippet try Try/Except/Finally
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	finally:
-		${5:# TODO: write code...}
+		${5}
 snippet try Try/Except/Else/Finally
 	try:
-		${1:# TODO: write code...}
+		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	else:
-		${5:# TODO: write code...}
+		${5}
 	finally:
-		${6:# TODO: write code...}
+		${6}
 # if __name__ == '__main__':
 snippet ifmain
 	if __name__ == '__main__':
@@ -136,13 +136,13 @@ snippet "
 # test function/method
 snippet test
 	def test_${1:description}(${2:`indent('.') ? 'self' : ''`}):
-		${3:# TODO: write code...}
+		${3}
 # test case
 snippet testcase
 	class ${1:ExampleCase}(unittest.TestCase):
 		
 		def test_${2:description}(self):
-			${3:# TODO: write code...}
+			${3}
 snippet fut
 	from __future__ import ${1}
 #getopt
diff --git a/snippets/r.snippets b/snippets/r.snippets
index 71186e35b..95079650f 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -12,24 +12,24 @@ snippet source
 # conditionals
 snippet if
 	if (${1:condition}) {
-		${2:code}
+		${2}
 	}
 snippet el
 	else {
-		${1:code}
+		${1}
 	}
 snippet ei
 	else if (${1:condition}) {
-		${2:code}
+		${2}
 	}
 
 # functions
 snippet fun
 	${1:name} = function (${2:variables}) {
-		${3:code}
+		${3}
 	}
 snippet ret
-	return(${1:code})
+	return(${1})
 
 # dataframes, lists, etc
 snippet df
diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index c342228a2..9a71ec2c9 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -7,61 +7,61 @@
 #if
 snippet if
 	if(${1:obj}) {
-		${2:/* code */}
+		${2}
 	}
 #if not
 snippet ifn
 	if(!${1:obj}) {
-		${2:/* code */}
+		${2}
 	}
 #if-else
 snippet ifel
 	if(${1:obj}) {
-		${2:/* code */}
+		${2}
 	} else {
-		${3:/* code */}
+		${3}
 	}
 #if-else-if
 snippet ifelif
 	if(${1:obj}) {
-		${2:/* code */}
+		${2}
 	} else if(${3:obj}) {
-		${4:/* code */}
+		${4}
 	}
 #while loop
 snippet while
 	while (${1:obj}) {
-		${2:/* code */}
+		${2}
 	}
 #for loop(classic)
 snippet for
 	for (${1:item} <- ${2:obj}) {
-		${3:/* code */}
+		${3}
 	}
 #for loop(indexed)
 snippet fori
 	for (${1:i} <- ${2:0} to ${3:obj}.length) {
-		${4:/* code */}
+		${4}
 	}
 #exceptions
 snippet try
 	try {
-		${1:/* code */}
+		${1}
 	} catch {
-		case e: FileNotFoundException => ${2:/* code */}
-		case e: IOException => ${3:/* code */}
+		case e: FileNotFoundException => ${2}
+		case e: IOException => ${3}
 	} finally {
-		${4:/* code */}
+		${4}
 	}
 #match
 snippet match
 	${1: obj} match {
-		case ${2:e} => ${3:/* code */}
-		case _ => ${4:/* code */}
+		case ${2:e} => ${3}
+		case _ => ${4}
 	}
 #case
 snippet case
-	case ${1:value} => ${2:/* code */}
+	case ${1:value} => ${2}
 ############################
 # methods and arguments
 #
@@ -82,9 +82,9 @@ snippet ovdef
 	override def ${1:name}(${2:arg}) = ${3:}
 #first class function(see scalabook p 188)
 snippet fcf
-	(${1:a}: ${2:T}) => $1 ${3:/* code */}
+	(${1:a}: ${2:T}) => $1 ${3}
 snippet =>
-	${1:name} => ${2:/* code */}
+	${1:name} => ${2}
 #recursion
 snippet rec
 	def ${1:name}(${2:arg}) =
@@ -196,11 +196,11 @@ snippet as
 
 #scope() with one arg
 snippet (a
-	(${1:a} => ${2:/* code */})
+	(${1:a} => ${2})
 #scope() with two args
 snippet {(
 	{(${1:a},${2:b}) =>
-		${3:/* code */}
+		${3}
 	}
 #filter
 snippet filter
@@ -220,10 +220,10 @@ snippet fldr
 #fold left operator(if u wanna reduce readability of ur code)
 #use wildcard symbols
 snippet /:
-	(${1:first}/:${2:name})(${3:/* code */})
+	(${1:first}/:${2:name})(${3})
 #fold right operator
 snippet :\
-	(${1:first}:\${2:name})(${3:/* code */})
+	(${1:first}:\${2:name})(${3})
 #reduce left
 snippet redl
 	${1:name}.reduceLeft[${2:T}] {(
@@ -258,13 +258,13 @@ snippet athis
 snippet abstract
 	abstract class ${1:name}${2:(arg)}${3: extends }${4: with} {
 		${5:override def toString = "$1"}
-		${6:/* code */}
+		${6}
 	}
 #class
 snippet class
 	class ${1:name}${2:(arg)}${3: extends }${4: with} {
 		${5:override def toString = "$1"}
-		${6:/* code */}
+		${6}
 	}
 #object
 snippet object
@@ -279,7 +279,7 @@ snippet ordered
 	class ${1:name}${2:(arg)} extends Ordered[$1] ${3: with} {
 		${4:override def toString = "$1"}
 		def compare(that: $1) = ${5:this - that}
-		${6:/* code */}
+		${6}
 	}
 #case class
 snippet casecl
diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index 329d1e9f2..728c40208 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -10,7 +10,7 @@ snippet guard
 	let $1 = 1${3}
 snippet f
 	fun! ${1:`expand('%') =~ 'autoload' ? substitute(matchstr(expand('%:p'),'autoload/\zs.*\ze.vim'),'[/\\]','#','g').'#' : ''`}${2:function_name}(${3})
-		${4:" code}
+		${4}
 	endf
 snippet t
 	try
@@ -20,15 +20,15 @@ snippet t
 	endtry
 snippet for
 	for ${1:needle} in ${2:haystack}
-		${3:" code}
+		${3}
 	endfor
 snippet wh
 	while ${1:condition}
-		${2:" code}
+		${2}
 	endw
 snippet if
 	if ${1:condition}
-		${2:" code}
+		${2}
 	endif
 snippet ife
 	if ${1:condition}

From 5da33b7a01b11cf58053fc5f89361776deb2a8e2 Mon Sep 17 00:00:00 2001
From: Michael Thessel <michael@gt.net>
Date: Thu, 20 Jun 2013 14:39:31 -0700
Subject: [PATCH 0108/1587] Removed unnecessary whitespace from the end of the
 line

---
 snippets/_.snippets            |  68 +++++++++----------
 snippets/actionscript.snippets |   8 +--
 snippets/apache.snippets       |   2 +-
 snippets/c.snippets            |   4 +-
 snippets/chef.snippets         |   6 +-
 snippets/clojure.snippets      |   2 +-
 snippets/cmake.snippets        |   6 +-
 snippets/cpp.snippets          |   6 +-
 snippets/cs.snippets           |  14 ++--
 snippets/django.snippets       |  12 ++--
 snippets/erlang.snippets       |   8 +--
 snippets/falcon.snippets       |  26 ++++----
 snippets/go.snippets           |  32 ++++-----
 snippets/haskell.snippets      |   2 +-
 snippets/htmltornado.snippets  |   2 +-
 snippets/java.snippets         |   2 +-
 snippets/javascript.snippets   |  10 +--
 snippets/markdown.snippets     |   4 +-
 snippets/progress.snippets     |   2 +-
 snippets/puppet.snippets       |   8 +--
 snippets/python.snippets       |   4 +-
 snippets/r.snippets            |   2 +-
 snippets/rst.snippets          |   8 +--
 snippets/sh.snippets           |  12 ++--
 snippets/tcl.snippets          |   2 +-
 snippets/textile.snippets      |   2 +-
 snippets/xslt.snippets         |   8 +--
 snippets/yii-chtml.snippets    | 118 ++++++++++++++++-----------------
 snippets/yii.snippets          |  82 +++++++++++------------
 29 files changed, 231 insertions(+), 231 deletions(-)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index c72974801..6204aee5d 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -16,17 +16,17 @@ snippet lorem
 snippet GPL2
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation; either version 2 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, see <http://www.gnu.org/licenses/>.
 
@@ -34,17 +34,17 @@ snippet GPL2
 snippet LGPL2
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	This library is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as published
 	by the Free Software Foundation; either version 2.1 of the License, or
 	(at your option) any later version.
-	
+
 	This library is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU Lesser General Public License for more details.
-	
+
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
 
@@ -52,35 +52,35 @@ snippet LGPL2
 snippet GPL3
 	${1:one line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-	
+
 	${3}
 snippet LGPL3
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	This library is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as published
 	by the Free Software Foundation; either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This library is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 	GNU Lesser General Public License for more details.
-	
+
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
 
@@ -89,7 +89,7 @@ snippet BSD2
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 	1. Redistributions of source code must retain the above copyright
@@ -97,7 +97,7 @@ snippet BSD2
 	2. Redistributions in binary form must reproduce the above copyright
 	notice, this list of conditions and the following disclaimer in the
 	documentation and/or other materials provided with the distribution.
-	
+
 	THIS SOFTWARE IS PROVIDED BY $2 ''AS IS'' AND ANY
 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -108,9 +108,9 @@ snippet BSD2
 	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	
-	
-	The views and conclusions contained in the software and documentation 
+
+
+	The views and conclusions contained in the software and documentation
 	are those of the authors and should not be interpreted as representing
 	official policies, either expressedor implied, of $2.
 
@@ -119,7 +119,7 @@ snippet BSD3
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 	1. Redistributions of source code must retain the above copyright
@@ -130,7 +130,7 @@ snippet BSD3
 	3. Neither the name of the ${3:organization} nor the
 	names of its contributors may be used to endorse or promote products
 	derived from this software without specific prior written permission.
-	
+
 	THIS SOFTWARE IS PROVIDED BY $2 ''AS IS'' AND ANY
 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -147,7 +147,7 @@ snippet BSD4
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
 	All rights reserved.
-	
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 	1. Redistributions of source code must retain the above copyright
@@ -161,7 +161,7 @@ snippet BSD4
 	4. Neither the name of the $3 nor the
 	names of its contributors may be used to endorse or promote products
 	derived from this software without specific prior written permission.
-	
+
 	THIS SOFTWARE IS PROVIDED BY $2 ''AS IS'' AND ANY
 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -177,17 +177,17 @@ snippet BSD4
 snippet MIT
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
-	
+
 	Permission is hereby granted, free of charge, to any person obtaining
 	a copy of this software and associated documentation files (the "Software"),
 	to deal in the Software without restriction, including without limitation
 	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-	and/or sell copies of the Software, and to permit persons to whom the 
+	and/or sell copies of the Software, and to permit persons to whom the
 	Software is furnished to do so, subject to the following conditions:
-	
+
 	The above copyright notice and this permission notice shall be included
 	in all copies or substantial portions of the Software.
-	
+
 	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 	OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -200,13 +200,13 @@ snippet MIT
 snippet APACHE
 	${1:one line to give the program's name and a brief description}
 	Copyright `strftime("%Y")` ${2:copyright holder}
-	
+
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
 	You may obtain a copy of the License at
-	
+
 		http://www.apache.org/licenses/LICENSE-2.0
-	
+
 	Unless required by applicable law or agreed to in writing, software
 	distributed under the License is distributed on an "AS IS" BASIS,
 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -214,14 +214,14 @@ snippet APACHE
 	limitations under the License.
 
 	${3}
-snippet BEERWARE 
+snippet BEERWARE
 	${2:one line to give the program's name and a brief description}
 	Copyright `strftime("%Y")` ${3:copyright holder}
-	
+
 	Licensed under the "THE BEER-WARE LICENSE" (Revision 42):
 	${1:`g:snips_author`} wrote this file. As long as you retain this notice you
 	can do whatever you want with this stuff. If we meet some day, and you think
-	this stuff is worth it, you can buy me a beer or coffee in return 
+	this stuff is worth it, you can buy me a beer or coffee in return
 
 	${4}
 
diff --git a/snippets/actionscript.snippets b/snippets/actionscript.snippets
index cd2ab0ebd..5385d115d 100644
--- a/snippets/actionscript.snippets
+++ b/snippets/actionscript.snippets
@@ -2,22 +2,22 @@ snippet main
 	package {
 		import flash.display.*;
 		import flash.Events.*;
-	
+
 		public class Main extends Sprite {
 			public function Main (	) {
 				trace("start");
 				stage.scaleMode = StageScaleMode.NO_SCALE;
 				stage.addEventListener(Event.RESIZE, resizeListener);
 			}
-	
+
 			private function resizeListener (e:Event):void {
 				trace("The application window changed size!");
 				trace("New width:  " + stage.stageWidth);
 				trace("New height: " + stage.stageHeight);
 			}
-	
+
 		}
-	
+
 	}
 snippet class
 	${1:public|internal} class ${2:name} ${3:extends } {
diff --git a/snippets/apache.snippets b/snippets/apache.snippets
index a9e53e197..6f0c8873f 100644
--- a/snippets/apache.snippets
+++ b/snippets/apache.snippets
@@ -6,7 +6,7 @@ snippet dir
 		Order Deny,Allow
 		Deny from All
 	</Directory>
-# <FilesMatch>   
+# <FilesMatch>
 snippet filesmatch
 	<FilesMatch "${1:regex}">
 		${2}
diff --git a/snippets/c.snippets b/snippets/c.snippets
index 85e7ac2b0..21c265d68 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -14,7 +14,7 @@ snippet mainn
 		return 0;
 	}
 ##
-## Preprocessor 
+## Preprocessor
 # #include <...>
 snippet inc
 	#include <${1:stdio}.h>${2}
@@ -230,5 +230,5 @@ snippet gpl
 	 *
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
-	
+
 	${2}
diff --git a/snippets/chef.snippets b/snippets/chef.snippets
index 51036135a..d44f535ec 100644
--- a/snippets/chef.snippets
+++ b/snippets/chef.snippets
@@ -141,7 +141,7 @@ snippet svn
 		${12:#}svn_username ${13} # (Subversion only) Username for Subversion operations
 		${14:#}svn_password ${15} # (Subversion only) Password for Subversion operations
 		${16:#}svn_arguments ${17} # (Subversion only) Extra arguments passed to the subversion command
-		
+
 		${18:#}${19:action :sync} # Update the source to the specified revision, or get a new checkout (Default)
 		${20:#}${21:action :checkout} # Checkout the source. Does nothing if a checkout is available
 		${22:#}${23:action :export} # Export the source, excluding or removing any version control artifacts
@@ -159,7 +159,7 @@ snippet git
 		${14:#}enable_submodules ${15:"false"} # (Git only) performs a submodule init and submodule update
 		${16:#}remote ${17:"origin"} # (Git only) remote repository to use for syncing an existing clone
 		${18:#}ssh_wrapper ${19} # (Git only) path to a wrapper script for running SSH with git. GIT_SSH environment variable is set to this.
-		
+
 		${20:#}${21:action :sync} # Update the source to the specified revision, or get a new clone (Default)
 		${22:#}${23:action :checkout} # Clone the source. Does nothing if a checkout is available
 		${24:#}${25:action :export} # Export the source, excluding or removing any version control artifacts
@@ -197,7 +197,7 @@ snippet deploy
 		${54:#}before_symlink ${55:"deploy/before_symlink.rb"} # A block or path to a file containing chef code to run before symlinking
 		${56:#}before_restart ${57:"deploy/before_restart.rb"} # A block or path to a file containing chef code to run before restarting
 		${58:#}after_restart ${59:"deploy/after_restart.rb"} # A block or path to a file containing chef code to run after restarting
-		
+
 		${60:#}${61::deploy} # Deploy the application (Default)
 		${62:#}${63::force_deploy} # For the revision deploy strategy, this removes any existing release of the same code version and re-deploys in its place
 		${64:#}${65::rollback} # Rollback the application to the previous release
diff --git a/snippets/clojure.snippets b/snippets/clojure.snippets
index e247debf6..59867b755 100644
--- a/snippets/clojure.snippets
+++ b/snippets/clojure.snippets
@@ -43,7 +43,7 @@ snippet if
 	(if ${1:test-expr}
 	  ${2:then-expr}
 	  ${3:else-expr})
-snippet if-let 
+snippet if-let
 	(if-let [${1:result} ${2:test-expr}]
 		(${3:then-expr} $1)
 		(${4:else-expr}))
diff --git a/snippets/cmake.snippets b/snippets/cmake.snippets
index 26aa9ac9d..0c3a21576 100644
--- a/snippets/cmake.snippets
+++ b/snippets/cmake.snippets
@@ -39,7 +39,7 @@ snippet link
 	TARGET_LINK_LIBRARIES(${1:bin}
 		${2:somelib}
 	)
-	
+
 snippet bin
 	ADD_EXECUTABLE(${1:bin})
 
@@ -52,7 +52,7 @@ snippet dep
 	)
 
 snippet props
-	SET_TARGET_PROPERTIES(${1:target} 
-		${2:PROPERTIES} ${3:COMPILE_FLAGS} 
+	SET_TARGET_PROPERTIES(${1:target}
+		${2:PROPERTIES} ${3:COMPILE_FLAGS}
 		${4:"-O3 -Wall -pedantic"}
 	)
diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 048671246..52148e786 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -64,11 +64,11 @@ snippet fr
 # mutable
 snippet mu
 	mutable
-## 
+##
 ## Class
 # class
 snippet cl
-	class ${1:`Filename('$1', 'name')`} 
+	class ${1:`Filename('$1', 'name')`}
 	{
 	public:
 		$1(${2});
@@ -97,7 +97,7 @@ snippet cin
 	std::cin >> ${1};${2}
 ##
 ## Iteration
-# for i 
+# for i
 snippet fori
 	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
 		${4}
diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 725f8b7d3..d93435141 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -1,12 +1,12 @@
 # cs.snippets
 # ===========
-# 
+#
 # Standard C-Sharp snippets for snipmate.
 #
 # Largely ported over from Visual Studio 2010 snippets plus
 # a few snippets from Resharper plus a few widely known snippets.
 #
-# Most snippets on elements (i.e. classes, properties) 
+# Most snippets on elements (i.e. classes, properties)
 # follow suffix conventions. The order of suffixes to a snippet
 # is fixed.
 #
@@ -55,13 +55,13 @@
 # * Events
 #
 # Feedback is welcome!
-# 
+#
 # entry point
 snippet sim
 	public static int Main(string[] args) {
 		${1}
 		return 0;
-	} 
+	}
 snippet simc
 	public class Application {
 		public static int Main(string[] args) {
@@ -73,13 +73,13 @@ snippet simc
 snippet if
 	if (${1}) {
 		${2}
-	} 
+	}
 snippet el
 	else {
 		${1}
-	} 
+	}
 snippet ifs
-	if (${1}) 
+	if (${1})
 		${2}
 # ternary conditional
 snippet t
diff --git a/snippets/django.snippets b/snippets/django.snippets
index 8296cce25..5c72b2b9e 100644
--- a/snippets/django.snippets
+++ b/snippets/django.snippets
@@ -73,16 +73,16 @@ snippet model
 	class ${1:ModelName}(models.Model):
 		"""${2:docstring}"""
 		${3}
-		
+
 		class Meta:
 			${4}
-		
+
 		def __unicode__(self):
 			${5}
-		
+
 		def save(self, force_insert=False, force_update=False):
 			${6}
-		
+
 		@models.permalink
 		def get_absolute_url(self):
 			return ('${7:view_or_url_name}' ${8})
@@ -90,9 +90,9 @@ snippet model
 snippet modeladmin
 	class ${1:ModelName}Admin(admin.ModelAdmin):
 		${2}
-	
+
 	admin.site.register($1, $1Admin)
-	
+
 snippet tabularinline
 	class ${1:ModelName}Inline(admin.TabularInline):
 		model = $1
diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index acc6fd195..1199e8443 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -1,12 +1,12 @@
 # module and export all
 snippet mod
 	-module(${1:`Filename('', 'my')`}).
-	
+
 	-compile([export_all]).
-	
+
 	start() ->
 	    ${2}
-	
+
 	stop() ->
 	    ok.
 # define directive
@@ -81,7 +81,7 @@ snippet application
 	    end.
 
 	stop(_State) ->
-	    ok.	
+	    ok.
 # OTP supervisor
 snippet supervisor
 	-module(${1:`Filename('', 'my')`}).
diff --git a/snippets/falcon.snippets b/snippets/falcon.snippets
index 93aba1983..3fe4caca7 100644
--- a/snippets/falcon.snippets
+++ b/snippets/falcon.snippets
@@ -1,15 +1,15 @@
 snippet #!
 	#!/usr/bin/env falcon
 
-# Import	
+# Import
 snippet imp
 	import ${1:module}
 
 # Function
 snippet fun
-	function ${2:function_name}(${3})	
+	function ${2:function_name}(${3})
 		${4}
-	end	
+	end
 
 # Class
 snippet class
@@ -17,35 +17,35 @@ snippet class
 		${3:/* members/methods */}
 	end
 
-# If 
+# If
 snippet if
 	if ${1:condition}
-		${2}		
+		${2}
 	end
 
 # If else
 snippet ife
 	if ${1:condition}
-		${2}		
+		${2}
 	else
-	    ${1}	
+	    ${1}
 	end
 
-# If else if	
+# If else if
 snippet elif
 	elif ${1:condition}
-		${2}	        
+		${2}
 
 # Switch case
 snippet switch
 	switch ${1:expression}
 		case ${2:item}
 		case ${3:item}
-		default 
+		default
 	end
 
 # Select
-snippet select 
+snippet select
 	select ${1:variable}
 		case ${2:TypeSpec}
 		case ${3:TypeSpec}
@@ -65,7 +65,7 @@ snippet forto
 	end
 
 # While Loop
-snippet while 
+snippet while
 	while ${1:conidition}
-		${2}	
+		${2}
 	end
diff --git a/snippets/go.snippets b/snippets/go.snippets
index a88d8d069..1d7d4f595 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -4,7 +4,7 @@ snippet ap
 # bool
 snippet bl
 	bool
-# byte 
+# byte
 snippet bt
 	byte
 # break
@@ -29,7 +29,7 @@ snippet co
 # continue
 snippet cn
 	continue
-# defer 
+# defer
 snippet df
 	defer ${1:func}()
 # defer recover
@@ -57,20 +57,20 @@ snippet gpl
 	 *
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
-	
+
 	${2}
 # int
 snippet i
 	int
-# import 
+# import
 snippet im
 	import (
-		"${1:package}" 
+		"${1:package}"
 	)${2}
-# interface 
+# interface
 snippet in
 	interface{}
-# full interface snippet 
+# full interface snippet
 snippet inf
 	interface ${1:name} {
 		${2:/* methods */}
@@ -126,13 +126,13 @@ snippet fr
 		${4}
 	}
 	${5}
-# function simple 
+# function simple
 snippet fun
 	func ${1:funcName}(${2}) ${3:error} {
 		${4}
 	}
 	${5}
-# function on receiver 
+# function on receiver
 snippet fum
 	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
 		${5}
@@ -147,7 +147,7 @@ snippet lp
 # make
 snippet mk
 	make(${1:[]string}, ${2:0})
-# map 
+# map
 snippet mp
 	map[${1:string}]${2:int}
 # main()
@@ -159,19 +159,19 @@ snippet main
 # new
 snippet nw
 	new(${1:type})
-# panic 
+# panic
 snippet pn
 	panic("${1:msg}")
 # print
 snippet pr
 	fmt.Printf("%${1:s}\n", ${2:var})${3}
-# range 
+# range
 snippet rn
 	range ${1}
-# return 
+# return
 snippet rt
 	return ${1}
-# result 
+# result
 snippet rs
 	result
 # select
@@ -193,7 +193,7 @@ snippet st
 		${2:/* data */}
 	}
 	${3}
-# switch 
+# switch
 snippet sw
 	switch ${1:var} {
 	case ${2:value1}:
@@ -205,7 +205,7 @@ snippet sw
 	}
 snippet sp
 	fmt.Sprintf("%${1:s}", ${2:var})${3}
-# true 
+# true
 snippet t
 	true
 # variable declaration
diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index bcda8a5b4..3857d8b4e 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -48,7 +48,7 @@ snippet ap
 	${1:map} ${2:fn} ${3:list}
 snippet do
 	do
-		
+
 snippet λ
 	\${1:x} -> ${2}
 snippet \
diff --git a/snippets/htmltornado.snippets b/snippets/htmltornado.snippets
index de9915363..9685b1f93 100644
--- a/snippets/htmltornado.snippets
+++ b/snippets/htmltornado.snippets
@@ -28,7 +28,7 @@ snippet if
 	  ${2}
 	{% end %}
 snippet elif
-	{% elif ${1:condition} %} 
+	{% elif ${1:condition} %}
 snippet else
 	{% else %}
 snippet import
diff --git a/snippets/java.snippets b/snippets/java.snippets
index daf8928b7..c34010c5b 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -47,7 +47,7 @@ snippet tc
 ##
 ## Class Enhancements
 snippet ext
-	extends 
+	extends
 snippet imp
 	implements
 ##
diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index e9dd58b94..fedb943df 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -140,7 +140,7 @@ snippet sing
 		$1 = function $1($2) {
 			return instance;
 		};
-		
+
 		// carry over the prototype properties
 		$1.prototype = this;
 
@@ -154,7 +154,7 @@ snippet sing
 
 		return instance;
 	}
-# Crockford's object function 
+# Crockford's object function
 snippet obj
 	function object(o) {
 		function F() {}
@@ -164,7 +164,7 @@ snippet obj
 # Define multiple properties
 snippet props
 	var ${1:my_object} = Object.defineProperties(
-		${2:new Object()}, 
+		${2:new Object()},
 		{
 			${3:property} : {
 				get : function $1_$3_getter() {
@@ -182,9 +182,9 @@ snippet props
 	);
 # Define single property
 snippet prop
-	Object.defineProperty( 
+	Object.defineProperty(
 		${1:object},
-		"${2:property}", 
+		"${2:property}",
 		{
 			get : function $1_$2_getter() {
 				// getter code
diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index e4efd3c2d..9788959f6 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -24,11 +24,11 @@ snippet ![:*
 
 snippet ===
 	`repeat('=', strlen(getline(line(".") - 1)))`
-	
+
 	${1}
 snippet ---
 	`repeat('-', strlen(getline(line(".") - 1)))`
-	
+
 	${1}
 
 snippet blockquote
diff --git a/snippets/progress.snippets b/snippets/progress.snippets
index 0e6d47bb9..0f1f436d3 100644
--- a/snippets/progress.snippets
+++ b/snippets/progress.snippets
@@ -55,4 +55,4 @@ snippet log
 snippet dec
 	DECIMAL
 snippet sep
-	/* ------------------------------------------------------------------------- */ 
+	/* ------------------------------------------------------------------------- */
diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index f3499321e..29fe6b37e 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -1,6 +1,6 @@
 # Snippets for use with VIM and http://www.vim.org/scripts/script.php?script_id=2540
 #
-# Please contact R.I.Pienaar <rip@devco.net> for additions and feedback, 
+# Please contact R.I.Pienaar <rip@devco.net> for additions and feedback,
 # see it in action @ http://www.devco.net/archives/2009/09/22/vim_and_puppet.php
 
 # Language Constructs
@@ -25,7 +25,7 @@ snippet ife
 snippet if
 	if $${1:variable} {
 		${2}
-	} 
+	}
 snippet else
 	else {
 		${1}
@@ -34,7 +34,7 @@ snippet ?
 	? {
 		'${1}'	=> ${2}
 	  }
-# 
+#
 # blocks etc and general syntax sugar
 snippet [
 	[ ${1} ]${2}
@@ -54,7 +54,7 @@ snippet defined
 	defined(${1:Resource}["${2:name}"])${3}
 snippet emerg
 	emerg("${1:message}")${2}
-snippet extlookup Simple extlookup 
+snippet extlookup Simple extlookup
 	extlookup("${1:variable}")${2}
 snippet extlookup Extlookup with defaults
 	extlookup("${1:variable}", "${2:default}")${3}
diff --git a/snippets/python.snippets b/snippets/python.snippets
index c29b340ef..fcce99fec 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -140,7 +140,7 @@ snippet test
 # test case
 snippet testcase
 	class ${1:ExampleCase}(unittest.TestCase):
-		
+
 		def test_${2:description}(self):
 			${3}
 snippet fut
@@ -151,7 +151,7 @@ snippet getopt
 		# Short option syntax: "hv:"
 		# Long option syntax: "help" or "verbose="
 		opts, args = getopt.getopt(sys.argv[1:], "${1:short_options}", [${2:long_options}])
-	
+
 	except getopt.GetoptError, err:
 		# Print debug info
 		print str(err)
diff --git a/snippets/r.snippets b/snippets/r.snippets
index 95079650f..2436f56ed 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -117,5 +117,5 @@ snippet cor
 	cor.test(${1:x}, ${2:y})
 snippet fte
 	var.test(${1:x}, ${2:y})
-snippet kvt 
+snippet kvt
 	kv.test(${1:x}, ${2:y})
diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index d97fa5738..6cb799228 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -30,7 +30,7 @@ snippet cont:
 		${1:content}
 snippet code:
 	.. code:: ${1:type}
-		
+
 		${2:write some code}
 snippet tip:
 	.. tip::
@@ -59,11 +59,11 @@ snippet cau:
 #Spinx only
 snippet sid:
 	.. sidebar:: ${1:Title}
-		
-		${2}	
+
+		${2}
 # CJK optimize, CJK has no space between charaters
 snippet *c
-	\ *${1:Emphasis}*\ ${2} 
+	\ *${1:Emphasis}*\ ${2}
 snippet **c
 	\ **${1:Strong emphasis}**\ ${2}
 
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index b07362081..83e78482d 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -1,7 +1,7 @@
 # Shebang. Executing bash via /usr/bin/env makes scripts more portable.
 snippet #!
 	#!/usr/bin/env bash
-	
+
 snippet if
 	if [[ ${1:condition} ]]; then
 		${2:#statements}
@@ -30,9 +30,9 @@ snippet case
 		${2:pattern})
 			${3};;
 	esac
-snippet go 
-	while getopts '${1:o}' ${2:opts} 
-	do 
+snippet go
+	while getopts '${1:o}' ${2:opts}
+	do
 		case $$2 in
 		${3:o0})
 			${4:#staments};;
@@ -53,9 +53,9 @@ snippet getopt
 	{
 			cat <<- EOT
 
-	  Usage :  $${0:0} [options] [--] 
+	  Usage :  $${0:0} [options] [--]
 
-	  Options: 
+	  Options:
 	  -h|help       Display this message
 	  -v|version    Display script version
 
diff --git a/snippets/tcl.snippets b/snippets/tcl.snippets
index 1fe1cb960..4d456de07 100644
--- a/snippets/tcl.snippets
+++ b/snippets/tcl.snippets
@@ -1,7 +1,7 @@
 # #!/usr/bin/env tclsh
 snippet #!
 	#!/usr/bin/env tclsh
-	
+
 # Process
 snippet pro
 	proc ${1:function_name} {${2:args}} {
diff --git a/snippets/textile.snippets b/snippets/textile.snippets
index c78d6ec81..9ad97be5b 100644
--- a/snippets/textile.snippets
+++ b/snippets/textile.snippets
@@ -27,4 +27,4 @@ snippet fn
 	[${1:ref number}] ${3}
 
 	fn$1. ${2:footnote}
-	
+
diff --git a/snippets/xslt.snippets b/snippets/xslt.snippets
index e7abdf3fc..6e25fd594 100644
--- a/snippets/xslt.snippets
+++ b/snippets/xslt.snippets
@@ -50,7 +50,7 @@ snippet import
 
 snippet include
 	<xsl:include href="${1:stylesheet}" />${2}
-	
+
 snippet otherwise
 	<xsl:otherwise>${1}
 	</xsl:otherwise>
@@ -64,7 +64,7 @@ snippet stylesheet
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">${1}
 	</xsl:stylesheet>
 
-snippet template 
+snippet template
 	<xsl:template match="${1:*}">${3}
 	</xsl:template>
 
@@ -91,7 +91,7 @@ snippet when
 
 snippet with-param
 	<xsl:with-param name="${1:name}">${2}</xsl:with-param>
-	
+
 snippet with-param select
 	<xsl:with-param name="${1:name}" select="${2:*}" />
-	
+
diff --git a/snippets/yii-chtml.snippets b/snippets/yii-chtml.snippets
index 91c65b923..df5d5eb73 100644
--- a/snippets/yii-chtml.snippets
+++ b/snippets/yii-chtml.snippets
@@ -1,59 +1,59 @@
 #--------------------Yii CHtml---------------------------------
 #Yii CHtml::radioButton
 snippet yhrb
-	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${4:optionValue} ); 
+	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${4:optionValue} );
 
 #Yii CHtml::asset
 snippet yhass
-	echo CHtml::asset('${1:path}'); 
+	echo CHtml::asset('${1:path}');
 
 #Yii CHtml::activeLabelEx
 snippet yhale
-	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::encodeArray
 snippet yheca
-	echo CHtml::encodeArray(array(${1})); 
+	echo CHtml::encodeArray(array(${1}));
 
 #Yii CHtml::normalizeUrl
 snippet yhnurl
-	echo CHtml::normalizeUrl(array('${1}')); 
+	echo CHtml::normalizeUrl(array('${1}'));
 
 #Yii CHtml::resetButton
 snippet yhsb
-	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::linkButton
 snippet yhlinkb
-	echo CHtml::linkButton('${1:lable}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::linkButton('${1:lable}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::activeTextArea
 snippet yhata
-	echo CHtml::activeTextArea(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeTextArea(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::ajaxButton
 snippet yhajb
-	echo CHtml::ajaxButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::ajaxButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::activeId
 snippet yhai
-	echo CHtml::activeId(${1:model}, '${2:attribute}'); 
+	echo CHtml::activeId(${1:model}, '${2:attribute}');
 
 #Yii CHtml::activeCheckBox
 snippet yhacb
-	echo CHtml::activeCheckBox(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeCheckBox(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeHiddenField
 snippet yhahf
-	echo CHtml::activeHiddenField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeHiddenField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::encode
 snippet yhec
-	echo CHtml::encode(${1:text}); 
+	echo CHtml::encode(${1:text});
 
 #Yii CHtml::metaTag
 snippet yhmtag
-	echo CHtml::metaTag('${1:content}', '${2:name}', '${3:httpEquiv}',array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::metaTag('${1:content}', '${2:name}', '${3:httpEquiv}',array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::dropDownList
 snippet yhddl
@@ -61,167 +61,167 @@ snippet yhddl
 
 #Yii CHtml::listBox
 snippet yhlb
-	echo CHtml::listBox('${1:name}', '${2:select}',array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::listBox('${1:name}', '${2:select}',array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::script
 snippet yhjs
-	echo CHtml::script('${1:test}'); 
+	echo CHtml::script('${1:test}');
 
 #Yii CHtml::ajax
 snippet yhaj
-	echo CHtml::ajax(array(${1})); 
+	echo CHtml::ajax(array(${1}));
 
 #Yii CHtml::textField
 snippet yhtf
-	echo CHtml::textField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::textField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activePasswordField
 snippet yhapf
-	echo CHtml::activePasswordField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activePasswordField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::listData
 snippet yhld
-	echo CHtml::listData(array(${1}),'${2:valueField}', '${3:textField}','${4:groupField}'); 
+	echo CHtml::listData(array(${1}),'${2:valueField}', '${3:textField}','${4:groupField}');
 
 #Yii CHtml::mailto
 snippet yhmt
-	echo CHtml::mailto('${1:text}', '${2:email}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::mailto('${1:text}', '${2:email}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::image
 snippet yhimg
-	echo CHtml::image('${1:src}', '${2:alt}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::image('${1:src}', '${2:alt}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeListBox
 snippet yhalb
-	echo CHtml::activeListBox(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeListBox(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::activeFileField
 snippet yhaff
-	echo CHtml::activeFileField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeFileField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::closeTag
 snippet yhct
-	echo CHtml::closeTag('${1:tag}'); 
+	echo CHtml::closeTag('${1:tag}');
 
 #Yii CHtml::activeInputField
 snippet yhaif
-	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::scriptFile
 snippet yhjsf
-	echo CHtml::scriptFile('${1:url}'); 
+	echo CHtml::scriptFile('${1:url}');
 
 #Yii CHtml::radioButtonList
 snippet yhrbl
-	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::cssFile
 snippet yhcssf
-	echo CHtml::cssFile('${1:url}','${2:media}'); 
+	echo CHtml::cssFile('${1:url}','${2:media}');
 
 #Yii CHtml::error
 snippet yherr
-	echo CHtml::error(${1:model}, '${2:attribute}'); 
+	echo CHtml::error(${1:model}, '${2:attribute}');
 
 #Yii CHtml::passwordField
 snippet yhpf
-	echo CHtml::passwordField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::passwordField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::hiddenField
 snippet yhhf
-	echo CHtml::hiddenField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::hiddenField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::cdata
 snippet yhc
-	echo CHtml::cdata(${1:text}); 
+	echo CHtml::cdata(${1:text});
 
 #Yii CHtml::link
 snippet yhlink
-	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::errorSummary
 snippet yherrs
-	echo CHtml::errorSummary(${1:model},'${2:headerHtml}','${3:footerHtml}'); 
+	echo CHtml::errorSummary(${1:model},'${2:headerHtml}','${3:footerHtml}');
 
 #Yii CHtml::tag
 snippet yht
-	echo CHtml::tag('${1:tag}',array('${2:optionName}'=>${3:optionValue}),${4:false},${5:true}); 
+	echo CHtml::tag('${1:tag}',array('${2:optionName}'=>${3:optionValue}),${4:false},${5:true});
 
 #Yii CHtml::ajaxLink
 snippet yhajl
-	echo CHtml::ajaxLink('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::ajaxLink('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::label
 snippet yhlabel
-	echo CHtml::label('${1:label}', '${2:for}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::label('${1:label}', '${2:for}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeName
 snippet yhan
-	echo CHtml::activeName(${1:model}, '${2:attribute}'); 
+	echo CHtml::activeName(${1:model}, '${2:attribute}');
 
 #Yii CHtml::statefulForm
 snippet yhsform
-	echo CHtml::statefulForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::statefulForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::fileField
 snippet yhff
-	echo CHtml::fileField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::fileField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeTextField
 snippet yhatf
-	echo CHtml::activeTextField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeTextField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::css
 snippet yhcss
-	echo CHtml::css('${1:test}','${2:media}'); 
+	echo CHtml::css('${1:test}','${2:media}');
 
 #Yii CHtml::imageButton
 snippet yhimgb
-	echo CHtml::imageButton('${1:src}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::imageButton('${1:src}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::ajaxSubmitButton
 snippet yhajsb
-	echo CHtml::ajaxSubmitButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::ajaxSubmitButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::button
 snippet yhb
-	echo CHtml::button('${1:label}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::button('${1:label}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::listOptions
 snippet yhlo
-	echo CHtml::listOptions('${1:selection}', array(${2}), array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::listOptions('${1:selection}', array(${2}), array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeCheckBoxList
 snippet yhacbl
-	echo CHtml::activeCheckBoxList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeCheckBoxList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::openTag
 snippet yhot
-	echo CHtml::openTag('${1:tag}', array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::openTag('${1:tag}', array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::checkBox
 snippet yhcb
-	echo CHtml::checkBox('${1:name}', ${2:false}, array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::checkBox('${1:name}', ${2:false}, array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::textArea
 snippet yhta
-	echo CHtml::textArea('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::textArea('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::linkTag
 snippet yhlinkt
-	echo CHtml::linkTag('${1:relation}', '${2:type}', '${3:href}', '${4:media}',array('${5:optionName}'=>${6:optionValue})); 
+	echo CHtml::linkTag('${1:relation}', '${2:type}', '${3:href}', '${4:media}',array('${5:optionName}'=>${6:optionValue}));
 
 #Yii CHtml::resetButton
 snippet yhrsb
-	echo CHtml::resetButton('${1:label}',array('${2:optionName}'=>${3:optionValue})); 
+	echo CHtml::resetButton('${1:label}',array('${2:optionName}'=>${3:optionValue}));
 
 #Yii CHtml::activeRadioButtonList
 snippet yharbl
-	echo CHtml::activeRadioButtonList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeRadioButtonList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::checkBoxList
 snippet yhcbl
-	echo CHtml::checkBoxList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::checkBoxList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::form
 snippet yhform
@@ -231,18 +231,18 @@ snippet yhform
 snippet yhbeform
 	echo CHtml::beginForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
 	${5}
-	echo CHtml::endForm(); 
+	echo CHtml::endForm();
 
 #Yii CHtml::activeDropDownList
 snippet yhaddl
-	echo CHtml::activeDropDownList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue})); 
+	echo CHtml::activeDropDownList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
 
 #Yii CHtml::activeRadioButton
 snippet yharb
-	echo CHtml::activeRadioButton(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeRadioButton(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 #Yii CHtml::activeLabel
 snippet yhal
-	echo CHtml::activeLabel(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue})); 
+	echo CHtml::activeLabel(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
 
 
diff --git a/snippets/yii.snippets b/snippets/yii.snippets
index 9f29eaf13..da48ee236 100644
--- a/snippets/yii.snippets
+++ b/snippets/yii.snippets
@@ -1,58 +1,58 @@
 #Yii session offset
 snippet yse
-	Yii::app()->session['${1}']; 
+	Yii::app()->session['${1}'];
 
 #Yii renderDynamic
 snippet yrd
-	$this->renderDynamic('${1:callback}'); 
+	$this->renderDynamic('${1:callback}');
 
 #Yii set cache
 snippet ycas
-	Yii::app()->cache->set('${1:key}', ${2:value}, ${3:expire}, new C${4:}CacheDependency(${5})); 
+	Yii::app()->cache->set('${1:key}', ${2:value}, ${3:expire}, new C${4:}CacheDependency(${5}));
 
 #Yii Add cache
 snippet ycad
-	Yii::app()->cache->add('${1:key}', ${2:value}, ${3:expire}, new C${4}CacheDependency(${5})); 
+	Yii::app()->cache->add('${1:key}', ${2:value}, ${3:expire}, new C${4}CacheDependency(${5}));
 
 #Yii register CSS file
 snippet yregcf
-	Yii::app()->clientScript->registerCssFile('${1:file}'); 
+	Yii::app()->clientScript->registerCssFile('${1:file}');
 
 #Yii requestType
 snippet yreqtype
-	Yii::app()->request->requestType 
+	Yii::app()->request->requestType
 
 #Yii isAjaxRequest
 snippet yisajax
-	Yii::app()->request->isAjaxRequest 
+	Yii::app()->request->isAjaxRequest
 
 #Yii translate
 snippet yt
-	Yii::t('${1:category}', '${2:message}',array(${3})); 
+	Yii::t('${1:category}', '${2:message}',array(${3}));
 
 #Yii register CSS
 snippet yregc
-	Yii::app()->clientScript->registerCss('${1:id}', '${2}'); 
+	Yii::app()->clientScript->registerCss('${1:id}', '${2}');
 
 #Yii log
 snippet ylog
-	Yii::log('${1:msg}', '${2:info}'); 
+	Yii::log('${1:msg}', '${2:info}');
 
 #Yii userHostAddress
 snippet yuserip
-	YYii::app()->request->userHostAddress 
+	YYii::app()->request->userHostAddress
 
 #Yii register script file
 snippet yregsf
-	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${2:END}); 
+	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${2:END});
 
 #Yii CLinkPager
 snippet ylinkpager
-	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${1}'})) 
+	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${1}'}))
 
 #Yii CJSON::encode
 snippet yjec
-	CJSON::encode(${1:text}); 
+	CJSON::encode(${1:text});
 
 #CActiveDataProvider
 snippet yadp
@@ -68,23 +68,23 @@ snippet yadp
 		),
 	));
 	${6}
-	// $dataProvider->getData() will return a list of Post objects 
+	// $dataProvider->getData() will return a list of Post objects
 
 #Yii renderDynamic internal
 snippet yrdi
-	$this->renderDynamic('${1:callback}', array('${2:key}'=>${3:value})); 
+	$this->renderDynamic('${1:callback}', array('${2:key}'=>${3:value}));
 
 #Yii register script
 snippet yregs
-	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${3:READY}); 
+	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${3:READY});
 
 #Yii Flush cache
 snippet ycaf
-	Yii::app()->cache->flush(); 
+	Yii::app()->cache->flush();
 
 #Yii Yii::app()->request->cookies
 snippet yco
-	Yii::app()->request->cookies['${1}'] 
+	Yii::app()->request->cookies['${1}']
 
 #Yii user->
 snippet yuser
@@ -92,54 +92,54 @@ snippet yuser
 
 #Yii refresh
 snippet yrf
-	$this->refresh(); 
+	$this->refresh();
 
 #Yii import
 snippet yimp
-	Yii::import('${1}'); 
+	Yii::import('${1}');
 
 #Yii trace
 snippet ytrace
-	Yii::trace('${1:msg}'); 
+	Yii::trace('${1:msg}');
 
 #Yii params
 snippet ypar
-	Yii::app()->params['${1}'] 
+	Yii::app()->params['${1}']
 
 #Yii isPostRequest
 snippet yispost
-	Yii::app()->request->isPostRequest 
+	Yii::app()->request->isPostRequest
 
 #Yii IF isAjaxRequest
 snippet yifisajax
 	if(Yii::app()->request->isAjaxRequest == TRUE)
 	{
 		${1}
-	} 
+	}
 
 #Yii Yii::app()->cache->delete
 snippet ydelcache
-	Yii::app()->cache->delete('${1:key}'); 
+	Yii::app()->cache->delete('${1:key}');
 
 #Yii render view
 snippet yr
-	$this->render('${1:view}',array('${2:key}'=>${3:value})); 
+	$this->render('${1:view}',array('${2:key}'=>${3:value}));
 
 #Yii redirect
 snippet yre
-	$this->redirect(array('${1:controller}/${2:action}')); 
+	$this->redirect(array('${1:controller}/${2:action}'));
 
 #Yii Get cache
 snippet ycag
-	Yii::app()->cache->get('${1:key}'); 
+	Yii::app()->cache->get('${1:key}');
 
 #Yii render text
 snippet yrt
-	$this->renderText('${1}'); 
+	$this->renderText('${1}');
 
 #Yii render partial
 snippet yrp
-	$this->renderPartial('${1:view}',array('${2:key}'=>${3:value})); 
+	$this->renderPartial('${1:view}',array('${2:key}'=>${3:value}));
 
 #----------------Yii Model-----------------------------
 #Yii Model count
@@ -152,7 +152,7 @@ snippet ycountbs
 
 #Yii Model updateAll
 snippet yupdatea
-	${1:ModelName}::model()->updateAll(${2:array('attributes')}, ${3:condition},array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->updateAll(${2:array('attributes')}, ${3:condition},array('${4:key}'=>${5:value}));
 
 #Yii Model updateByPk
 snippet yupdatebp
@@ -164,35 +164,35 @@ snippet ydela
 
 #Yii Model deleteByPk
 snippet ydelbp
-	${1:ModelName}::model()->deleteByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->deleteByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value}));
 
 #Yii Model find
 snippet yfind
-	${1:ModelName}::model()->find(${2:condition},array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->find(${2:condition},array('${3:key}'=>${4:value}));
 
 #Yii Model findAll
 snippet yfinda
-	${1:ModelName}::model()->findAll(${2:condition},array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->findAll(${2:condition},array('${3:key}'=>${4:value}));
 
 #Yii Model findByPk
 snippet yfindbp
-	${1:ModelName}::model()->findByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->findByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value}));
 
 #Yii Model findAllByPk
 snippet yfindabp
-	${1:ModelName}::model()->findAllByPk(${2:pk}, ${3:condition},array('${4:key}'=>${5:value})); 
+	${1:ModelName}::model()->findAllByPk(${2:pk}, ${3:condition},array('${4:key}'=>${5:value}));
 
 #Yii Model findBySql
 snippet yfindbs
-	${1:ModelName}::model()->findBySql(${2:sql}, array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->findBySql(${2:sql}, array('${3:key}'=>${4:value}));
 
 #Yii Model findAllByAttributes
 snippet yfindaba
-	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), ${4:condition}, array('${5:key}'=>${6:value})); 
+	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), ${4:condition}, array('${5:key}'=>${6:value}));
 
 #Yii Model exists
 snippet yexists
-	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${4:value})); 
+	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${4:value}));
 
 #Yii Create model class
 snippet ymodel
@@ -245,7 +245,7 @@ snippet ymodel
 		}
 	}
 
-#------------Yii Controller------------------------------------ 
+#------------Yii Controller------------------------------------
 
 #Yii Create controller class
 snippet ycontroller

From 8e1e176998a95b9e4d27fa892dd162c987d3f84c Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Fri, 21 Jun 2013 14:55:09 +0800
Subject: [PATCH 0109/1587] update fig/inc/img

---
 UltiSnips/rst.snippets | 129 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 109 insertions(+), 20 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index c70dccc83..cdc2a7791 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -4,9 +4,58 @@
 #                              General Stuff                              #
 ###########################################################################
 global !p
+from os import path as ospath
+from string import Template
 import re
 from collections import Counter
 
+#http://docutils.sourceforge.net/docs/ref/rst/roles.html
+TEXT_ROLES = ['emphasis','literal','code','math',
+              'pep-reference','rfc-reference',
+              'strong','subscript','superscript',
+              'title-reference','raw'] 
+TEXT_ROLES_REGEX = r'\.\.\srole::?\s(w+)'
+
+#http://docutils.sourceforge.net/docs/ref/rst/directives.html#specific-admonitions
+SPECIFIC_ADMONITIONS = ["attention", "caution", "danger", 
+                        "error", "hint", "important", "note", 
+                        "tip", "warning"]
+#http://docutils.sourceforge.net/docs/ref/rst/directives.html
+DIRECTIVES = ['topic','sidebar','math','epigraph',
+              'parsed-literal','code','highlights',
+              'pull-quote','compound','container',
+              'list-table','class','sectnum',
+              'role','default-role','unicode',
+              'raw']
+
+NONE_CONTENT_DIRECTIVES = ['rubric', 'contents', 'header',
+                           'footer', 'date', 'include', 'title'
+                          ]
+INCLUDABLE_DIRECTIVES_INDEX = {'img':'image',
+                                'fig':'figure',
+                                'inc':'include'}
+
+def real_filename(filename):
+    # peal extension name off if possible
+    # i.e. "foo.bar.png will return "foo.bar"
+    names=filename.split('.')
+    return ".".join(names[:-1]) if len(names) > 1 else filename
+
+def check_file_exist(rst_path, relative_path):
+    """
+    For RST file, it can just include files as relative path.
+    
+    :param rst_path: absolute path to rst file
+    :param relative_path: path related to rst file
+    :return: relative file's absolute path if file exist
+    """
+    abs_path = ospath.join(ospath.dirname(rst_path), relative_path)
+    if ospath.isfile(abs_path):
+        return abs_path
+
+#TODO: File preview
+#TODO: File list complete
+
 def rst_char_len(char):
     """ 
     return len of string which fit in rst
@@ -34,27 +83,40 @@ def	make_items(times, leading='+'):
         return ("%s Item\n" % leading) * times
 
 
-def get_popular_code_type(path):
+def look_up_directives(regex, fpath):
     """
-    As function name, it will get most popular code type in given file
-
+    find all directive args in given file
+    :param: regex, the regex that needs to match
     :param: path, to path to rst file
+
+    :return: list, empty list if nothing match
     """
-    with open(path) as source:
-        types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', source.read())
+    with open(fpath) as source:
+        match = re.findall(regex, source.read())
+    return match
+
+
+def get_popular_code_type(path):
+    # find most popular code type in the given rst
+    types = look_up_directives(r'[:|\.\.\s]code::?\s(\w+)', path)
     try:
         popular_type = Counter(types).most_common()[0][0]
     except IndexError:
         popular_type = "lua" # Don't break default
 
     return popular_type
+ 
 
 def complete(t, opts):
+    msg = "({0})"
     if t:
         opts = [ m[len(t):] for m in opts if m.startswith(t) ]
     if len(opts) == 1:
         return opts[0]
-    return "({0})".format("|".join(opts))
+
+    if not len(opts):
+        msg = "{0}"
+    return msg.format("|".join(opts))
 
 endglobal
 
@@ -146,36 +208,63 @@ snippet cb "Code Block" b
 $0
 endsnippet
 
-snippet img "Image Block" b
-.. |${2:alias}| image:: ${1:img}
+# match snippets :
+# img, inc, fig
+snippet "(?P<shortcut>^img|inc|fig)" "Includable Block" !br
+`!p 
+#TODO: Import img.template in rst relative path?
+real_name=real_filename(ospath.basename(t[1]))
+di=INCLUDABLE_DIRECTIVES_INDEX.get(match.groupdict()['shortcut'], 'include')
+link=""
+content=""
+
+if di in ['image']:
+    link = "|{0}| ".format(real_name)
+
+if di == 'figure':
+    content="""
+    :alt: {0}
+    {0}""".format(real_name)
+
+snip.rv = ".. {link}{di}:: ".format(di=di,link=link)
+`${1:file}`!p if content:
+    snip.rv +="    "+content`
+`!p
+# Tip of whether file is exist in comment type
+if not check_file_exist(path, t[1]):
+    snip.rv='.. FILE {0} does not exist'.format(t[1])
+else:
+    snip.rv=""
+`$0
 endsnippet
 
-snippet fig "Figure Block" b
-.. figure:: ${1:img}
-    :alt: ${2:alter text}
-    
-    ${3}
+snippet di "Directives" b
+.. $1`!p snip.rv=complete(t[1], DIRECTIVES)`:: $2
 
+    ${3:Content}
 $0
 endsnippet
 
-snippet cont "Content Block" b
-.. contents:: ${1:Contents Title}
-
+snippet nd "None Content Directives" b
+.. $1`!p snip.rv=complete(t[1], NONE_CONTENT_DIRECTIVES)`:: $2
 $0
 endsnippet
 
-#http://docutils.sourceforge.net/docs/ref/rst/directives.html#specific-admonitions
 snippet sa "Specific Admonitions" b
-.. $1`!p snip.rv =complete(t[1], ["attention", "caution", "danger", 
-                                  "error", "hint", "important", "note", 
-                                  "tip", "warning"])`::
+.. $1`!p snip.rv =complete(t[1], SPECIFIC_ADMONITIONS)`::
     
     ${2:Content}
 
 $0
 endsnippet
 
+#it will be trigger at start of line or after a word
+snippet ro "Text Roles" b
+\ :$1`!p snip.rv=complete(t[1],
+                          TEXT_ROLES+look_up_directives(TEXT_ROLES_REGEX,
+                                                        path))`:\`$2\`\ 
+endsnippet
+
 ############
 #  Sphinx  #
 ############

From fb00219a4c777506473aaacf3085c013affe77b7 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Tue, 7 Aug 2012 16:08:35 +0200
Subject: [PATCH 0110/1587] Add snippet root for sh

---
 snippets/sh.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 83e78482d..e2853b64a 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -80,7 +80,5 @@ snippet getopt
 	  esac    # --- end of case ---
 	done
 	shift $(($OPTIND-1))
-
-
 snippet root
 	if [ $(id -u) -ne 0 ]; then exec sudo $0; fi

From 6a459fdc56a7dc8f0f8dc2618208125e900a3916 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Thu, 7 Mar 2013 15:23:08 +0100
Subject: [PATCH 0111/1587] Add snippet itsn for rspec

---
 snippets/ruby.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 417a4f440..995274c69 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -936,7 +936,6 @@ snippet its
 	its(:${1:method}) { should ${2} }
 snippet itsn
 	its(:${1:method}) { should_not ${2} }
-
 snippet desc
 	describe ${1:class_name} do
 		${2}

From fdb7185a0b7d5b18c3641d6261549f7fb693e7b8 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Thu, 7 Mar 2013 15:23:21 +0100
Subject: [PATCH 0112/1587] Add snippet s for rspec

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 995274c69..6a9d26940 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -958,6 +958,8 @@ snippet let!
 	let!(:${1:object}) ${2:block}
 snippet subj
 	subject { ${1} }
+snippet s
+	subject${1:.method}
 snippet spec
 	specify { subject.${1} }
 snippet exp

From f89f57e359b849019a0cd7871a23a56551ff84c1 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Thu, 14 Mar 2013 17:45:04 +0100
Subject: [PATCH 0113/1587] Update snippet s. and remove snippet s for rspec

---
 snippets/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 6a9d26940..cbccd7357 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -958,8 +958,8 @@ snippet let!
 	let!(:${1:object}) ${2:block}
 snippet subj
 	subject { ${1} }
-snippet s
-	subject${1:.method}
+snippet s.
+	subject.${1:method}
 snippet spec
 	specify { subject.${1} }
 snippet exp

From f222c1b8065adeae3ab699bf458932a719b49a64 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Thu, 14 Mar 2013 17:45:27 +0100
Subject: [PATCH 0114/1587] Add snippet for initialize method for ruby

---
 snippets/ruby.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index cbccd7357..5cf28d248 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -178,6 +178,11 @@ snippet defs
 	def self.${1:class_method_name}
 		${2}
 	end
+# def initialize
+snippet definit
+	def initialize(${1:args})
+		${2}
+	end
 # def method_missing
 snippet defmm
 	def method_missing(meth, *args, &blk)

From 9e31911a7908dec5f3f9d500458575310c646435 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Thu, 14 Mar 2013 17:45:52 +0100
Subject: [PATCH 0115/1587] Add snippet raise for rspec

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 5cf28d248..dddc101b3 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -969,6 +969,8 @@ snippet spec
 	specify { subject.${1} }
 snippet exp
 	expect(${1:object}).to ${2}
+snippet raise
+	expect { ${1:object} }.to raise_error ${2:StandardError}, /${3:message_regex}/
 snippet btr
 	be_true
 snippet bfa

From 1a4fc2561dd2636adbd104f17847d96faf9e7b84 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Thu, 14 Mar 2013 17:46:09 +0100
Subject: [PATCH 0116/1587] Fix snippet exp for rspec

---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index dddc101b3..10ecc8de0 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -968,7 +968,7 @@ snippet s.
 snippet spec
 	specify { subject.${1} }
 snippet exp
-	expect(${1:object}).to ${2}
+	expect { ${1:object} }.to ${2}
 snippet raise
 	expect { ${1:object} }.to raise_error ${2:StandardError}, /${3:message_regex}/
 snippet btr

From 46ba1032e490a8858704cd2bac0a6eef6d4e824b Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Tue, 26 Mar 2013 17:53:05 +0100
Subject: [PATCH 0117/1587] Add snippet descm for rspec

---
 snippets/ruby.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 10ecc8de0..71b3e625a 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -945,6 +945,12 @@ snippet desc
 	describe ${1:class_name} do
 		${2}
 	end
+snippet descm
+	describe "#${1:method}" do
+		pending "Not implemented"
+	end
+
+	${2}
 snippet cont
 	context "${1:message}" do
 		${2}

From 3d14eb9750bea7c34e691168f736e83e093788a6 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:52:40 +0200
Subject: [PATCH 0118/1587] Add span. span# to html snippets

---
 snippets/html.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 9693fe003..3615d4bed 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -730,10 +730,10 @@ snippet source
 	<source src="${1}" type="${2}" media="${3}" />
 snippet span
 	<span>${1}</span>
-snippet span#
-	<span id="${1}">${2}</span>
 snippet span.
 	<span class="${1}">${2}</span>
+snippet span#
+	<span id="${1}">${2}</span>
 snippet strong
 	<strong>${1}</strong>
 snippet style

From 3699e8654fa72c0df4ec67cbe115ff177cabd9c2 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:53:09 +0200
Subject: [PATCH 0119/1587] Add prot and priv to ruby snipppets

---
 snippets/ruby.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 71b3e625a..d5d651648 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -16,6 +16,14 @@ snippet =b
 	=begin rdoc
 		${1}
 	=end
+snippet prot
+	protected
+
+	${1}
+snippet priv
+	private
+
+	${1}
 snippet y
 	:yields: ${1:arguments}
 snippet rb

From 609ac9ecffa93eb1cfbd7352b5f0c85951e32437 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:53:42 +0200
Subject: [PATCH 0120/1587] Add reduce snippets to ruby snippets

---
 snippets/ruby.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index d5d651648..00f7884b5 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -322,6 +322,12 @@ snippet injd
 	inject(${1:init}) do |${2:mem}, ${3:var}|
 		${4}
 	end
+snippet red
+	reduce(${1:init}) { |${2:mem}, ${3:var}| ${4} }
+snippet redd
+	reduce(${1:init}) do |${2:mem}, ${3:var}|
+		${4}
+	end
 snippet map
 	map { |${1:e}| ${2} }
 snippet mapd

From 34ead4e3bf0ba91f5fb5d8f1339d9e0cd01ea51d Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:54:24 +0200
Subject: [PATCH 0121/1587] Rename wants to format in respond_to blocks in ruby
 snippets

---
 snippets/ruby.snippets | 52 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 00f7884b5..0b4616b58 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -616,14 +616,14 @@ snippet defcreate
 	def create
 		@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])
 
-		respond_to do |wants|
+		respond_to do |format|
 			if @$1.save
 				flash[:notice] = '$2 was successfully created.'
-				wants.html { redirect_to(@$1) }
-				wants.xml  { render :xml => @$1, :status => :created, :location => @$1 }
+				format.html { redirect_to(@$1) }
+				format.xml  { render :xml => @$1, :status => :created, :location => @$1 }
 			else
-				wants.html { render :action => "new" }
-				wants.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
+				format.html { render :action => "new" }
+				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
 			end
 		end
 	end${3}
@@ -632,9 +632,9 @@ snippet defdestroy
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
 		@$1.destroy
 
-		respond_to do |wants|
-			wants.html { redirect_to($1s_url) }
-			wants.xml  { head :ok }
+		respond_to do |format|
+			format.html { redirect_to($1s_url) }
+			format.xml  { head :ok }
 		end
 	end${3}
 snippet defedit
@@ -645,41 +645,41 @@ snippet defindex
 	def index
 		@${1:model_class_name} = ${2:ModelClassName}.all
 
-		respond_to do |wants|
-			wants.html # index.html.erb
-			wants.xml  { render :xml => @$1s }
+		respond_to do |format|
+			format.html # index.html.erb
+			format.xml  { render :xml => @$1s }
 		end
 	end${3}
 snippet defnew
 	def new
 		@${1:model_class_name} = ${2:ModelClassName}.new
 
-		respond_to do |wants|
-			wants.html # new.html.erb
-			wants.xml  { render :xml => @$1 }
+		respond_to do |format|
+			format.html # new.html.erb
+			format.xml  { render :xml => @$1 }
 		end
 	end${3}
 snippet defshow
 	def show
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
 
-		respond_to do |wants|
-			wants.html # show.html.erb
-			wants.xml  { render :xml => @$1 }
+		respond_to do |format|
+			format.html # show.html.erb
+			format.xml  { render :xml => @$1 }
 		end
 	end${3}
 snippet defupdate
 	def update
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
 
-		respond_to do |wants|
+		respond_to do |format|
 			if @$1.update_attributes(params[:$1])
 				flash[:notice] = '$2 was successfully updated.'
-				wants.html { redirect_to(@$1) }
-				wants.xml  { head :ok }
+				format.html { redirect_to(@$1) }
+				format.xml  { head :ok }
 			else
-				wants.html { render :action => "edit" }
-				wants.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
+				format.html { render :action => "edit" }
+				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
 			end
 		end
 	end${3}
@@ -752,8 +752,8 @@ snippet ra
 snippet ral
 	render :action => "${1:action}", :layout => "${2:layoutname}"
 snippet rest
-	respond_to do |wants|
-		wants.${1:html} { ${2} }
+	respond_to do |format|
+		format.${1:html} { ${2} }
 	end
 snippet rf
 	render :file => "${1:filepath}"
@@ -886,8 +886,8 @@ snippet vp
 	validates :${1:attribute}, :presence => true
 snippet vu
 	validates :${1:attribute}, :uniqueness => true
-snippet wants
-	wants.${1:js|xml|html} { ${2} }
+snippet format
+	format.${1:js|xml|html} { ${2} }
 snippet wc
 	where(${1:"conditions"}${2:, bind_var})
 snippet wh

From 8c2ad98d54d68fb1e2d30a78f01500422d021de0 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:55:38 +0200
Subject: [PATCH 0122/1587] Use lambda in scopes for rails snippets

---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 0b4616b58..0ea63b6a1 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -798,7 +798,7 @@ snippet ru
 snippet rxml
 	render :xml => ${1:text to render}
 snippet sc
-	scope :${1:name}, :where(:@${2:field} => ${3:value})
+	scope :${1:name}, -> { where(${2:field}: ${3:value}) }
 snippet sl
 	scope :${1:name}, lambda do |${2:value}|
 		where("${3:field = ?}", ${4:bind var})

From 317c6ac6391bbad47328f55ca81d356b343937f7 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:56:00 +0200
Subject: [PATCH 0123/1587] Add eqnarray to latex snippets

---
 snippets/tex.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 1b3a8e458..7d4322b5b 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -56,6 +56,11 @@ snippet \
 	\[
 		${1}
 	\]
+# Equation array
+snippet eqnarray
+	\begin{eqnarray}
+		${1}
+	\end{eqnarray}
 # Enumerate
 snippet enum
 	\begin{enumerate}

From a987ec6e0d30b0d11c6e761e19baf23974c1c619 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:56:22 +0200
Subject: [PATCH 0124/1587] Add endless item to latex snippets

---
 snippets/tex.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 7d4322b5b..bb071597c 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -78,6 +78,10 @@ snippet desc
 	\begin{description}
 		\item[${1}] ${2}
 	\end{description}
+# Endless new item
+snippet ]i
+	\item ${1}
+	${2:]i}
 # Matrix
 snippet mat
 	\begin{${1:p/b/v/V/B/small}matrix}

From dc6ca62c2537c4f2c27d5f0eaa5cc8ed3a293e2b Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:57:16 +0200
Subject: [PATCH 0125/1587] Add section snippets without numbers to latex
 snippets

---
 snippets/tex.snippets | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index bb071597c..7737afa97 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -114,16 +114,31 @@ snippet sec
 	\section{${1:section name}}
 	\label{sec:${2:$1}}
 	${3}
+# Section without number
+snippet sec*
+	\section*{${1:section name}}
+	\label{sec:${2:$1}}
+	${3}
 # Sub Section
 snippet sub
 	\subsection{${1:subsection name}}
 	\label{sub:${2:$1}}
 	${3}
+# Sub Section without number
+snippet sub*
+	\subsection*{${1:subsection name}}
+	\label{sub:${2:$1}}
+	${3}
 # Sub Sub Section
 snippet subs
 	\subsubsection{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
 	${3}
+# Sub Sub Section without number
+snippet subs*
+	\subsubsection*{${1:subsubsection name}}
+	\label{ssub:${2:$1}}
+	${3}
 # Paragraph
 snippet par
 	\paragraph{${1:paragraph name}}

From aadb5e72271cee05d3d3f19e0fd5ad4b12a31f29 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:58:31 +0200
Subject: [PATCH 0126/1587] Add block, example, alert blocks to latex snippets

---
 snippets/tex.snippets | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 7737afa97..94664cd73 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -229,4 +229,15 @@ snippet sum
 	\sum^{${1:n}}_{${2:i=1}} ${3}
 snippet lim
 	\lim_{${1:x \to +\infty}} ${2}
-
+snippet block
+	\begin{block}{${1:title}}
+	${2}
+	\end{block}
+snippet alert
+	\begin{alertblock}{${1:title}}
+	${2}
+	\end{alertblock}
+snippet example
+	\begin{exampleblock}{${1:title}}
+	${2}
+	\end{exampleblock}

From 78b0f38e5c3207d82fa722a118bcf149c0881487 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:58:45 +0200
Subject: [PATCH 0127/1587] Add frame to latex snippets

---
 snippets/tex.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 94664cd73..ababc99d9 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -229,6 +229,12 @@ snippet sum
 	\sum^{${1:n}}_{${2:i=1}} ${3}
 snippet lim
 	\lim_{${1:x \to +\infty}} ${2}
+snippet frame
+	\begin{frame}[<+->]
+		\frametitle{${1:title}}
+
+		${2}
+	\end{frame}
 snippet block
 	\begin{block}{${1:title}}
 	${2}

From 0806bd70d681094a40479f819414e432cafc2a02 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:59:18 +0200
Subject: [PATCH 0128/1587] Add snippet for two columns to latex snippets

---
 snippets/tex.snippets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index ababc99d9..fc44fffbb 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -247,3 +247,12 @@ snippet example
 	\begin{exampleblock}{${1:title}}
 	${2}
 	\end{exampleblock}
+snippet col2
+	\begin{columns}
+		\begin{column}{0.5\textwidth}
+			${1}
+		\end{column}
+		\begin{column}{0.5\textwidth}
+			${2}
+		\end{column}
+	\end{columns}

From 64c819f8929ad657cbace5b6beb8d7e985764801 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sat, 22 Jun 2013 14:59:44 +0200
Subject: [PATCH 0129/1587] Add instance variable cache snippet to ruby
 snippets

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 0ea63b6a1..b9fbf2174 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -164,6 +164,8 @@ snippet atp
 	attr_protected :${1:attr_names}
 snippet ata
 	attr_accessible :${1:attr_names}
+snippet ivc
+	@${1:variable_name} ||= ${2:chached_value}
 # include Enumerable
 snippet Enum
 	include Enumerable

From 344ac6ea2cc41f83ea8b040f98a0a01bfe64077f Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 23 Jun 2013 02:30:26 +0200
Subject: [PATCH 0130/1587] new policies for if, eif, el

What about wh(ile)?
drop some placeholder comments which don't add (enough) value to keep
for patterns used very often.
---
 README.md                     | 37 ++++++++++++++++
 UltiSnips/coffee.snippets     |  2 +-
 UltiSnips/d.snippets          |  2 +-
 UltiSnips/django.snippets     |  2 +-
 UltiSnips/eruby.snippets      |  2 +-
 UltiSnips/haskell.snippets    |  8 ++--
 UltiSnips/java.snippets       |  2 +-
 UltiSnips/javascript.snippets | 11 ++++-
 UltiSnips/ocaml.snippets      | 81 ++++++++++++++++-------------------
 UltiSnips/php.snippets        | 22 +++++-----
 UltiSnips/tcl.snippets        |  6 +--
 UltiSnips/vim.snippets        | 16 +++----
 snippets/autoit.snippets      |  6 +--
 snippets/coffee.snippets      |  2 +-
 snippets/falcon.snippets      |  2 +-
 snippets/htmldjango.snippets  |  4 +-
 snippets/htmltornado.snippets |  4 +-
 snippets/java.snippets        |  2 +-
 snippets/mako.snippets        |  2 +-
 snippets/perl.snippets        | 36 +++++++++-------
 snippets/php.snippets         |  4 +-
 snippets/puppet.snippets      |  2 +-
 snippets/ruby.snippets        |  2 +-
 snippets/scala.snippets       |  6 ++-
 snippets/tcl.snippets         | 18 +++++---
 snippets/vim.snippets         | 14 ++++--
 snippets/zsh.snippets         |  2 +-
 27 files changed, 177 insertions(+), 120 deletions(-)

diff --git a/README.md b/README.md
index 984cdb646..849d0664e 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,43 @@ of the snippets by setting the "always_use_first_snippet" option to 1.
 If you have VimL only (vim without python support) your best option is using
 garbas/vim-snipmate and cope with the minor bugs found in the engine.
 
+
+Policies / for contributors
+===========================
+some snippets are useful for all languages, so let's try to have the same
+triggers for all languages:
+
+```
+if : if without else
+ife: if $1 else $2
+eif : else if ($1) { .. }
+el  : else ..
+```
+
+If you're not satisfied with these defaults, open a ticket that we implement
+aliasing. Then you can remap "else" to "el" or the like.
+
+
+Don't add stupid placeholder default texts like
+```
+if (${1:condition){
+  ${2:some code here}
+}
+```
+instead use:
+
+```
+if (${1){
+  ${2}
+}
+```
+
+Exception: Functions which are used less often, such as Vim's matchall(), matchstr()
+functions which case hints may be helpful to remember order. In the VimL case
+get vim-dev plugin which has function completion
+
+Thus for conditions (while, if ..) and block bodies just use ${N} - Thanks
+
 Related repositories
 ====================
 We also encourage people to maintain sets of snippets for particular use cases
diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
index bb451aac3..68d40349d 100644
--- a/UltiSnips/coffee.snippets
+++ b/UltiSnips/coffee.snippets
@@ -22,7 +22,7 @@ else
 	${3:# body...}
 endsnippet
 
-snippet elif "Else if" b
+snippet eif "Else if" b
 else if ${1:condition}
 	${0:# body...}
 endsnippet
diff --git a/UltiSnips/d.snippets b/UltiSnips/d.snippets
index 8ed9b4170..94959514a 100644
--- a/UltiSnips/d.snippets
+++ b/UltiSnips/d.snippets
@@ -126,7 +126,7 @@ else
 }
 endsnippet
 
-snippet elif "else if (elif)" b
+snippet eif "else if (elif)" b
 else if(${1:/*condition*/})
 {
     ${VISUAL}${0:/*code*/}
diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 59b77c576..553babab9 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -76,7 +76,7 @@ snippet if
 {% endif %}
 endsnippet
 
-snippet else
+snippet el
 {% else %}
   ${1}
 endsnippet
diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index c6b201eae..88f717911 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -263,7 +263,7 @@ snippet st "submit_tag"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`submit_tag "${1:Save changes}"${2:, :id => "${3:submit}"}${4:, :name => "${5:$3}"}${6:, :class => "${7:form_$3}"}${8:, :disabled => ${9:false}}${10:, :disable_with => "${11:Please wait...}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet else "else (ERB)"
+snippet el "else (ERB)"
 <% else %>
   
 endsnippet
diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets
index eb7b2c62e..99f947f81 100644
--- a/UltiSnips/haskell.snippets
+++ b/UltiSnips/haskell.snippets
@@ -1,13 +1,13 @@
-snippet if "if ... then ... else ..."
+snippet ife "if ... then ... else ..."
 if ${1:condition}
    then ${2:expression}
    else ${3:expression}
 endsnippet
 
 snippet case "case ... of ..."
-case ${1:expression} of
-     ${2:pattern} -> ${3:expression}
-     ${4:pattern} -> ${5:expression}
+case ${1} of
+     ${2} -> ${3}
+     ${4} -> ${5}
 endsnippet
 
 snippet :: "Type signature"
diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 6e1b3ffe3..617c16166 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -59,7 +59,7 @@ default:
 	$0
 endsnippet
 
-snippet elif "else if" b
+snippet eif "else if" b
 else if ($1)`!p nl(snip)`{
 	$0
 }
diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index e4e7f7ab6..7eb18d770 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -50,12 +50,19 @@ function ${1:function_name} (${2:argument}) {
 }
 endsnippet
 
+# for one line if .. else you usually use a ? b : c
 snippet ife "if ___ else"
-if (${1:true}) {$0} else{};
+if (${1}) {
+	{$2}
+} else {
+	{$3}
+};
 endsnippet
 
 snippet if "if"
-if (${1:true}) {$0};
+if (${1}) {
+	{$2}
+};
 endsnippet
 
 snippet timeout "setTimeout function"
diff --git a/UltiSnips/ocaml.snippets b/UltiSnips/ocaml.snippets
index 8aefef3a0..14926c899 100644
--- a/UltiSnips/ocaml.snippets
+++ b/UltiSnips/ocaml.snippets
@@ -4,17 +4,17 @@ endsnippet
 
 snippet open "open"
 let open ${1:module} in
-${2:e}
+${2}
 endsnippet
 
 snippet try "try"
-try ${1:e}
+try ${1}
 with ${2:Not_found} -> ${3:()}
 endsnippet
 
 snippet ref "ref"
-let ${1:name} = ref ${2:val} in
-${3:e}
+let ${1} = ref ${2} in
+${3}
 endsnippet
 
 snippet matchl "pattern match on a list"
@@ -24,88 +24,83 @@ match ${1:list} with
 endsnippet
 
 snippet matcho "pattern match on an option type"
-match ${1:x} with
-| Some(${2:y}) -> ${3:()}
+match ${1} with
+| Some(${2}) -> ${3:()}
 | None -> ${4:()}
 endsnippet
 
 snippet fun "anonymous function"
-(fun ${1:x} -> ${2:x})
+(fun ${1} -> ${2})
 endsnippet
 
 snippet cc "commment"
-(* ${1:comment} *)
+(* ${1} *)
 endsnippet
 
 snippet let "let .. in binding"
-let ${1:x} = ${2:v} in
-${3:e}
+let ${1} = ${2} in
+${3}
 endsnippet
 
 snippet lr "let rec"
-let rec ${1:f} =
-  ${2:expr}
+let rec ${1} =
+  ${2}
 endsnippet
 
-snippet if "if"
-if ${1:(* condition *)} then
-  ${2:(* A *)}
+snippet ife "if"
+if ${1} then
+  ${2}
 else
-  ${3:(* B *)}
+  ${3}
 endsnippet
 
-snippet If "If"
-if ${1:(* condition *)} then
-  ${2:(* A *)}
+snippet if "If"
+if ${1} then
+  ${2}
 endsnippet
 
 snippet while "while"
-while ${1:(* condition *)} do
-  ${2:(* A *)}
+while ${1} do
+  ${2}
 done
 endsnippet
 
 snippet for "for"
 for ${1:i} = ${2:1} to ${3:10} do
-  ${4:(* BODY *)}
+  ${4}
 done
 endsnippet
 
 snippet match "match"
-match ${1:(* e1 *)} with
-| ${2:p} -> ${3:e2}
-endsnippet
-
-snippet Match "match"
-match ${1:(* e1 *)} with
-| ${2:p} -> ${3:e2}
+match ${1} with
+| ${2} -> ${3}
 endsnippet
 
 snippet class "class"
 class ${1:name} = object
-  ${2:methods}
+  ${2}
 end
 endsnippet
 
 snippet obj "obj"
 object
-  ${2:methods}
+  ${2}
 end
 endsnippet
 
 snippet Obj "object"
 object (self)
-  ${2:methods}
+  ${2}
 end
 endsnippet
 
 snippet {{ "object functional update"
-{< ${1:x} = ${2:y} >}
+{< ${1} = ${2} >}
 endsnippet
 
 snippet beg "beg"
 begin
-  ${1:block}
+  ${1}${VISUAL}
 end
 endsnippet
 
@@ -115,19 +110,19 @@ endsnippet
 
 snippet mod "module - no signature"
 module ${1:(* Name *)} = struct
-  ${2:(* BODY *)}
+  ${2}
 end
 endsnippet
 
 snippet Mod "module with signature"
 module ${1:(* Name *)} : ${2:(* SIG *)} = struct
-  ${3:(* BODY *)}
+  ${3}
 end
 endsnippet
 
 snippet sig "anonymous signature"
 sig
-  ${2:(* BODY *)}
+  ${2}
 end
 endsnippet
 
@@ -137,32 +132,32 @@ endsnippet
 
 snippet func "define functor - no signature"
 module ${1:M} (${2:Arg} : ${3:ARG}) = struct
-  ${4:(* BODY *)}
+  ${4}
 end
 endsnippet
 
 snippet Func "define functor - with signature"
 module ${1:M} (${2:Arg} : ${3:ARG}) : ${4:SIG} = struct
-  ${5:(* BODY *)}
+  ${5}
 end
 endsnippet
 
 snippet mot "Declare module signature"
 module type ${1:(* Name *)} = sig
-  ${2:(* BODY *)}
+  ${2}
 end
 endsnippet
 
 snippet module "Module with anonymous signature"
 module ${1:(* Name *)} : sig
-  ${2:(* SIGNATURE *)}
+  ${2}
 end = struct
-  ${3:(* BODY *)}
+  ${3}
 end
 endsnippet
 
 snippet oo "odoc"
-(** ${1:odoc} *)
+(** ${1} *)
 endsnippet
 
 snippet qt "inline qtest"
diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 40461d293..3245568e0 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -11,8 +11,8 @@ endsnippet
 
 snippet do "do"
 do {
-	${2:// code... }
-} while (${1:/* condition */});"
+	${2}
+} while (${1});"
 endsnippet
 
 snippet doc_f "doc_f"
@@ -37,21 +37,21 @@ interface ${1:someClass}
 } // END interface $1"
 endsnippet
 
-snippet else "else"
+snippet el "else"
 else {
-	${1:// code...}
+	${1}
 }
 endsnippet
 
 snippet for "for"
 for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-	${4:// code...}
+	${4}
 }
 endsnippet
 
 snippet foreachk "foreachk"
 foreach ($${1:variable} as $${2:key} => $${3:value}){
-	${4:// code...}
+	${4}
 }
 endsnippet
 
@@ -60,8 +60,8 @@ $_GET['${1}']${2}
 endsnippet
 
 snippet if "if"
-if (${1:/* condition */}) {
-	${2:// code...}
+if (${1}) {
+	${2}
 }
 endsnippet
 
@@ -210,9 +210,9 @@ endsnippet
 
 snippet ife "if else"
 if (${1:/* condition */}) {
-    ${2:// code...}
+    ${2}
 } else {
-    ${3:// code...}
+    ${3}
 }
 $0
 endsnippet
@@ -227,7 +227,7 @@ class $1
 {
     public function ${3:__construct}(${4:$options})
     {
-        ${4:// code}
+        ${4}
     }
 }
 $0
diff --git a/UltiSnips/tcl.snippets b/UltiSnips/tcl.snippets
index 2cb1f347d..c5ae37ba2 100644
--- a/UltiSnips/tcl.snippets
+++ b/UltiSnips/tcl.snippets
@@ -16,14 +16,14 @@ foreach ${1:var} ${2:\$list} {
 endsnippet
 
 snippet if "if... (if)" b
-if {${1:condition}} {
+if {${1}} {
 	${2}
 }
 
 endsnippet
 
 snippet proc "proc... (proc)" b
-proc ${1:name} {${2:args}} \
+proc ${1} {${2}} \
 {
 	${3}
 }
@@ -41,7 +41,7 @@ switch ${1:-exact} -- ${2:\$var} {
 endsnippet
 
 snippet while "while... (while)" b
-while {${1:condition}} {
+while {${1}} {
 	${2}
 }
 
diff --git a/UltiSnips/vim.snippets b/UltiSnips/vim.snippets
index f4c37f079..5655c4b1b 100644
--- a/UltiSnips/vim.snippets
+++ b/UltiSnips/vim.snippets
@@ -25,30 +25,30 @@ endsnippet
 
 snippet f
 fun ${1:function_name}(${2})
-	${3:" code}
+	${3}
 endf
 endsnippet
 
 snippet for
-for ${1:needle} in ${2:haystack}
-	${3:" code}
+for ${1} in ${2}
+	${3}
 endfor
 endsnippet
 
 snippet wh
-while ${1:condition}
-	${2:" code}
+while ${1}
+	${2}
 endw
 endsnippet
 
 snippet if
-if ${1:condition}
-	${2:" code}
+if ${1}
+	${2}
 endif
 endsnippet
 
 snippet ife
-if ${1:condition}
+if ${1}
 	${2}
 else
 	${3}
diff --git a/snippets/autoit.snippets b/snippets/autoit.snippets
index 690018ce9..c266e339e 100644
--- a/snippets/autoit.snippets
+++ b/snippets/autoit.snippets
@@ -5,17 +5,17 @@ snippet if
 snippet el
 	Else
 		${1}
-snippet elif
+snippet eif
 	ElseIf ${1:condition} Then
 		${2:; True code}
 # If/Else block
-snippet ifel
+snippet ife
 	If ${1:condition} Then
 		${2:; True code}
 	Else
 		${3:; Else code}
 	EndIf
-# If/ElseIf/Else block
+# If/ElseIf/Else block - because there is eif this is not really neccessary
 snippet ifelif
 	If ${1:condition 1} Then
 		${2:; True code}
diff --git a/snippets/coffee.snippets b/snippets/coffee.snippets
index 11c82e7db..21c2cc33e 100644
--- a/snippets/coffee.snippets
+++ b/snippets/coffee.snippets
@@ -63,7 +63,7 @@ snippet ife
 	else
 		${3:# body...}
 # Else if
-snippet elif
+snippet eif
 	else if ${1:condition}
 		${2:# body...}
 # Ternary If
diff --git a/snippets/falcon.snippets b/snippets/falcon.snippets
index 3fe4caca7..78257b6e9 100644
--- a/snippets/falcon.snippets
+++ b/snippets/falcon.snippets
@@ -32,7 +32,7 @@ snippet ife
 	end
 
 # If else if
-snippet elif
+snippet eif
 	elif ${1:condition}
 		${2}
 
diff --git a/snippets/htmldjango.snippets b/snippets/htmldjango.snippets
index 09cf98ecb..4ff5d336d 100644
--- a/snippets/htmldjango.snippets
+++ b/snippets/htmldjango.snippets
@@ -47,10 +47,10 @@ snippet if
 	{% if ${1} %}
 		${2}
 	{% endif %}
-snippet else
+snippet el
 	{% else %}
 		${1}
-snippet elif
+snippet eif
 	{% elif ${1} %}
 		${2}
 snippet ifchanged
diff --git a/snippets/htmltornado.snippets b/snippets/htmltornado.snippets
index 9685b1f93..e80499ce9 100644
--- a/snippets/htmltornado.snippets
+++ b/snippets/htmltornado.snippets
@@ -27,9 +27,9 @@ snippet if
 	{% if ${1:condition} %}
 	  ${2}
 	{% end %}
-snippet elif
+snippet eif
 	{% elif ${1:condition} %}
-snippet else
+snippet el
 	{% else %}
 snippet import
 	{% import ${1:module} %}
diff --git a/snippets/java.snippets b/snippets/java.snippets
index c34010c5b..4dc6ff069 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -72,7 +72,7 @@ snippet def
 		${2}
 snippet el
 	else
-snippet elif
+snippet eif
 	else if (${1}) ${2}
 snippet if
 	if (${1}) ${2}
diff --git a/snippets/mako.snippets b/snippets/mako.snippets
index 2a0aef9ce..0f64187fc 100644
--- a/snippets/mako.snippets
+++ b/snippets/mako.snippets
@@ -22,7 +22,7 @@ snippet if if
 	% if ${1:condition}:
 		${2:}
 	% endif
-snippet if if/else
+snippet ife if/else
 	% if ${1:condition}:
 		${2:}
 	% else:
diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index ef83e0f5e..cd3f459c8 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -8,31 +8,35 @@ snippet .
 # Function
 snippet sub
 	sub ${1:function_name} {
-		${2:#body ...}
+		${2}
 	}
 # Conditional
 snippet if
 	if (${1}) {
-		${2:# body...}
+		${2}
 	}
 # Conditional if..else
 snippet ife
 	if (${1}) {
-		${2:# body...}
+		${2}
 	}
 	else {
-		${3:# else...}
+		${3}
 	}
 # Conditional if..elsif..else
 snippet ifee
 	if (${1}) {
-		${2:# body...}
+		${2}
 	}
 	elsif (${3}) {
 		${4:# elsif...}
 	}
 	else {
-		${5:# else...}
+		${5}
+	}
+snippet eif
+	elsif (${1}) {
+		${2}
 	}
 # Conditional One-line
 snippet xif
@@ -40,7 +44,7 @@ snippet xif
 # Unless conditional
 snippet unless
 	unless (${1}) {
-		${2:# body...}
+		${2}
 	}
 # Unless conditional One-line
 snippet xunless
@@ -57,7 +61,7 @@ snippet eval
 # While Loop
 snippet wh
 	while (${1}) {
-		${2:# body...}
+		${2}
 	}
 # While Loop One-line
 snippet xwh
@@ -65,7 +69,7 @@ snippet xwh
 # C-style For Loop
 snippet cfor
 	for (my $${2:var} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4:# body...}
+		${4}
 	}
 # For loop one-line
 snippet xfor
@@ -73,7 +77,7 @@ snippet xfor
 # Foreach Loop
 snippet for
 	foreach my $${1:x} (@${2:array}) {
-		${3:# body...}
+		${3}
 	}
 # Foreach Loop One-line
 snippet fore
@@ -127,7 +131,7 @@ snippet switch
 # Anonymous subroutine
 snippet asub
 	sub {
-	 	${1:# body }
+		${1}
 	}
 
 
@@ -135,7 +139,7 @@ snippet asub
 # Begin block
 snippet begin
 	BEGIN {
-		${1:# begin body}
+		${1}
 	}
 
 # call package function with some parameter
@@ -174,7 +178,7 @@ snippet given
 # switch-like case
 snippet when
 	when (${1:case}) {
-		${2:# body}
+		${2}
 	}
 
 # hash slice
@@ -237,7 +241,7 @@ snippet subpod
 	=cut
 
 	sub ${1:subroutine_name} {
-		${2:# body...}
+		${2}
 	}
 # Subroutine signature
 snippet parg
@@ -318,7 +322,7 @@ snippet trunner
 snippet tsub
 	sub t${1:number}_${2:test_case} :Test(${3:num_of_tests}) {
 		my $self = shift;
-		${4:#  body}
+		${4}
 
 	}
 
@@ -333,7 +337,7 @@ snippet trsub
 snippet tprep
 	sub prep${1:number}_${2:test_case} :Test(startup) {
 		my $self = shift;
-		${4:#  body}
+		${4}
 	}
 
 # cause failures to print stack trace
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 97ec3e317..8b071fc1d 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -278,11 +278,11 @@ snippet ifeil
 		${3:<!-- html... -->}
 	<?php endif; ?>
 	${4}
-snippet else
+snippet el
 	else {
 		${1}
 	}
-snippet elseif
+snippet eif
 	elseif (${1:/* condition */}) {
 		${2}
 	}
diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index 29fe6b37e..b8dbe504c 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -26,7 +26,7 @@ snippet if
 	if $${1:variable} {
 		${2}
 	}
-snippet else
+snippet el
 	else {
 		${1}
 	}
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index b9fbf2174..9813c8e88 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -68,7 +68,7 @@ snippet ife
 	else
 		${3}
 	end
-snippet elsif
+snippet eif
 	elsif ${1:condition}
 		${2}
 snippet unless
diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index 9a71ec2c9..e3999f850 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -15,7 +15,7 @@ snippet ifn
 		${2}
 	}
 #if-else
-snippet ifel
+snippet ife
 	if(${1:obj}) {
 		${2}
 	} else {
@@ -28,6 +28,10 @@ snippet ifelif
 	} else if(${3:obj}) {
 		${4}
 	}
+snippet eif
+	else if(${3:obj}) {
+		${4}
+	}
 #while loop
 snippet while
 	while (${1:obj}) {
diff --git a/snippets/tcl.snippets b/snippets/tcl.snippets
index 4d456de07..8c0674e4e 100644
--- a/snippets/tcl.snippets
+++ b/snippets/tcl.snippets
@@ -5,7 +5,7 @@ snippet #!
 # Process
 snippet pro
 	proc ${1:function_name} {${2:args}} {
-		${3:#body ...}
+		${3}
 	}
 #xif
 snippet xif
@@ -13,19 +13,23 @@ snippet xif
 # Conditional
 snippet if
 	if {${1}} {
-		${2:# body...}
+		${2}
 	}
 # Conditional if..else
 snippet ife
 	if {${1}} {
-		${2:# body...}
+		${2}
 	} else {
 		${3:# else...}
 	}
+snippet eif
+	elseif {${1}} {
+		${2}
+	}
 # Conditional if..elsif..else
 snippet ifee
 	if {${1}} {
-		${2:# body...}
+		${2}
 	} elseif {${3}} {
 		${4:# elsif...}
 	} else {
@@ -42,17 +46,17 @@ snippet catch
 # While Loop
 snippet wh
 	while {${1}} {
-		${2:# body...}
+		${2}
 	}
 # For Loop
 snippet for
 	for {set ${2:var} 0} {$$2 < ${1:count}} {${3:incr} $2} {
-		${4:# body...}
+		${4}
 	}
 # Foreach Loop
 snippet fore
 	foreach ${1:x} {${2:#list}} {
-		${3:# body...}
+		${3}
 	}
 # after ms script...
 snippet af
diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index 728c40208..98cb51e35 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -19,19 +19,25 @@ snippet t
 		${3}
 	endtry
 snippet for
-	for ${1:needle} in ${2:haystack}
+	for ${1} in ${2}
 		${3}
 	endfor
+snippet forkv
+	for [a,b] in items({2})
+		${3}
+            unlet a b
+	endfor
+
 snippet wh
-	while ${1:condition}
+	while ${1}
 		${2}
 	endw
 snippet if
-	if ${1:condition}
+	if ${1}
 		${2}
 	endif
 snippet ife
-	if ${1:condition}
+	if ${1}
 		${2}
 	else
 		${3}
diff --git a/snippets/zsh.snippets b/snippets/zsh.snippets
index 367a01ce3..b3fdb8c71 100644
--- a/snippets/zsh.snippets
+++ b/snippets/zsh.snippets
@@ -12,7 +12,7 @@ snippet ife
 	else
 		${3:# statements}
 	fi
-snippet elif
+snippet eif
 	elif ${1:condition} ; then
 		${2:# statements}
 snippet for

From 673415f2d0670b62597d9e00ade3ad8b06d9e437 Mon Sep 17 00:00:00 2001
From: babybeasimple <babybeasimple@gmail.com>
Date: Sun, 23 Jun 2013 14:15:22 +0400
Subject: [PATCH 0131/1587] move accepts_nested_attributes_for to attributes
 section

---
 snippets/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index b9fbf2174..c7cad047b 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -164,6 +164,8 @@ snippet atp
 	attr_protected :${1:attr_names}
 snippet ata
 	attr_accessible :${1:attr_names}
+snippet ana
+	accepts_nested_attributes_for :${1:association}
 snippet ivc
 	@${1:variable_name} ||= ${2:chached_value}
 # include Enumerable
@@ -1001,5 +1003,3 @@ snippet shared
 	shared_examples "${1:shared examples name}" ${2}
 snippet itb
 	it_behaves_like "${1:shared examples name}"${2}
-snippet ana
-	accepts_nested_attributes_for :${1:association}

From c3403b2daa639370c24841ec62a6b75ead03badc Mon Sep 17 00:00:00 2001
From: babybeasimple <babybeasimple@gmail.com>
Date: Sun, 23 Jun 2013 14:18:05 +0400
Subject: [PATCH 0132/1587] make rspec section definiton comment more readable

---
 snippets/ruby.snippets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index c7cad047b..0b5d49cae 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -947,7 +947,9 @@ snippet tre
 	${3}
 snippet tref
 	t.references :${1:model}
-#rspec
+########################################
+# Rspec snippets - see below           #
+########################################
 snippet it
 	it "${1:spec_name}" do
 		${2}

From e3e7ab1b45dc264c7aa5348a677371f3d83e80ab Mon Sep 17 00:00:00 2001
From: babybeasimple <babybeasimple@gmail.com>
Date: Sun, 23 Jun 2013 14:45:32 +0400
Subject: [PATCH 0133/1587] add rspec shoulda matchers snippets

---
 snippets/ruby.snippets | 59 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 0b5d49cae..66c5d1a66 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -1005,3 +1005,62 @@ snippet shared
 	shared_examples "${1:shared examples name}" ${2}
 snippet itb
 	it_behaves_like "${1:shared examples name}"${2}
+#ShouldaMatchers#ActionController
+snippet sfp
+	it { should filter_param :${1:key} }
+snippet srt
+	it { should redirect_to ${1:url} }
+snippet srtp
+	it { should render_template ${1} }
+snippet srwl
+	it { should render_with_layout ${1} }
+snippet srf
+	it { should rescue_from ${1:exception} }
+snippet srw
+	it { should respond_with ${1:status} }
+snippet sr
+	it { should route(:${1:method}, '${2:path}') }
+snippet sss
+	it { should set_session :${1:key} }
+snippet ssf
+	it { should set_the_flash('${1}') }
+#ShouldaMatchers#ActiveModel
+snippet sama
+	it { should allow_mass_assignment_of :${1} }
+snippet sav
+	it { should allow_value(${1}) }
+snippet see
+	it { should ensure_exclusion_of :${1} }
+snippet sei
+	it { should ensure_inclusion_of :${1} }
+snippet sel
+	it { should ensure_length_of :${1} }
+snippet sva
+	it { should validate_acceptance_of :${1} }
+snippet svc
+	it { should validate_confirmation_of :${1} }
+snippet svn
+	it { should validate_numericality_of :${1} }
+snippet svp
+	it { should validate_presence_of :${1} }
+snippet svu
+	it { should validate_uniqueness_of :${1} }
+#ShouldaMatchers#ActiveRecord
+snippet sana
+	it { should accept_nested_attributes_for :${1} }
+snippet sb
+	it { should belong_to :${1} }
+snippet shbtm
+	it { should have_and_belong_to_many :${1} }
+snippet shc
+	it { should have_db_column :${1} }
+snippet shi
+	it { should have_db_index :${1} }
+snippet shm
+	it { should have_many :${1} }
+snippet sho
+	it { should have_one :${1} }
+snippet shroa
+	it { should have_readonly_attribute :${1} }
+snippet ss
+	it { should serialize :${1} }

From 9ffd166a55d4d153c1c27de55789b502c3936dde Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 23 Jun 2013 13:31:33 +0200
Subject: [PATCH 0134/1587] fixes, add link to discussion page

---
 README.md              | 6 ++++++
 snippets/ruby.snippets | 2 ++
 snippets/vim.snippets  | 6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 849d0664e..ef76dedf4 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,12 @@ get vim-dev plugin which has function completion
 
 Thus for conditions (while, if ..) and block bodies just use ${N} - Thanks
 
+Open questions:
+What about one line if ee then .. else .. vs if \n .. then \n ... \n else \n .. ?
+What about wh(ile), which trigger?
+Discuss at: https://github.com/honza/vim-snippets/issues/230
+
+
 Related repositories
 ====================
 We also encourage people to maintain sets of snippets for particular use cases
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 9813c8e88..7744857ed 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -164,6 +164,8 @@ snippet atp
 	attr_protected :${1:attr_names}
 snippet ata
 	attr_accessible :${1:attr_names}
+
+# ivc == instance variable cache
 snippet ivc
 	@${1:variable_name} ||= ${2:chached_value}
 # include Enumerable
diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index 98cb51e35..a92cd136c 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -23,9 +23,9 @@ snippet for
 		${3}
 	endfor
 snippet forkv
-	for [a,b] in items({2})
-		${3}
-            unlet a b
+	for [${1},${2}] in items(${3})
+		${4}
+            unlet $1 $2
 	endfor
 
 snippet wh

From efb571e2c53e5b24fb174fab90b5d1a82d856e39 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Sun, 23 Jun 2013 12:52:07 -0300
Subject: [PATCH 0135/1587] Place together ruby on rails migrations snippets

---
 snippets/ruby.snippets | 106 ++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 59 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index d0e7801c5..f48b4e3e8 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -826,51 +826,6 @@ snippet sweeper
 			expire_page
 		end
 	end
-snippet tcb
-	t.boolean :${1:title}
-	${2}
-snippet tcbi
-	t.binary :${1:title}, :limit => ${2:2}.megabytes
-	${3}
-snippet tcd
-	t.decimal :${1:title}, :precision => ${2:10}, :scale => ${3:2}
-	${4}
-snippet tcda
-	t.date :${1:title}
-	${2}
-snippet tcdt
-	t.datetime :${1:title}
-	${2}
-snippet tcf
-	t.float :${1:title}
-	${2}
-snippet tch
-	t.change :${1:name}, :${2:string}, :${3:limit} => ${4:80}
-	${5}
-snippet tci
-	t.integer :${1:title}
-	${2}
-snippet tcl
-	t.integer :lock_version, :null => false, :default => 0
-	${1}
-snippet tcr
-	t.references :${1:taggable}, :polymorphic => { :default => '${2:Photo}' }
-	${3}
-snippet tcs
-	t.string :${1:title}
-	${2}
-snippet tct
-	t.text :${1:title}
-	${2}
-snippet tcti
-	t.time :${1:title}
-	${2}
-snippet tcts
-	t.timestamp :${1:title}
-	${2}
-snippet tctss
-	t.timestamps
-	${1}
 snippet va validates_associated
 	validates_associated :${1:attribute}
 snippet va validates .., :acceptance => true
@@ -909,7 +864,9 @@ snippet test
 	test "should ${1:do something}" do
 		${2}
 	end
-#migrations
+###########################
+#   migrations snippets   #
+###########################
 snippet mac
 	add_column :${1:table_name}, :${2:column_name}, :${3:data_type}
 snippet mai
@@ -948,20 +905,51 @@ snippet tre
 	${3}
 snippet tref
 	t.references :${1:model}
-########################################
-# Rspec snippets - see below           #
-########################################
-snippet it
-	it "${1:spec_name}" do
-		${2}
-	end
-snippet itp
-	it "${1:spec_name}"
+snippet tcb
+	t.boolean :${1:title}
+	${2}
+snippet tcbi
+	t.binary :${1:title}, :limit => ${2:2}.megabytes
+	${3}
+snippet tcd
+	t.decimal :${1:title}, :precision => ${2:10}, :scale => ${3:2}
+	${4}
+snippet tcda
+	t.date :${1:title}
+	${2}
+snippet tcdt
+	t.datetime :${1:title}
+	${2}
+snippet tcf
+	t.float :${1:title}
+	${2}
+snippet tch
+	t.change :${1:name}, :${2:string}, :${3:limit} => ${4:80}
+	${5}
+snippet tci
+	t.integer :${1:title}
+	${2}
+snippet tcl
+	t.integer :lock_version, :null => false, :default => 0
+	${1}
+snippet tcr
+	t.references :${1:taggable}, :polymorphic => { :default => '${2:Photo}' }
+	${3}
+snippet tcs
+	t.string :${1:title}
 	${2}
-snippet its
-	its(:${1:method}) { should ${2} }
-snippet itsn
-	its(:${1:method}) { should_not ${2} }
+snippet tct
+	t.text :${1:title}
+	${2}
+snippet tcti
+	t.time :${1:title}
+	${2}
+snippet tcts
+	t.timestamp :${1:title}
+	${2}
+snippet tctss
+	t.timestamps
+	${1}
 snippet desc
 	describe ${1:class_name} do
 		${2}

From acb135cfadf55d81d45d8222e540660b9f946aef Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Sun, 23 Jun 2013 12:55:53 -0300
Subject: [PATCH 0136/1587] Refactor some ruby rspec/shoulda snippets and add
 new ones

---
 snippets/ruby.snippets | 46 ++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index f48b4e3e8..c38c74e0d 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -950,16 +950,17 @@ snippet tcts
 snippet tctss
 	t.timestamps
 	${1}
+##########################
+#     Rspec snippets     #
+##########################
 snippet desc
 	describe ${1:class_name} do
 		${2}
 	end
 snippet descm
-	describe "#${1:method}" do
-		pending "Not implemented"
+	describe "${1:#method}" do
+		${2:pending "Not implemented"}
 	end
-
-	${2}
 snippet cont
 	context "${1:message}" do
 		${2}
@@ -973,9 +974,9 @@ snippet aft
 		${2}
 	end
 snippet let
-	let(:${1:object}) ${2:block}
+	let(:${1:object}) ${2}
 snippet let!
-	let!(:${1:object}) ${2:block}
+	let!(:${1:object}) ${2}
 snippet subj
 	subject { ${1} }
 snippet s.
@@ -986,14 +987,23 @@ snippet exp
 	expect { ${1:object} }.to ${2}
 snippet raise
 	expect { ${1:object} }.to raise_error ${2:StandardError}, /${3:message_regex}/
-snippet btr
-	be_true
-snippet bfa
-	be_false
 snippet shared
-	shared_examples "${1:shared examples name}" ${2}
+	shared_examples ${1:"shared examples name"}
 snippet itb
-	it_behaves_like "${1:shared examples name}"${2}
+	it_behaves_like ${1:"shared examples name"}
+snippet it
+	it "${1:spec_name}" do
+		${2}
+	end
+snippet itp
+	it "${1:spec_name}"
+	${2}
+snippet its
+	its(:${1:method}) { should ${2} }
+snippet itsh
+	it { should ${1} }
+snippet itsn
+	it { should_not ${1} }
 #ShouldaMatchers#ActionController
 snippet sfp
 	it { should filter_param :${1:key} }
@@ -1017,7 +1027,7 @@ snippet ssf
 snippet sama
 	it { should allow_mass_assignment_of :${1} }
 snippet sav
-	it { should allow_value(${1}) }
+	it { should allow_value(${1}).for :${2} }
 snippet see
 	it { should ensure_exclusion_of :${1} }
 snippet sei
@@ -1037,19 +1047,25 @@ snippet svu
 #ShouldaMatchers#ActiveRecord
 snippet sana
 	it { should accept_nested_attributes_for :${1} }
-snippet sb
+snippet sbt
 	it { should belong_to :${1} }
+snippet sbtcc
+	it { should belong_to(:${1}).counter_cache ${2:true} }
 snippet shbtm
 	it { should have_and_belong_to_many :${1} }
+snippet sbv
+	it { should be_valid }${1}
 snippet shc
 	it { should have_db_column :${1} }
 snippet shi
 	it { should have_db_index :${1} }
 snippet shm
 	it { should have_many :${1} }
+snippet shmt
+	it { should have_many(:${1}).through :${2} }
 snippet sho
 	it { should have_one :${1} }
-snippet shroa
+snippet shro
 	it { should have_readonly_attribute :${1} }
 snippet ss
 	it { should serialize :${1} }

From 93c19d9899e85583f25224a72f85c925adc6d7d3 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Sun, 23 Jun 2013 13:26:47 -0300
Subject: [PATCH 0137/1587] Fix policies explanation for default triggers and
 some typos

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ef76dedf4..1b623689a 100644
--- a/README.md
+++ b/README.md
@@ -53,8 +53,8 @@ garbas/vim-snipmate and cope with the minor bugs found in the engine.
 
 Policies / for contributors
 ===========================
-some snippets are useful for all languages, so let's try to have the same
-triggers for all languages:
+Some snippets are useful for almost all languages, so let's try to have the same
+triggers for them:
 
 ```
 if : if without else
@@ -69,14 +69,14 @@ aliasing. Then you can remap "else" to "el" or the like.
 
 Don't add stupid placeholder default texts like
 ```
-if (${1:condition){
+if (${1:condition}){
   ${2:some code here}
 }
 ```
 instead use:
 
 ```
-if (${1){
+if (${1}){
   ${2}
 }
 ```

From fa5def93a130715bd02d14c4a6c332045acb6cba Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Sun, 23 Jun 2013 13:27:35 -0300
Subject: [PATCH 0138/1587] Add iurifq to Elixir maintenance and to AUTHORS
 file

---
 AUTHORS   | 1 +
 README.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 22a322905..1891f2615 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,7 @@ Elliot Murphy
 Eustaquio Rangel
 Henrik Nyh
 Honza Pokorny
+Iuri Fernandes Queiroz
 Jakub Nawalaniec
 James F. Herdman
 Jon Bernard
diff --git a/README.md b/README.md
index 1b623689a..35eac1bc7 100644
--- a/README.md
+++ b/README.md
@@ -178,6 +178,7 @@ vim-snippets is not like the "linux kernel".
 * PHP - [chrisyue](http://github.com/chrisyue)
 * Scala - [gorodinskiy](https://github.com/gorodinskiy)
 * Falcon - [steveno](https://github.com/steveno)
+* Elixir - [iurifq](https://github.com/iurifq)
 
 Contributing notes
 ------------------

From a8d936b0e8e5fd97c95622e4e6ed00a9b628e092 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Tue, 25 Jun 2013 21:40:02 -0300
Subject: [PATCH 0139/1587] Add snippet for do to elixir snippets

---
 snippets/elixir.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 9c562adda..50243a705 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -1,3 +1,7 @@
+snippet do
+	do
+		${1}
+	end
 snippet if if .. do .. end
 	if ${1} do
 		${2}

From 9ab873b6eaa228d3b5ed0a6641bd812a4030d18b Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Wed, 26 Jun 2013 09:48:50 +0800
Subject: [PATCH 0140/1587] A docstring C change img/inc/fig snippet into id U
 update em/st with CJK detection

---
 UltiSnips/rst.snippets | 120 ++++++++++++++++++++++++++---------------
 1 file changed, 77 insertions(+), 43 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index cdc2a7791..f65031890 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -4,6 +4,7 @@
 #                              General Stuff                              #
 ###########################################################################
 global !p
+import vim
 from os import path as ospath
 from string import Template
 import re
@@ -29,17 +30,32 @@ DIRECTIVES = ['topic','sidebar','math','epigraph',
               'raw']
 
 NONE_CONTENT_DIRECTIVES = ['rubric', 'contents', 'header',
-                           'footer', 'date', 'include', 'title'
-                          ]
-INCLUDABLE_DIRECTIVES_INDEX = {'img':'image',
-                                'fig':'figure',
-                                'inc':'include'}
+                           'footer', 'date', 'include', 'title']
+
+INCLUDABLE_DIRECTIVES = ['image', 'figure', 'include']
+# CJK chars
+# http://stackoverflow.com/questions/2718196/find-all-chinese-text-in-a-string-using-python-and-regex
+CJK_RE = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-鿃豈-鶴侮-頻並-龎]', re.UNICODE)
+
+
+def has_cjk(char):
+    """
+    Detect char contains CJK character
+    
+    :param char: characters needs to be detect 
+    """
+    try:
+        CJK_RE.finditer(char).next()
+    except StopIteration:
+        return False
+    else:
+        return True
 
 def real_filename(filename):
-    # peal extension name off if possible
+    """peal extension name off if possible
     # i.e. "foo.bar.png will return "foo.bar"
-    names=filename.split('.')
-    return ".".join(names[:-1]) if len(names) > 1 else filename
+	"""
+    return ospath.splitext(filename)[0]
 
 def check_file_exist(rst_path, relative_path):
     """
@@ -53,8 +69,6 @@ def check_file_exist(rst_path, relative_path):
     if ospath.isfile(abs_path):
         return abs_path
 
-#TODO: File preview
-#TODO: File list complete
 
 def rst_char_len(char):
     """ 
@@ -91,23 +105,40 @@ def look_up_directives(regex, fpath):
 
     :return: list, empty list if nothing match
     """
-    with open(fpath) as source:
-        match = re.findall(regex, source.read())
+    try:
+        with open(fpath) as source:
+            match = re.findall(regex, source.read())
+    except IOError:
+        match = []
     return match
 
 
-def get_popular_code_type(path):
-    # find most popular code type in the given rst
-    types = look_up_directives(r'[:|\.\.\s]code::?\s(\w+)', path)
+def get_popular_code_type():
+    """
+    find most popular code type in the given rst
+
+    :param path: file to detect
+
+    :return: string, most popular code type in file
+    """
+    buf = "".join(vim.current.buffer)
+    types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', buf)
     try:
         popular_type = Counter(types).most_common()[0][0]
     except IndexError:
         popular_type = "lua" # Don't break default
-
     return popular_type
  
 
 def complete(t, opts):
+    """
+    get options that start with t
+
+    :param t: query string
+    :param opts: list that needs to be completed
+
+    :return: a string that start with t
+    """
     msg = "({0})"
     if t:
         opts = [ m[len(t):] for m in opts if m.startswith(t) ]
@@ -165,22 +196,26 @@ $0
 endsnippet
 
 snippet em "Emphasize string" i
-*${1:${VISUAL:Em}}* $0
-endsnippet
-
-# the CJK characters doesn't had space to sperate them, like "我强调"
-# should be "我\ *强调*\ "
-# Therefor we need special snippet
-snippet ec "Emphasize string (CJK)" w
-\ *${1:${VISUAL:Em}}*\ $0
+`!p
+# dirty but works with CJK charactor detection
+if has_cjk(vim.current.line):
+    snip.rv ="\ "`*${1:${VISUAL:Em}}*`!p
+if has_cjk(vim.current.line): 
+    snip.rv ="\ "
+else:
+    snip.rv = " "
+`$0
 endsnippet
 
 snippet st "Strong string" i
-**${1:${VISUAL:Strong}}** $0
-endsnippet
-
-snippet sc "Strong string (CJK)" w
-\ **${1:${VISUAL:Strong}}**\ $0
+`!p 
+if has_cjk(vim.current.line):
+    snip.rv ="\ "`**${1:${VISUAL:Strong}}**`!p
+if has_cjk(vim.current.line): 
+    snip.rv ="\ "
+else:
+    snip.rv = " "
+`$0
 endsnippet
 
 snippet "li(st)? (?P<num>\d+)" "List" br
@@ -201,7 +236,7 @@ endsnippet
 #                         More Specialized Stuff.                         #
 ###########################################################################
 snippet cb "Code Block" b
-.. code-block:: ${1:`!p snip.rv = get_popular_code_type(path)`}
+.. code-block:: ${1:`!p snip.rv = get_popular_code_type()`}
 
    ${2:code}
 
@@ -210,29 +245,28 @@ endsnippet
 
 # match snippets :
 # img, inc, fig
-snippet "(?P<shortcut>^img|inc|fig)" "Includable Block" !br
+snippet id "Includable Directives" b
 `!p 
-#TODO: Import img.template in rst relative path?
-real_name=real_filename(ospath.basename(t[1]))
-di=INCLUDABLE_DIRECTIVES_INDEX.get(match.groupdict()['shortcut'], 'include')
+real_name=real_filename(ospath.basename(t[2]))
+di=t[1][:2]
+
 link=""
 content=""
 
-if di in ['image']:
-    link = "|{0}| ".format(real_name)
+if di == 'im':
+    link = "|{0}|".format(real_name)
 
-if di == 'figure':
+if di == 'fi':
     content="""
     :alt: {0}
     {0}""".format(real_name)
-
-snip.rv = ".. {link}{di}:: ".format(di=di,link=link)
-`${1:file}`!p if content:
+`
+..`!p snip.rv = " %s" % link if link else ""` $1`!p snip.rv=complete(t[1], INCLUDABLE_DIRECTIVES)`:: ${2:file}`!p if content:
     snip.rv +="    "+content`
 `!p
 # Tip of whether file is exist in comment type
-if not check_file_exist(path, t[1]):
-    snip.rv='.. FILE {0} does not exist'.format(t[1])
+if not check_file_exist(path, t[2]):
+    snip.rv='.. FILE {0} does not exist'.format(t[2])
 else:
     snip.rv=""
 `$0
@@ -259,7 +293,7 @@ $0
 endsnippet
 
 #it will be trigger at start of line or after a word
-snippet ro "Text Roles" b
+snippet ro "Text Roles" w
 \ :$1`!p snip.rv=complete(t[1],
                           TEXT_ROLES+look_up_directives(TEXT_ROLES_REGEX,
                                                         path))`:\`$2\`\ 

From 92eb5c6363ef929477fc4b3c5ae7292c6b98da4d Mon Sep 17 00:00:00 2001
From: Meng Zhuo <mengzhuo1203@gmail.com>
Date: Wed, 26 Jun 2013 13:57:08 +0800
Subject: [PATCH 0141/1587] CMT update li comment

---
 UltiSnips/rst.snippets | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index f65031890..88e0caafb 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -221,14 +221,17 @@ endsnippet
 snippet "li(st)? (?P<num>\d+)" "List" br
 $0
 `!p
+# usage: li 4<tab>
+# which will extand into a unordered list contains 4 items
 snip.rv = make_items(match.groupdict()['num'])
 `
 endsnippet
 
-# usage: ol 3<tab>
 snippet "ol(st)? (?P<num>\d+)" "Order List" br
 $0
 `!p
+# usage: ol 4<tab>
+# which will extand into a ordered list contains 4 items
 snip.rv = make_items(match.groupdict()['num'], 1)
 `
 endsnippet

From 17b4633bdc53156f4303bd99ad898756c069ab07 Mon Sep 17 00:00:00 2001
From: Tobie Warburton <tobie.warburton@gmail.com>
Date: Wed, 26 Jun 2013 10:42:22 +0100
Subject: [PATCH 0142/1587] added __unicode__ python snippet

---
 snippets/python.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index fcce99fec..7007a99b1 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -2,6 +2,9 @@ snippet #!
 	#!/usr/bin/env python
 snippet imp
 	import ${1:module}
+snippet uni
+	def __unicode__(self):
+		${1:representation}
 snippet from
 	from ${1:package} import ${2:module}
 # Module Docstring
@@ -13,6 +16,7 @@ snippet docs
 	Github: `g:snips_github`
 	Description: ${2}
 	"""
+
 snippet wh
 	while ${1:condition}:
 		${2}

From dc336dcd497991c00fb5a6f35eed0213687cc310 Mon Sep 17 00:00:00 2001
From: aisensiy <aisensiy@gmail.com>
Date: Thu, 27 Jun 2013 16:00:14 +0800
Subject: [PATCH 0143/1587] ruby test assert_diff with a chance to set value

---
 snippets/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index c38c74e0d..2c9344822 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -596,8 +596,8 @@ snippet artp
 snippet artpp
 	assert_redirected_to ${1:model}s_path
 snippet asd
-	assert_difference "${1:Model}.${2:count}", $1 do
-		${3}
+	assert_difference "${1:Model}.${2:count}", ${3:1} do
+		${4}
 	end
 snippet asnd
 	assert_no_difference "${1:Model}.${2:count}" do

From 9573b83de48300ce3fba0c34ea3817e61065383b Mon Sep 17 00:00:00 2001
From: Vladimir Rybas <vladimirrybas@gmail.com>
Date: Sat, 29 Jun 2013 08:42:22 +0700
Subject: [PATCH 0144/1587] Duplicated Ruby snippet `sel`

---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 2c9344822..cc2addcae 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -1032,7 +1032,7 @@ snippet see
 	it { should ensure_exclusion_of :${1} }
 snippet sei
 	it { should ensure_inclusion_of :${1} }
-snippet sel
+snippet itsel
 	it { should ensure_length_of :${1} }
 snippet sva
 	it { should validate_acceptance_of :${1} }

From 6fbe9913f23f276fde87c2ba19b43e7946aea8ac Mon Sep 17 00:00:00 2001
From: babybeasimple <babybeasimple@gmail.com>
Date: Sat, 29 Jun 2013 17:35:56 +0400
Subject: [PATCH 0145/1587] refactor (ruby.snippet) new pattern for rspec
 snippets

---
 snippets/ruby.snippets | 71 ++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index cc2addcae..8734d8079 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -989,83 +989,80 @@ snippet raise
 	expect { ${1:object} }.to raise_error ${2:StandardError}, /${3:message_regex}/
 snippet shared
 	shared_examples ${1:"shared examples name"}
-snippet itb
+snippet ibl
 	it_behaves_like ${1:"shared examples name"}
 snippet it
 	it "${1:spec_name}" do
 		${2}
 	end
-snippet itp
-	it "${1:spec_name}"
-	${2}
 snippet its
 	its(:${1:method}) { should ${2} }
-snippet itsh
+snippet is
 	it { should ${1} }
-snippet itsn
+snippet isn
 	it { should_not ${1} }
 #ShouldaMatchers#ActionController
-snippet sfp
+snippet isfp
 	it { should filter_param :${1:key} }
-snippet srt
+snippet isrt
 	it { should redirect_to ${1:url} }
-snippet srtp
+snippet isrtp
 	it { should render_template ${1} }
-snippet srwl
+snippet isrwl
 	it { should render_with_layout ${1} }
-snippet srf
+snippet isrf
 	it { should rescue_from ${1:exception} }
-snippet srw
+snippet isrw
 	it { should respond_with ${1:status} }
-snippet sr
+snippet isr
 	it { should route(:${1:method}, '${2:path}') }
-snippet sss
+snippet isss
 	it { should set_session :${1:key} }
-snippet ssf
+snippet issf
 	it { should set_the_flash('${1}') }
 #ShouldaMatchers#ActiveModel
-snippet sama
+snippet isama
 	it { should allow_mass_assignment_of :${1} }
-snippet sav
+snippet isav
 	it { should allow_value(${1}).for :${2} }
-snippet see
+snippet isee
 	it { should ensure_exclusion_of :${1} }
-snippet sei
+snippet isei
 	it { should ensure_inclusion_of :${1} }
-snippet itsel
+snippet isel
 	it { should ensure_length_of :${1} }
-snippet sva
+snippet isva
 	it { should validate_acceptance_of :${1} }
-snippet svc
+snippet isvc
 	it { should validate_confirmation_of :${1} }
-snippet svn
+snippet isvn
 	it { should validate_numericality_of :${1} }
-snippet svp
+snippet isvp
 	it { should validate_presence_of :${1} }
-snippet svu
+snippet isvu
 	it { should validate_uniqueness_of :${1} }
 #ShouldaMatchers#ActiveRecord
-snippet sana
+snippet isana
 	it { should accept_nested_attributes_for :${1} }
-snippet sbt
+snippet isbt
 	it { should belong_to :${1} }
-snippet sbtcc
+snippet isbtcc
 	it { should belong_to(:${1}).counter_cache ${2:true} }
-snippet shbtm
+snippet ishbtm
 	it { should have_and_belong_to_many :${1} }
-snippet sbv
+snippet isbv
 	it { should be_valid }${1}
-snippet shc
+snippet ishc
 	it { should have_db_column :${1} }
-snippet shi
+snippet ishi
 	it { should have_db_index :${1} }
-snippet shm
+snippet ishm
 	it { should have_many :${1} }
-snippet shmt
+snippet ishmt
 	it { should have_many(:${1}).through :${2} }
-snippet sho
+snippet isho
 	it { should have_one :${1} }
-snippet shro
+snippet ishro
 	it { should have_readonly_attribute :${1} }
-snippet ss
+snippet iss
 	it { should serialize :${1} }

From 8e678bd9037f2ad6bfa50d5002f74ab33377d179 Mon Sep 17 00:00:00 2001
From: Matt Stevens <matt@dirtymonkey.co.uk>
Date: Wed, 3 Jul 2013 12:17:40 +0100
Subject: [PATCH 0146/1587] Add snippet for pudb in Python

---
 AUTHORS                  | 1 +
 snippets/python.snippets | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 1891f2615..c5c68c6a7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -39,6 +39,7 @@ Dmitry Dementev
 Travis Holton
 Chrisyue
 Erik Westrup
+Matt Deacalion Stevens
 
 TODO: add contributors from github.com/SirVer/Ultisnip having contributed to
 github.com/SirVer/Ultisnip/UltiSnips/* files
diff --git a/snippets/python.snippets b/snippets/python.snippets
index 7007a99b1..e8dade287 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -131,6 +131,9 @@ snippet ipdb
 # ipython debugger (pdbbb)
 snippet pdbbb
 	import pdbpp; pdbpp.set_trace()
+# python console debugger (pudb)
+snippet pudb
+	import pudb; pudb.set_trace()
 snippet pprint
 	import pprint; pprint.pprint(${1})${2}
 snippet "

From 3f956a0f48c59e20ea84ef01a5b81ea2cf1c75b9 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iuri.fernandes@codeminer42.com>
Date: Fri, 5 Jul 2013 11:15:59 -0300
Subject: [PATCH 0147/1587] Add ruby snippets for "it { should respond_to
 :method }"

---
 snippets/ruby.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 8734d8079..1d344ac56 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -1066,3 +1066,7 @@ snippet ishro
 	it { should have_readonly_attribute :${1} }
 snippet iss
 	it { should serialize :${1} }
+snippet isres
+	it { should respond_to :${1} }
+snippet isresw
+	it { should respond_to(:${1}).with(${2}).arguments }

From a1d8992489328bb4d07bef059722c96f705b8687 Mon Sep 17 00:00:00 2001
From: kenshin54 <himurakenshin54@gmail.com>
Date: Sat, 6 Jul 2013 22:17:27 +0800
Subject: [PATCH 0148/1587] Add inline if snippet to c.

---
 snippets/c.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index 21c265d68..16a86e990 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -65,6 +65,9 @@ snippet elif
 	else if (${1:/* condition */}) {
 		${2}
 	}${3}
+# ifi
+snippet ifi
+	if (${1:/* condition */}) ${2};${3}
 # ternary
 snippet t
 	${1:/* condition */} ? ${2:a} : ${3:b}

From 80697bea6feb83c870a4fa5798e897d4561900f3 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 8 Jul 2013 03:41:11 +0200
Subject: [PATCH 0149/1587] replace Filename by vim_snippets#Filename and
 document it

It doesn't make sense that all snippet engines have to
keep this function somewhere
---
 UltiSnips/d.snippets      |  2 +-
 autoload/vim_snippets.vim | 27 +++++++++++++++++++++++++++
 snippets/c.snippets       |  8 ++++----
 snippets/coffee.snippets  |  8 ++++----
 snippets/cpp.snippets     |  6 +++---
 snippets/cs.snippets      | 24 ++++++++++++------------
 snippets/dart.snippets    |  4 ++--
 snippets/erlang.snippets  |  8 ++++----
 snippets/html.snippets    |  6 +++---
 snippets/java.snippets    |  8 ++++----
 snippets/objc.snippets    | 18 +++++++++---------
 snippets/perl.snippets    |  4 ++--
 snippets/php.snippets     | 14 +++++++-------
 snippets/puppet.snippets  |  4 ++--
 snippets/python.snippets  |  2 +-
 snippets/ruby.snippets    | 20 +++++++++++---------
 snippets/vim.snippets     |  2 +-
 17 files changed, 97 insertions(+), 68 deletions(-)
 create mode 100644 autoload/vim_snippets.vim

diff --git a/UltiSnips/d.snippets b/UltiSnips/d.snippets
index 94959514a..7f38c6d8d 100644
--- a/UltiSnips/d.snippets
+++ b/UltiSnips/d.snippets
@@ -576,7 +576,7 @@ snippet module "New module (module)" b
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-module ${2}.`!v Filename('$1', 'name')`;
+module ${2}.`!v vim_snippets#Filename('$1', 'name')`;
 
 
 ${3}
diff --git a/autoload/vim_snippets.vim b/autoload/vim_snippets.vim
new file mode 100644
index 000000000..061f171e7
--- /dev/null
+++ b/autoload/vim_snippets.vim
@@ -0,0 +1,27 @@
+" this is well known Filename found in snipmate (and the other engines), but
+" rewritten and documented :)
+"
+" optional arg1: string in which to replace '$1' by filename with extension
+"   and path dropped. Defaults to $1
+" optional arg2: return this value if buffer has no filename
+"  But why not use the template in this case, too?
+"  Doesn't make sense to me
+fun! vim_snippets#Filename(...)
+  let template = get(a:000, 0, "$1")
+  let arg2 = get(a:000, 1, "")
+
+  let basename = expand('%:t:r')
+
+  if basename == ''
+    return arg2
+  else
+    return substitute(template, '$1', basename, 'g')
+  endif
+endf
+
+" original code:
+" fun! Filename(...)
+"     let filename = expand('%:t:r')
+"     if filename == '' | return a:0 == 2 ? a:2 : '' | endif
+"     return !a:0 || a:1 == '' ? filename : substitute(a:1, '$1', filename, 'g')
+" endf
diff --git a/snippets/c.snippets b/snippets/c.snippets
index 16a86e990..757802438 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -20,7 +20,7 @@ snippet inc
 	#include <${1:stdio}.h>${2}
 # #include "..."
 snippet Inc
-	#include "${1:`Filename("$1.h")`}"${2}
+	#include "${1:`vim_snippets#Filename("$1.h")`}"${2}
 # ifndef...define...endif
 snippet ndef
 	#ifndef $1
@@ -41,7 +41,7 @@ snippet #if
 	#endif
 # header include guard
 snippet once
-	#ifndef ${1:`toupper(Filename('$1_H', 'UNTITLED_H'))`}
+	#ifndef ${1:`toupper(vim_snippets#Filename('$1_H', 'UNTITLED_H'))`}
 
 	#define $1
 
@@ -132,14 +132,14 @@ snippet td
 	typedef ${1:int} ${2:MyCustomType};${3}
 # struct
 snippet st
-	struct ${1:`Filename('$1_t', 'name')`} {
+	struct ${1:`vim_snippets#Filename('$1_t', 'name')`} {
 		${2:/* data */}
 	}${3: /* optional variable list */};${4}
 # typedef struct
 snippet tds
 	typedef struct ${2:_$1 }{
 		${3:/* data */}
-	} ${1:`Filename('$1_t', 'name')`};${4}
+	} ${1:`vim_snippets#Filename('$1_t', 'name')`};${4}
 # typedef enum
 snippet tde
 	typedef enum {
diff --git a/snippets/coffee.snippets b/snippets/coffee.snippets
index 21c2cc33e..8e2f20e0b 100644
--- a/snippets/coffee.snippets
+++ b/snippets/coffee.snippets
@@ -35,19 +35,19 @@ snippet bfun
 		${2:# body...}
 # Class
 snippet cla class ..
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		${2}
 snippet cla class .. constructor: ..
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		constructor: (${2:args}) ->
 			${3}
 
 		${4}
 snippet cla class .. extends ..
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
 		${3}
 snippet cla class .. extends .. constructor: ..
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
 		constructor: (${3:args}) ->
 			${4}
 
diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 52148e786..e95d35342 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -68,7 +68,7 @@ snippet mu
 ## Class
 # class
 snippet cl
-	class ${1:`Filename('$1', 'name')`}
+	class ${1:`vim_snippets#Filename('$1', 'name')`}
 	{
 	public:
 		$1(${2});
@@ -79,12 +79,12 @@ snippet cl
 	};
 # member function implementation
 snippet mfun
-	${4:void} ${1:`Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
+	${4:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
 		${5}
 	}
 # namespace
 snippet ns
-	namespace ${1:`Filename('', 'my')`} {
+	namespace ${1:`vim_snippets#Filename('', 'my')`} {
 		${2}
 	} /* namespace $1 */
 ##
diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index d93435141..9a915f094 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -116,49 +116,49 @@ snippet each
 	}
 # interfaces
 snippet interface
-	public interface ${1:`Filename()`} {
+	public interface ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet if+
-	public interface ${1:`Filename()`} {
+	public interface ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 # class bodies
 snippet class
-	public class ${1:`Filename()`} {
+	public class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls
-	${2:public} class ${1:`Filename()`} {
+	${2:public} class ${1:`vim_snippets#Filename()`} {
 		${3}
 	}
 snippet cls+
-	public class ${1:`Filename()`} {
+	public class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls+^
-	public static class ${1:`Filename()`} {
+	public static class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls&
-	internal class ${1:`Filename()`} {
+	internal class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls&^
-	internal static class ${1:`Filename()`} {
+	internal static class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls|
-	protected class ${1:`Filename()`} {
+	protected class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 snippet cls|%
-	protected abstract class ${1:`Filename()`} {
+	protected abstract class ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 # constructor
 snippet ctor
-	public ${1:`Filename()`}() {
+	public ${1:`vim_snippets#Filename()`}() {
 		${2}
 	}
 # properties - auto properties by default.
@@ -342,7 +342,7 @@ snippet ms-
 	}
 # structure
 snippet struct
-	public struct ${1:`Filename()`} {
+	public struct ${1:`vim_snippets#Filename()`} {
 		${2}
 	}
 # enumeration
diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index c7b56daf6..a74520022 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -22,9 +22,9 @@ snippet br
 snippet th
 	throw ${1}
 snippet cl
-	class ${1:`Filename("", "untitled")`} ${2}
+	class ${1:`vim_snippets#Filename("", "untitled")`} ${2}
 snippet in
-	interface ${1:`Filename("", "untitled")`} ${2}
+	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2}
 snippet imp
 	implements ${1}
 snippet ext
diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index 1199e8443..0837bb7cc 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -1,6 +1,6 @@
 # module and export all
 snippet mod
-	-module(${1:`Filename('', 'my')`}).
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
 
 	-compile([export_all]).
 
@@ -66,7 +66,7 @@ snippet %p
 	%% @private
 # OTP application
 snippet application
-	-module(${1:`Filename('', 'my')`}).
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
 
 	-behaviour(application).
 
@@ -84,7 +84,7 @@ snippet application
 	    ok.
 # OTP supervisor
 snippet supervisor
-	-module(${1:`Filename('', 'my')`}).
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
 
 	-behaviour(supervisor).
 
@@ -107,7 +107,7 @@ snippet supervisor
 	    {ok, {RestartStrategy, Children}}.
 # OTP gen_server
 snippet gen_server
-	-module(${1:`Filename('', 'my')`}).
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
 
 	-behaviour(gen_server).
 
diff --git a/snippets/html.snippets b/snippets/html.snippets
index 3615d4bed..a83089c81 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -412,7 +412,7 @@ snippet head
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
-		<title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+		<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 		${2}
 	</head>
 snippet header
@@ -450,7 +450,7 @@ snippet html5
 	<html>
 		<head>
 			<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-			<title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${2:meta}
 		</head>
 		<body>
@@ -795,7 +795,7 @@ snippet thead
 snippet time
 	<time datetime="${1}" pubdate="${2:$1}">${3:$1}</time>
 snippet title
-	<title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+	<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 snippet tr
 	<tr>
 		${1}
diff --git a/snippets/java.snippets b/snippets/java.snippets
index 4dc6ff069..a36e0f158 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -39,11 +39,11 @@ snippet j.u
 ##
 ## Class
 snippet cl
-	class ${1:`Filename("", "untitled")`} ${2}
+	class ${1:`vim_snippets#Filename("", "untitled")`} ${2}
 snippet in
-	interface ${1:`Filename("", "untitled")`} ${2:extends Parent}${3}
+	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2:extends Parent}${3}
 snippet tc
-	public class ${1:`Filename()`} extends ${2:TestCase}
+	public class ${1:`vim_snippets#Filename()`} extends ${2:TestCase}
 ##
 ## Class Enhancements
 snippet ext
@@ -144,7 +144,7 @@ snippet @au
 snippet @br
 	@brief ${1:Description}
 snippet @fi
-	@file ${1:`Filename()`}.java
+	@file ${1:`vim_snippets#Filename()`}.java
 snippet @pa
 	@param ${1:param}
 snippet @re
diff --git a/snippets/objc.snippets b/snippets/objc.snippets
index 3cf5a0a6d..c819c776a 100644
--- a/snippets/objc.snippets
+++ b/snippets/objc.snippets
@@ -3,7 +3,7 @@ snippet Imp
 	#import <${1:Cocoa/Cocoa.h}>${2}
 # #import "..."
 snippet imp
-	#import "${1:`Filename()`.h}"${2}
+	#import "${1:`vim_snippets#Filename()`.h}"${2}
 # @selector(...)
 snippet sel
 	@selector(${1:method}:)${3}
@@ -18,7 +18,7 @@ snippet log
 	NSLog(@"${1:%@}"${2});${3}
 # Class
 snippet objc
-	@interface ${1:`Filename('', 'someClass')`} : ${2:NSObject}
+	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
 	{
 	}
 	@end
@@ -28,33 +28,33 @@ snippet objc
 	@end
 # Class Interface
 snippet int
-	@interface ${1:`Filename('', 'someClass')`} : ${2:NSObject}
+	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
 	{${3}
 	}
 	${4}
 	@end
 snippet @interface
-	@interface ${1:`Filename('', 'someClass')`} : ${2:NSObject}
+	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
 	{${3}
 	}
 	${4}
 	@end
 # Class Implementation
 snippet impl
-	@implementation ${1:`Filename('', 'someClass')`}
+	@implementation ${1:`vim_snippets#Filename('', 'someClass')`}
 	${2}
 	@end
 snippet @implementation
-	@implementation ${1:`Filename('', 'someClass')`}
+	@implementation ${1:`vim_snippets#Filename('', 'someClass')`}
 	${2}
 	@end
 # Protocol
 snippet pro
-	@protocol ${1:`Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
+	@protocol ${1:`vim_snippets#Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
 	${3}
 	@end
 snippet @protocol
-	@protocol ${1:`Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
+	@protocol ${1:`vim_snippets#Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
 	${3}
 	@end
 # init Definition
@@ -87,7 +87,7 @@ snippet cat
 	@end
 # Category Interface
 snippet cath
-	@interface ${1:`Filename('$1', 'NSObject')`} (${2:MyCategory})
+	@interface ${1:`vim_snippets#Filename('$1', 'NSObject')`} (${2:MyCategory})
 	${3}
 	@end
 # Method
diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index cd3f459c8..48d3f2266 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -84,7 +84,7 @@ snippet fore
 	${1:expression} foreach @${2:array};${3}
 # Package
 snippet package
-	package ${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`};
+	package ${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`};
 
 	${2}
 
@@ -93,7 +93,7 @@ snippet package
 	__END__
 # Package syntax perl >= 5.14
 snippet packagev514
-	package ${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`} ${2:0.99};
+	package ${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`} ${2:0.99};
 
 	${3}
 
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 8b071fc1d..b85d96e6c 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -28,12 +28,12 @@ snippet use
 	use ${1:Foo\Bar\Baz};
 	${2}
 snippet	c
-	class ${1:`Filename()`}
+	class ${1:`vim_snippets#Filename()`}
 	{
 		${2}
 	}
 snippet i
-	interface ${1:`Filename()`}
+	interface ${1:`vim_snippets#Filename()`}
 	{
 		${2}
 	}
@@ -57,7 +57,7 @@ snippet sm
 	 *
 	 * @param ${2:$1} $$1 ${3:description}
 	 *
-	 * @return ${4:`Filename()`}
+	 * @return ${4:`vim_snippets#Filename()`}
 	 */
 	${5:public} function set${6:$2}(${7:$2 }$$1)
 	{
@@ -214,7 +214,7 @@ snippet interface
 	 * @package ${3:default}
 	 * @author ${4:`g:snips_author`}
 	 */
-	interface ${1:`Filename()`}
+	interface ${1:`vim_snippets#Filename()`}
 	{
 		${5}
 	}
@@ -223,7 +223,7 @@ snippet class
 	/**
 	 * ${1}
 	 */
-	class ${2:`Filename()`}
+	class ${2:`vim_snippets#Filename()`}
 	{
 		${3}
 		/**
@@ -237,7 +237,7 @@ snippet class
 snippet nc
 	namespace ${1:`substitute(substitute(expand("%:h"), '\v^\w+\/(\u)', '\1', ''), '\/', '\\\', 'g')`};
 
-	${2:abstract }class ${3:`Filename()`}
+	${2:abstract }class ${3:`vim_snippets#Filename()`}
 	{
 		${4}
 	}
@@ -366,7 +366,7 @@ snippet gs
 	 *
 	 * @param $2 $$1 ${5:description}
 	 *
-	 * @return ${6:`Filename()`}
+	 * @return ${6:`vim_snippets#Filename()`}
 	 */
 	public function set$3(${7:$2 }$$1)
 	{
diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index b8dbe504c..e95b9c7ae 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -5,11 +5,11 @@
 
 # Language Constructs
 snippet class
-	class ${1:`Filename('', 'name')`} {
+	class ${1:`vim_snippets#Filename('', 'name')`} {
 		${2}
 	}
 snippet node
-	node "${1:`Filename('', 'fqdn')`}" {
+	node "${1:`vim_snippets#Filename('', 'fqdn')`}" {
 		${2}
 	}
 snippet case
diff --git a/snippets/python.snippets b/snippets/python.snippets
index e8dade287..d8544cd17 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -10,7 +10,7 @@ snippet from
 # Module Docstring
 snippet docs
 	"""
-	File: ${1:`Filename('$1.py', 'foo.py')`}
+	File: ${1:`vim_snippets#Filename('$1.py', 'foo.py')`}
 	Author: `g:snips_author`
 	Email: `g:snips_email`
 	Github: `g:snips_github`
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 1d344ac56..9c994794f 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -88,23 +88,23 @@ snippet until
 		${2}
 	end
 snippet cla class .. end
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		${2}
 	end
 snippet cla class .. initialize .. end
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		def initialize(${2:args})
 			${3}
 		end
 	end
 snippet cla class .. < ParentClass .. initialize .. end
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < ${2:ParentClass}
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < ${2:ParentClass}
 		def initialize(${3:args})
 			${4}
 		end
 	end
 snippet cla ClassName = Struct .. do .. end
-	${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} = Struct.new(:${2:attr_names}) do
+	${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} = Struct.new(:${2:attr_names}) do
 		def ${3:method_name}
 			${4}
 		end
@@ -119,7 +119,7 @@ snippet cla class << self .. end
 	end
 # class .. < DelegateClass .. initialize .. end
 snippet cla-
-	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < DelegateClass(${2:ParentClass})
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < DelegateClass(${2:ParentClass})
 		def initialize(${3:args})
 			super(${4:del_obj})
 
@@ -127,17 +127,17 @@ snippet cla-
 		end
 	end
 snippet mod module .. end
-	module ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		${2}
 	end
 snippet mod module .. module_function .. end
-	module ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		module_function
 
 		${2}
 	end
 snippet mod module .. ClassMethods .. end
-	module ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		module ClassMethods
 			${2}
 		end
@@ -553,7 +553,7 @@ snippet clafn
 snippet sinc
 	class << self; self end
 snippet nam
-	namespace :${1:`Filename()`} do
+	namespace :${1:`vim_snippets#Filename()`} do
 		${2}
 	end
 snippet tas
@@ -1070,3 +1070,5 @@ snippet isres
 	it { should respond_to :${1} }
 snippet isresw
 	it { should respond_to(:${1}).with(${2}).arguments }
+snippet super_call
+      ${1:super_class}.instance_method(:${2:method}).bind(self).call
diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index a92cd136c..6dd502ff8 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -4,7 +4,7 @@ snippet header
 	" Description: ${3}
 	${4:" Last Modified: `strftime("%B %d, %Y")`}
 snippet guard
-	if exists('${1:did_`Filename()`}') || &cp${2: || version < 700}
+	if exists('${1:did_`vim_snippets#Filename()`}') || &cp${2: || version < 700}
 		finish
 	endif
 	let $1 = 1${3}

From 533fe487a1f7af9cbbf13db27dc75f501a13ce79 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 8 Jul 2013 23:44:03 +0200
Subject: [PATCH 0150/1587] ruby snippets:

use do dov for both engines
drop #TODO comments

changing defaults is bad, but I expect ruby folks to expect do to type
do ..

doo has the advantage to get a completion popup .. but its too long to
type

The UtiSnips do snippet didn't make sense: the nested placeholder still
didn't remove the space after the "do" when deleting it - so it was
written badly. Could be fixed, by why bother?

Thus learn do and dov and be happy forever. Would Do be a better choice
(upper case chars?) Don't know. This was used by UltiSnips.

Comment on this commit if you don't like this choice.
---
 UltiSnips/ruby.snippets | 116 ++++++++++++++++++++--------------------
 snippets/ruby.snippets  |  10 ++--
 2 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index 63365890d..306c7e10d 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -25,7 +25,7 @@ endsnippet
 
 snippet if "if <condition> ... end"
 if ${1:condition}
-	${2:# TODO}
+	${2}
 end
 endsnippet
 
@@ -33,9 +33,9 @@ endsnippet
 
 snippet ife "if <condition> ... else ... end"
 if ${1:condition}
-	${2:# TODO}
+	${2}
 else
-	${3:# TODO}
+	${3}
 end
 endsnippet
 
@@ -43,11 +43,11 @@ endsnippet
 
 snippet ifee "if <condition> ... elseif <condition> ... else ... end"
 if ${1:condition}
-	${2:# TODO}
+	${2}
 elsif ${3:condition}
-	${4:# TODO}
+	${4}
 else
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -55,7 +55,7 @@ endsnippet
 
 snippet unless "unless <condition> ... end"
 unless ${1:condition}
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -63,9 +63,9 @@ endsnippet
 
 snippet unlesse "unless <condition> ... else ... end"
 unless ${1:condition}
-	${2:# TODO}
+	${2}
 else
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -73,11 +73,11 @@ endsnippet
 
 snippet unlesee "unless <condition> ... elseif <condition> ... else ... end"
 unless ${1:condition}
-	${2:# TODO}
+	${2}
 elsif ${3:condition}
-	${4:# TODO}
+	${4}
 else
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -85,7 +85,7 @@ endsnippet
 
 snippet "\b(de)?f" "def <name>..." r
 def ${1:function_name}${2: ${3:*args}}
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -93,7 +93,7 @@ endsnippet
 
 snippet defi "def initialize ..."
 def initialize${1: ${2:*args}}
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -101,23 +101,23 @@ endsnippet
 
 snippet defr "def <name> ... rescue ..."
 def ${1:function_name}${2: ${3:*args}}
-	${4:# TODO}
+	${4}
 rescue
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet For "(<from>..<to>).each { |<i>| <block> }"
-(${1:from}..${2:to}).each { |${3:i}| ${4:# TODO} }
+(${1:from}..${2:to}).each { |${3:i}| ${4} }
 endsnippet
 
 
 
 snippet for "(<from>..<to>).each do |<i>| <block> end"
 (${1:from}..${2:to}).each do |${3:i}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -138,42 +138,42 @@ endsnippet
 
 
 snippet "(\S+)\.Del(ete)?_?if" ".delete_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3} }
 endsnippet
 
 
 
 snippet "(\S+)\.del(ete)?_?if" ".delete_if do |<key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.delete_if do |${1:key},${2:value}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Keep_?if" ".keep_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3} }
 endsnippet
 
 
 
 snippet "(\S+)\.keep_?if" ".keep_if do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.keep_if do |${1:key},${2:value}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Reject" ".reject { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3} }
 endsnippet
 
 
 
 snippet "(\S+)\.reject" ".reject do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.reject do |${1:key},${2:value}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -194,56 +194,56 @@ endsnippet
 
 
 snippet "(\S+)\.Sort" ".sort { |<a>,<b>| <block> }" r
-`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3} }
 endsnippet
 
 
 
 snippet "(\S+)\.sort" ".sort do |<a>,<b>| <block> end" r
 `!p snip.rv=match.group(1)`.sort do |${1:a},${2:b}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Each_?k(ey)?" ".each_key { |<key>| <block> }" r
-`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2:# TODO} }
+`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2} }
 endsnippet
 
 
 
 snippet "(\S+)\.each_?k(ey)?" ".each_key do |key| <block> end" r
 `!p snip.rv=match.group(1)`.each_key do |${1:key}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Each_?val(ue)?" ".each_value { |<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2:# TODO} }
+`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2} }
 endsnippet
 
 
 
 snippet "(\S+)\.each_?val(ue)?" ".each_value do |<value>| <block> end" r
 `!p snip.rv=match.group(1)`.each_value do |${1:value}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet Each "<elements>.each { |<element>| <block> }"
-${1:elements}.each { |${2:${1/s$//}}| ${3:# TODO} }
+${1:elements}.each { |${2:${1/s$//}}| ${3} }
 endsnippet
 
 
 
 snippet each "<elements>.each do |<element>| <block> end"
 ${1:elements}.each do |${2:${1/s$//}}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -251,14 +251,14 @@ endsnippet
 
 snippet each_?s(lice)? "<array>.each_slice(n) do |slice| <block> end"
 each_slice(${1:2}) do |${2:slice}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
 
 
 snippet Each_?s(lice)? "<array>.each_slice(n) { |slice| <block> }"
-each_slice(${1:2}) { |${2:slice}| ${3:# TODO} }
+each_slice(${1:2}) { |${2:slice}| ${3} }
 endsnippet
 
 
@@ -273,7 +273,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| ${2} }
 endsnippet
 
 
@@ -288,7 +288,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -303,7 +303,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| ${2} }
 endsnippet
 
 
@@ -318,7 +318,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -333,7 +333,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| ${2} }
 endsnippet
 
 
@@ -348,7 +348,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -364,7 +364,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`},${2:i}| ${3:# TODO} }$0
+`},${2:i}| ${3} }$0
 endsnippet
 
 
@@ -379,7 +379,7 @@ try:
 except:
 	snip.rv = 'element'
 `},${2:i}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -387,14 +387,14 @@ endsnippet
 
 
 snippet "(\S+)\.Each_?p(air)?"  ".each_pair { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3} }
 endsnippet
 
 
 
 snippet "(\S+)\.each_?p(air)?" ".each_pair do |<key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.each_pair do |${1:key},${2:value}|
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -424,26 +424,24 @@ snippet "(\S+)\.Index" ".index do |item| ... end" r
 end
 endsnippet
 
-
-
-snippet do "do |<key>| ... end" i
-do ${1:|${2:key}|}
+# comments about do and dov see snippets/ruby.snippets
+snippet do "do ... end" i
+do
 	$0
 end
 endsnippet
 
-
-
-snippet Do "do ... end" i
-do
-	$0
+snippet dov "do |<key>| ... end" i
+do |${0:v}|
+	$1
 end
 endsnippet
 
 
+
 snippet until "until <expression> ... end"
 until ${1:expression}
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -451,7 +449,7 @@ endsnippet
 
 snippet Until "begin ... end until <expression>"
 begin
-	${0:# TODO}
+	${0}
 end until ${1:expression}
 endsnippet
 
@@ -459,7 +457,7 @@ endsnippet
 
 snippet while "while <expression> ... end"
 while ${1:expression}
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
@@ -467,7 +465,7 @@ endsnippet
 
 snippet While "begin ... end while <expression>"
 begin
-	${0:# TODO}
+	${0}
 end while ${1:expression}
 endsnippet
 
@@ -493,9 +491,9 @@ endsnippet
 
 snippet begin "begin ... rescue ... end"
 begin
-	${1:# TODO}
+	${1}
 rescue
-	${0:# TODO}
+	${0}
 end
 endsnippet
 
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 9c994794f..73db3667d 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -413,13 +413,17 @@ snippet seld
 	end
 snippet lam
 	lambda { |${1:args}| ${2} }
-snippet doo
+# I'm pretty sure that ruby users expect do to expand to do .. end
+snippet do
 	do
 		${1}
 	end
+# this is for one or more variables. typing a ", " is that cheap that it may
+# not be worth adding another snippet. should 0/1 placeholders change order?
+# its a good idea to think about the var name, so use it first
 snippet dov
-	do |${1:variable}|
-		${2}
+	do |${0:v}|
+		${1}
 	end
 snippet :
 	:${1:key} => ${2:"value"}${3}

From 52f500fd07e1420446da9d43b5a4e62b5b0add82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Wed, 10 Jul 2013 15:52:40 +0200
Subject: [PATCH 0151/1587] Add erlang common_test testsuite snippet

---
 snippets/erlang.snippets | 190 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 190 insertions(+)

diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index 0837bb7cc..cfad09a36 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -157,4 +157,194 @@ snippet gen_server
 	%%%===================================================================
 	%%% Internal functions
 	%%%===================================================================
+# common_test test_SUITE
+snippet testsuite
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
+
+	-include_lib("common_test/include/ct.hrl").
+	
+	%% Test server callbacks
+	-export([suite/0, all/0, groups/0,
+		 init_per_suite/1, end_per_suite/1,
+		 init_per_group/2, end_per_group/2,
+		 init_per_testcase/2, end_per_testcase/2]).
+	
+	%% Test cases
+	-export([
+		]).
+	
+	%%--------------------------------------------------------------------
+	%% COMMON TEST CALLBACK FUNCTIONS
+	%%--------------------------------------------------------------------
+	
+	%%--------------------------------------------------------------------
+	%% Function: suite() -> Info
+	%%
+	%% Info = [tuple()]
+	%%   List of key/value pairs.
+	%%
+	%% Description: Returns list of tuples to set default properties
+	%%              for the suite.
+	%%
+	%% Note: The suite/0 function is only meant to be used to return
+	%% default data values, not perform any other operations.
+	%%--------------------------------------------------------------------
+	suite() ->
+	    [{timetrap,{minutes,10}}].
+	
+	%%--------------------------------------------------------------------
+	%% Function: init_per_suite(Config0) ->
+	%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+	%%
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding the test case configuration.
+	%% Reason = term()
+	%%   The reason for skipping the suite.
+	%%
+	%% Description: Initialization before the suite.
+	%%
+	%% Note: This function is free to add any key/value pairs to the Config
+	%% variable, but should NOT alter/remove any existing entries.
+	%%--------------------------------------------------------------------
+	init_per_suite(Config) ->
+	    Config.
+	
+	%%--------------------------------------------------------------------
+	%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+	%%
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding the test case configuration.
+	%%
+	%% Description: Cleanup after the suite.
+	%%--------------------------------------------------------------------
+	end_per_suite(_Config) ->
+	    ok.
+	
+	%%--------------------------------------------------------------------
+	%% Function: init_per_group(GroupName, Config0) ->
+	%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+	%%
+	%% GroupName = atom()
+	%%   Name of the test case group that is about to run.
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding configuration data for the group.
+	%% Reason = term()
+	%%   The reason for skipping all test cases and subgroups in the group.
+	%%
+	%% Description: Initialization before each test case group.
+	%%--------------------------------------------------------------------
+	init_per_group(_GroupName, Config) ->
+	    Config.
+	
+	%%--------------------------------------------------------------------
+	%% Function: end_per_group(GroupName, Config0) ->
+	%%               void() | {save_config,Config1}
+	%%
+	%% GroupName = atom()
+	%%   Name of the test case group that is finished.
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding configuration data for the group.
+	%%
+	%% Description: Cleanup after each test case group.
+	%%--------------------------------------------------------------------
+	end_per_group(_GroupName, _Config) ->
+	    ok.
+	
+	%%--------------------------------------------------------------------
+	%% Function: init_per_testcase(TestCase, Config0) ->
+	%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+	%%
+	%% TestCase = atom()
+	%%   Name of the test case that is about to run.
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding the test case configuration.
+	%% Reason = term()
+	%%   The reason for skipping the test case.
+	%%
+	%% Description: Initialization before each test case.
+	%%
+	%% Note: This function is free to add any key/value pairs to the Config
+	%% variable, but should NOT alter/remove any existing entries.
+	%%--------------------------------------------------------------------
+	init_per_testcase(_TestCase, Config) ->
+	    Config.
+	
+	%%--------------------------------------------------------------------
+	%% Function: end_per_testcase(TestCase, Config0) ->
+	%%               void() | {save_config,Config1} | {fail,Reason}
+	%%
+	%% TestCase = atom()
+	%%   Name of the test case that is finished.
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding the test case configuration.
+	%% Reason = term()
+	%%   The reason for failing the test case.
+	%%
+	%% Description: Cleanup after each test case.
+	%%--------------------------------------------------------------------
+	end_per_testcase(_TestCase, _Config) ->
+	    ok.
+	
+	%%--------------------------------------------------------------------
+	%% Function: groups() -> [Group]
+	%%
+	%% Group = {GroupName,Properties,GroupsAndTestCases}
+	%% GroupName = atom()
+	%%   The name of the group.
+	%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+	%%   Group properties that may be combined.
+	%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+	%% TestCase = atom()
+	%%   The name of a test case.
+	%% Shuffle = shuffle | {shuffle,Seed}
+	%%   To get cases executed in random order.
+	%% Seed = {integer(),integer(),integer()}
+	%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+	%%              repeat_until_any_ok | repeat_until_any_fail
+	%%   To get execution of cases repeated.
+	%% N = integer() | forever
+	%%
+	%% Description: Returns a list of test case group definitions.
+	%%--------------------------------------------------------------------
+	groups() ->
+	    [].
+	
+	%%--------------------------------------------------------------------
+	%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+	%%
+	%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+	%% GroupName = atom()
+	%%   Name of a test case group.
+	%% TestCase = atom()
+	%%   Name of a test case.
+	%% Reason = term()
+	%%   The reason for skipping all groups and test cases.
+	%%
+	%% Description: Returns the list of groups and test cases that
+	%%              are to be executed.
+	%%--------------------------------------------------------------------
+	all() -> 
+	    [].
+	
+	
+	%%--------------------------------------------------------------------
+	%% TEST CASES
+	%%--------------------------------------------------------------------
+	
+	%%--------------------------------------------------------------------
+	%% Function: TestCase(Config0) ->
+	%%               ok | exit() | {skip,Reason} | {comment,Comment} |
+	%%               {save_config,Config1} | {skip_and_save,Reason,Config1}
+	%%
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding the test case configuration.
+	%% Reason = term()
+	%%   The reason for skipping the test case.
+	%% Comment = term()
+	%%   A comment about the test case that will be printed in the html log.
+	%%
+	%% Description: Test case function. (The name of it must be specified in
+	%%              the all/0 list or in a test case group for the test case
+	%%              to be executed).
+	%%--------------------------------------------------------------------
 

From e477c20bd68d25cc36e62c1c9aed3559cb25b901 Mon Sep 17 00:00:00 2001
From: Dale Roberts <dale.o.roberts@gmail.com>
Date: Wed, 10 Jul 2013 17:27:17 +0200
Subject: [PATCH 0152/1587] Fix bug in thm

---
 snippets/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index fc44fffbb..649e06b7f 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -26,7 +26,7 @@ snippet tab
 snippet thm
 	\begin[${1:author}]{${2:thm}}
 	${3}
-	\end{$1}
+	\end{$2}
 snippet center
 	\begin{center}
 		${1}

From 9c2cfdd51ad53e694e3c2e40e4707c2c976875b9 Mon Sep 17 00:00:00 2001
From: "Simeon F. Willbanks" <sfw@simeonfosterwillbanks.com>
Date: Wed, 17 Jul 2013 10:22:01 -0700
Subject: [PATCH 0153/1587] Refactor go Snipmate snippet "if", so you can tab
 into if block body

---
 snippets/go.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 1d7d4f595..c4aaf6027 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -79,7 +79,7 @@ snippet inf
 snippet if
 	if ${1:/* condition */} {
 		${2}
-	}${2}
+	}${3}
 # else snippet
 snippet el
 	else {

From 6164455931501742d820bec393e353edae9d3296 Mon Sep 17 00:00:00 2001
From: Santiago Gallego <santiago.gallego.rodrigo@gmail.com>
Date: Thu, 18 Jul 2013 21:31:59 +0200
Subject: [PATCH 0154/1587] Added python epydoc snippet

---
 snippets/python.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index d8544cd17..a20086820 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -185,3 +185,15 @@ snippet lc
 	logger.critical(${1:msg})
 snippet li
 	logger.info(${1:msg})
+snippet epydoc
+	"""
+	${1:Description}
+
+	@param ${2:param}: ${3: Description}
+	@type  $2: ${4: Type}
+
+	@return: ${5: Description}
+	@rtype : ${6: Type}
+
+	@raise e: ${7: Description}
+	"""

From 5a95942a8a8ee31ed78c3421749229cdb403ceb4 Mon Sep 17 00:00:00 2001
From: Gea-Suan Lin <gslin@gslin.org>
Date: Sat, 20 Jul 2013 23:42:24 +0800
Subject: [PATCH 0155/1587] Perfer to use <meta charset="utf8">.

Both are valid in HTML5, and both are valid in major browsers, so we
choose shorter version.

And move charset before title, because <title> might contain multibyte
string.

Ref: https://code.google.com/p/doctype-mirror/wiki/MetaCharsetAttribute
---
 snippets/html_minimal.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/html_minimal.snippets b/snippets/html_minimal.snippets
index ce971ef54..61e4738c4 100644
--- a/snippets/html_minimal.snippets
+++ b/snippets/html_minimal.snippets
@@ -6,8 +6,8 @@ snippet html5
 	<!doctype html>
 	<html>
 	<head>
+		<meta charset="utf-8">
 		<title>$2</title>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		$3
 	</head>
 	<body>

From 743da3a940dd229c4838a2c2455427b0af6940d2 Mon Sep 17 00:00:00 2001
From: Gea-Suan Lin <gslin@gslin.org>
Date: Sat, 20 Jul 2013 23:45:40 +0800
Subject: [PATCH 0156/1587] In HTML5, we don't need xml-style close tag.

---
 snippets/html_minimal.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/html_minimal.snippets b/snippets/html_minimal.snippets
index 61e4738c4..bc6d3e0af 100644
--- a/snippets/html_minimal.snippets
+++ b/snippets/html_minimal.snippets
@@ -34,15 +34,15 @@ snippet idn
 
 snippet label_and_input
 	<label for="${2:$1}">${1}</label>
-	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}" />${7}
+	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}">${7}
 
 
 # FORMS
 # use idn . or n to add id
 snippet input
-	<input type="${1:text}" value="${2}" ${3}/>${7}
+	<input type="${1:text}" value="${2}" ${3}>${7}
 snippet submit
-	<input type="submit" value="${2}" ${3}/>${7}
+	<input type="submit" value="${2}" ${3}>${7}
 snippet textarea
 	<textarea $1>$2</textarea>
 
@@ -61,7 +61,7 @@ snippet img
 	<img src="$1" alt="$2"/>
 # JS/CSS
 snippet css_file
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />${3}
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">${3}
 snippet css_block
 	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
         </link>

From 5ce921601a6725832db69e63f592edd37a2535da Mon Sep 17 00:00:00 2001
From: Michi Huber <michi.huber@gmail.com>
Date: Mon, 22 Jul 2013 08:52:16 +0200
Subject: [PATCH 0157/1587] Add function do ... end snippet to elixir

---
 snippets/elixir.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 50243a705..eb3319e0d 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -89,6 +89,11 @@ snippet doc
 snippet fn
 	fn(${1:args}) -> ${2} end
 
+snippet fun
+        function do
+        	${1}
+        end
+
 snippet mdoc
 	@moduledoc """
 	${1}

From e688bfe1fdd6b5a2a8ddb789bb2b7cf2f7b9c3c0 Mon Sep 17 00:00:00 2001
From: "Simeon F. Willbanks" <sfw@simeonfosterwillbanks.com>
Date: Fri, 26 Jul 2013 08:56:21 -0700
Subject: [PATCH 0158/1587] Add Go snippets for invoking named and anonymous
 functions in goroutines

---
 snippets/go.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index c4aaf6027..94610fc8d 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -211,3 +211,11 @@ snippet t
 # variable declaration
 snippet v
 	var ${1:t} ${2:string}
+# goroutine named function
+snippet g
+	go ${1:funcName}(${2})
+# goroutine anonymous function 
+snippet ga
+	go func(${1} ${2:type}) {
+		${3:/* code */}
+	}(${4})

From eddf0273c72e46d8fa8d1c7ae2839e254bb9b546 Mon Sep 17 00:00:00 2001
From: babybeasimple <babybeasimple@gmail.com>
Date: Sun, 28 Jul 2013 15:13:24 +0400
Subject: [PATCH 0159/1587] (eruby.snippets): add number_to_currency helper
 snippet

---
 snippets/eruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index d99cf0b6e..e3f421366 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -103,6 +103,8 @@ snippet lipp
 	<%= link_to "${1:Link text...}", ${2:model}s_path %>
 snippet lt
 	<%= link_to "${1:name}", ${2:dest} %>
+snippet ntc
+	<%= number_to_currency(${1}) %>
 snippet ofcfs
 	<%= options_from_collection_for_select ${1:collection}, ${2:value_method}, ${3:text_method}, ${4:selected_value} %>
 snippet rf

From 4e23383bea3d888c8b17c339b6c3ffa8244f5317 Mon Sep 17 00:00:00 2001
From: babybeasimple <babybeasimple@gmail.com>
Date: Mon, 29 Jul 2013 15:04:04 +0400
Subject: [PATCH 0160/1587] (haml.snippets): add number_to_currency helper
 snippet

---
 snippets/haml.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/snippets/haml.snippets b/snippets/haml.snippets
index 939158d55..fd66e7423 100644
--- a/snippets/haml.snippets
+++ b/snippets/haml.snippets
@@ -27,4 +27,5 @@ snippet ife
 snippet ifp
 	- if ${1:condition}.presence?
 		${2}
-
+snippet ntc
+	= number_to_currency(${1})

From 737508c613654a2e0411966f6c4678d414972273 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 31 Jul 2013 01:36:35 +0200
Subject: [PATCH 0161/1587] UltiSnips JS: fix placeholders, remove trailing ;,
 they are optional

---
 UltiSnips/javascript.snippets | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 7eb18d770..439ec874c 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -27,46 +27,46 @@ endsnippet
 
 snippet proto "Prototype (proto)"
 ${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) ,,{
-	${0:// body...}
-};
+	${0}
+}
  
 endsnippet
 
 snippet for "for (...) {...} (faster)"
 for (var ${2:i} = ${1:Things}.length - 1; $2 >= 0; $2--){
 	${3:$1[$2]}$0
-};
+}
 endsnippet
 
 snippet for "for (...) {...}"
 for (var ${2:i}=0; $2 < ${1:Things}.length; $2++) {
 	${3:$1[$2]}$0
-};
+}
 endsnippet
 
 snippet fun "function (fun)"
 function ${1:function_name} (${2:argument}) {
-	${0:// body...}
+	${0}
 }
 endsnippet
 
 # for one line if .. else you usually use a ? b : c
 snippet ife "if ___ else"
 if (${1}) {
-	{$2}
+	${2}
 } else {
-	{$3}
-};
+	${3}
+}
 endsnippet
 
 snippet if "if"
 if (${1}) {
-	{$2}
-};
+	${2}
+}
 endsnippet
 
 snippet timeout "setTimeout function"
-setTimeout(function() {$0}${2:}, ${1:10});
+setTimeout(function() {$0}${2:}, ${1:10})
 endsnippet
 
 # vim:ft=snippets:

From fdf1e6e174758f149459a0c7599321f63bd27913 Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Wed, 31 Jul 2013 21:56:59 +0800
Subject: [PATCH 0162/1587] remove old php snippet which Ultisnip already
 include, add something new

---
 UltiSnips/php.snippets | 270 +++++++----------------------------------
 1 file changed, 41 insertions(+), 229 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 3245568e0..5f2b9bbea 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -1,258 +1,70 @@
-## Snippets from SnipMate, taken from
-## https://github.com/scrooloose/snipmate-snippets.git
+snippet <? "php open tag" b
+<?php
 
-snippet array "array"
-$${1:arrayName} = array('${2}' => ${3});${4}
-endsnippet
-
-snippet def "def"
-define('${1}'${2});${3}
-endsnippet
-
-snippet do "do"
-do {
-	${2}
-} while (${1});"
-endsnippet
-
-snippet doc_f "doc_f"
-/**
- * $2
- * @return ${4:void}
- * @author ${5:`!v g:snips_author`}
- **/
-${1:public }function ${2:someFunc}(${3})
-{${6}
-}
-endsnippet
-
-snippet doc_i "doc_i"
-/**
- * $1
- * @package ${2:default}
- * @author ${3:`!v g:snips_author`}
- **/
-interface ${1:someClass}
-{${4}
-} // END interface $1"
-endsnippet
-
-snippet el "else"
-else {
-	${1}
-}
-endsnippet
-
-snippet for "for"
-for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-	${4}
-}
-endsnippet
-
-snippet foreachk "foreachk"
-foreach ($${1:variable} as $${2:key} => $${3:value}){
-	${4}
-}
-endsnippet
 
-snippet get "get"
-$_GET['${1}']${2}
 endsnippet
 
-snippet if "if"
-if (${1}) {
-	${2}
-}
-endsnippet
-
-snippet inc "inc"
-include '${1:file}';${2}
-endsnippet
-
-snippet log "log"
-error_log(var_export(${1}, true));${2}
-endsnippet
-
-snippet post "post"
-$_POST['${1}']${2}
-endsnippet
-
-snippet req1 "req1"
-require_once '${1:file}';${2}
+snippet vdd "php var_dump and die" b
+var_dump(); die();
 endsnippet
 
-snippet session "session"
-$_SESSION['${1}']${2}
-endsnippet
-
-snippet t "t"
-$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};${5}
-endsnippet
-
-snippet var "var"
-var_export(${1});${2}
-endsnippet
-
-snippet getter "PHP Class Getter" !b
-/*
- * Getter for $1
- */
-public function get${1/\w+\s*/\u$0/}() 
-{
-    return $this->$1;$2
-}
-$4
-endsnippet
-
-snippet setter "PHP Class Setter" !b
-/*
- * Setter for $1
- */
-public function set${1/\w+\s*/\u$0/}($$1)
-{
-    $this->$1 = $$1;$3
-    ${4:return $this;}
-}
-$0
+snippet ns "php namespace" b
+namespace ${1:`!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`};
 endsnippet
 
-snippet gs "PHP Class Getter Setter" !b
-protected $$1
+snippet nc "php namespace and class" b
+namespace ${1:`!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`};
 
-/*
- * Getter for $1
- */
-public function get${1/\w+\s*/\u$0/}() 
-{
-    return $this->$1;$2
-}
-
-/*
- * Setter for $1
+/**
+ * ${3:@author `whoami`}$4
  */
-public function set${1/\w+\s*/\u$0/}($$1)
-{
-    $this->$1 = $$1;$3
-    ${4:return $this;}
-}
-$0
-endsnippet
-
-snippet pub "Public function" !b
-public function ${1:name}(${2:$param})
+class ${2:`!p
+snip.rv = re.match(r'.*(?=\.)', fn).group().capitalize()
+`}
 {
-    ${VISUAL}${3:return null;}
 }
-$0
 endsnippet
 
-snippet pro "Protected function" !b
-protected function ${1:name}(${2:$param})
+snippet st "php static function" b
+${1:public} static function $2($3)
 {
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-
-snippet pri "Private function" !b
-private function ${1:name}(${2:$param})
-{
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-
-snippet pubs "Public static function" !b
-public static function ${1:name}(${2:$param})
-{
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-
-snippet pros "Protected static function" !b
-protected static function ${1:name}(${2:$param})
-{
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-
-snippet pris "Private static function" !b
-private static function ${1:name}(${2:$param})
-{
-    ${VISUAL}${3:return null;}
+	${4}
 }
-$0
 endsnippet
 
-snippet fu "Function snip" !b
-function ${1:name}(${2:$param}) 
+snippet __ "php constructor" b
+${1:public} function __construct($2)
 {
-    ${VISUAL}${3:return null;}
-}
-$0
-endsnippet
-# :vim:ft=snippets
-
-snippet fore "Foreach loop"
-foreach ($${1:variable} as $${3:value}){
-    ${VISUAL}${4}
-}
-$0
-endsnippet
-
-snippet new "New class instance" !b
-$$1 = new $1($2);
-$0
-endsnippet
-
-
-snippet ife "if else"
-if (${1:/* condition */}) {
-    ${2}
-} else {
-    ${3}
+	${3}
 }
-$0
 endsnippet
 
+snippet sg "Setter and Getter" b
 
-snippet class "Class declaration template" !b
 /**
- * Class ${1:`!p snip.rv=snip.fn.capitalize().split('.')[0]`} 
- * @author $2
+ * @var ${3:`!p snip.rv = t[2].capitalize()`}${4}
  */
-class $1
+${1:protected} $$2;
+
+public function set`!p snip.rv = t[2].capitalize()`(`!p
+if re.match(r'[A-Z].*', t[3]):
+	snip.rv = t[3] + ' '
+else:
+	snip.rv = ''
+`$$2)
 {
-    public function ${3:__construct}(${4:$options})
-    {
-        ${4}
-    }
-}
-$0
-endsnippet
+	$this->$2 = $$2;
 
-snippet pr "Dumb debug helper in HTML"
-echo '<pre>' . var_export($1, 1) . '</pre>';$0
-endsnippet
-
-snippet pc "Dumb debug helper in cli"
-var_export($1);$0
-endsnippet
-
-# Symfony 2 based snippets
-snippet sfa "Symfony 2 Controller action"
-/**
-* @Route("/${1:route_name}", name="$1")
-* @Template()
-*/
-public function $1Action($2)
-{
-    $3
-    return ${4:array();}$0
+	return $this;
 }
 endsnippet
-
-# :vim:ft=snippets:
-

From 04a98ad3872c80c8b2f3f0eeb50b9b76a7770275 Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Thu, 1 Aug 2013 22:42:37 +0800
Subject: [PATCH 0163/1587] hotfix: move cursor in var_dump call, correct the
 case of class name

---
 UltiSnips/php.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 5f2b9bbea..45fd094e9 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -5,7 +5,7 @@ snippet <? "php open tag" b
 endsnippet
 
 snippet vdd "php var_dump and die" b
-var_dump(); die();
+var_dump(${1}); die();
 endsnippet
 
 snippet ns "php namespace" b
@@ -29,7 +29,7 @@ if m:
  * ${3:@author `whoami`}$4
  */
 class ${2:`!p
-snip.rv = re.match(r'.*(?=\.)', fn).group().capitalize()
+snip.rv = re.match(r'.*(?=\.)', fn).group()
 `}
 {
 }

From 0805491b0557fe32df76de1a81b3ca67116e53d5 Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Fri, 2 Aug 2013 22:12:04 +0800
Subject: [PATCH 0164/1587] add symfony2 snippets

---
 UltiSnips/php.snippets | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 45fd094e9..0e866d928 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -4,7 +4,7 @@ snippet <? "php open tag" b
 
 endsnippet
 
-snippet vdd "php var_dump and die" b
+snippet vdd "php var_dump and die"
 var_dump(${1}); die();
 endsnippet
 
@@ -15,6 +15,7 @@ m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `};
+
 endsnippet
 
 snippet nc "php namespace and class" b
@@ -26,7 +27,7 @@ if m:
 `};
 
 /**
- * ${3:@author `whoami`}$4
+ * ${3:@author `whoami`}${4}
  */
 class ${2:`!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -67,4 +68,15 @@ else:
 
 	return $this;
 }
+
+public function get`!p snip.rv = t[2].capitalize()`()
+{
+	return $this->$2;
+}
+endsnippet
+
+snippet if "php if" !b
+if (${1}) {
+	${2}
+}
 endsnippet

From ea27dc46277072ff8f894a4b4c02f113c329a29c Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Fri, 2 Aug 2013 22:16:05 +0800
Subject: [PATCH 0165/1587] fixup

---
 UltiSnips/php/symfony2.snippets | 75 +++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 UltiSnips/php/symfony2.snippets

diff --git a/UltiSnips/php/symfony2.snippets b/UltiSnips/php/symfony2.snippets
new file mode 100644
index 000000000..53df3d3df
--- /dev/null
+++ b/UltiSnips/php/symfony2.snippets
@@ -0,0 +1,75 @@
+snippet contr "symfony2 controller" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * ${1:@author `whoami`}${2}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends Controller
+{
+}
+endsnippet
+
+snippet act "symfony2 action" b
+/**
+ * @Route("${3}", name="${4}")
+ * @Method({${5:"GET"}})
+ * @Template()
+ */
+public function ${1}Action(${2})
+{
+	${6}
+	return [];
+}
+endsnippet
+
+snippet comm "symfony2 command" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * ${3:@author `whoami`}${4}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends ContainerAwareCommand
+{
+	protected function configure()
+	{
+		$this
+			->setName('${1}')
+			->setDescription('${2}')
+			->setDefinition([
+				new InputArgument('', InputArgument::REQUIRED, ''),
+				new InputOption('', null, InputOption::VALUE_NONE, ''),
+			])
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+	}
+}
+endsnippet

From a490c1ee8ddbe9c70efc579c96d8bb0f6d055fa4 Mon Sep 17 00:00:00 2001
From: Kevin Schaul <kevin.schaul@gmail.com>
Date: Fri, 2 Aug 2013 18:00:59 -0400
Subject: [PATCH 0166/1587] Added snippets for d3 (javascript)

Based on Shan Carter's snippets for Sublime
https://github.com/shancarter/sublime-text-d3
---
 snippets/javascript.d3.snippets | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 snippets/javascript.d3.snippets

diff --git a/snippets/javascript.d3.snippets b/snippets/javascript.d3.snippets
new file mode 100644
index 000000000..a3f7fa7a5
--- /dev/null
+++ b/snippets/javascript.d3.snippets
@@ -0,0 +1,30 @@
+snippet .attr
+	.attr("${1}", ${2})
+snippet .style
+	.style("${1}", ${2})
+snippet axis
+	d3.svg.axis()
+	  .orient(${1})
+	  .scale(${2})
+snippet fd
+	function(d) { ${1} }
+snippet fdi
+	function(d, i) { ${1} }
+snippet marginconvention
+	var ${1:margin} = { top: ${2:10}, right: ${3:10}, bottom: ${4:10}, left: ${5:10} };
+	var ${6:width} = ${7:970} - $1.left - $1.right;
+	var ${8:height} = ${9:500} - $1.top - $1.bottom;
+	
+	var ${10:svg} = d3.select("${11}").append("svg")
+	  .attr("width", $6)
+	  .attr("height", $8)
+	    .append("g")
+	  .attr("transform", "translate(" + $1.left + "," + $1.top + ")")
+snippet nest
+	d3.nest()
+	  .key(${1})
+	  .entries(${2})
+snippet scale
+	d3.scale.linear()
+	  .domain(${1})
+	  .range(${2})

From b4fe1eb09d24289f4f27708253b06e6cef2df967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn?= <bo@kbct.de>
Date: Sun, 4 Aug 2013 03:52:18 +0200
Subject: [PATCH 0167/1587] fix underline length

if you're hasty and type more than three '='s/'-'s, the underline will be longer than the title above. To fix this we need to subtract the (remaining) length of the current line from the length of the title.
---
 snippets/markdown.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index 9788959f6..bfbff2553 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -23,11 +23,11 @@ snippet ![:*
 	![${1:id}]: ${2:`@*`} "${3:title}"
 
 snippet ===
-	`repeat('=', strlen(getline(line(".") - 1)))`
+	`repeat('=', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
 	${1}
 snippet ---
-	`repeat('-', strlen(getline(line(".") - 1)))`
+	`repeat('-', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
 	${1}
 

From 4b0712a65269e4927296d0ff4ff05bd952f98119 Mon Sep 17 00:00:00 2001
From: ZPH <Zander@civet.ws>
Date: Wed, 7 Aug 2013 21:34:23 -0400
Subject: [PATCH 0168/1587] Converted snipmate elixir snippets into ultisnip

Credit belongs to @iurifq for the snippets
Translation from snipmate to ultisnip format @zph
---
 UltiSnips/elixir.snippets | 168 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100644 UltiSnips/elixir.snippets

diff --git a/UltiSnips/elixir.snippets b/UltiSnips/elixir.snippets
new file mode 100644
index 000000000..ae7ea2011
--- /dev/null
+++ b/UltiSnips/elixir.snippets
@@ -0,0 +1,168 @@
+# Credit: @iurifg
+
+snippet do
+do
+	${1}
+end
+endsnippet
+
+snippet if "if .. do .. end"
+if ${1:condition} do
+	${2:expression}
+end
+endsnippet
+
+snippet if "if .. do: .."
+if ${1:condition}, do: ${2:expression}
+endsnippet
+
+snippet ife "if .. do .. else .. end"
+if ${1:condition} do
+	${2:expression}
+else
+	${3:expression}
+end
+endsnippet
+
+snippet ife "if .. do: .. else:"
+if ${1:condition}, do: ${2}, else: ${3}
+endsnippet
+
+snippet unless "unless .. do .. end"
+unless ${1} do
+	${2}
+end
+endsnippet
+
+snippet unless "unless .. do: .."
+unless ${1:condition}, do: ${2}
+endsnippet
+
+snippet unlesse "unless .. do .. else .. end"
+unless ${1:condition} do
+	${2}
+else
+	${3}
+end
+endsnippet
+
+snippet unlesse "unless .. do: .. else:"
+unless ${1:condition}, do: ${2}, else: ${3}
+endsnippet
+
+snippet cond
+"cond do"
+${1} ->
+	${2}
+end
+endsnippet
+
+snippet case
+case ${1} do
+${2} ->
+	${3}
+end
+endsnippet
+
+snippet def
+def ${1:name} do
+	${2}
+end
+endsnippet
+
+snippet defin "def function(n), do: n"
+def ${1:name},  do: ${2}
+endsnippet
+
+snippet defg
+def ${1:name} when ${2:guard-condition} do
+	${3}
+end
+endsnippet
+
+snippet defim
+defimpl ${1:protocol_name}, for: ${2:data_type} do
+	${3}
+end
+endsnippet
+
+snippet defma
+defmacro ${1:name} do
+	${2}
+end
+endsnippet
+
+snippet defmo
+defmodule ${1:module_name} do
+	${2}
+end
+endsnippet
+
+snippet defp
+defp ${1:name} do
+	${2}
+end
+endsnippet
+
+snippet defpr
+defprotocol ${1:name}, [${2:function}]
+endsnippet
+
+snippet defr
+defrecord ${1:record_name}, ${2:fields}
+endsnippet
+
+snippet doc
+@doc """
+${1}
+"""
+endsnippet
+
+snippet fn
+fn(${1:args}) -> ${2} end
+endsnippet
+
+snippet fun
+function do
+	${1}
+end
+endsnippet
+
+snippet mdoc
+@moduledoc """
+${1}
+"""
+endsnippet
+
+snippet rec
+receive do
+${1} ->
+	${2}
+end
+endsnippet
+
+snippet req
+require ${1:module_name}
+endsnippet
+
+snippet imp
+import ${1:module_name}
+endsnippet
+
+snippet ali "alias old-module to shorthand"
+alias ${1:module_name}
+endsnippet
+
+snippet test
+test "${1:test_name}" do
+	${2}
+end
+endsnippet
+
+snippet try "try .. rescue .. end"
+try do
+	${1}
+rescue
+	${2} -> ${3}
+end
+endsnippet

From c0cddc9f864232e6dbfef7d8787363e6f1cffddb Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 31 Jul 2013 22:31:05 +0200
Subject: [PATCH 0169/1587] ruby: count from 1, not 0 (I think its very
 important to think about the name)  add static_var snippet

---
 UltiSnips/ruby.snippets | 4 ++--
 snippets/php.snippets   | 7 +++++++
 snippets/ruby.snippets  | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index 306c7e10d..0b6836cb3 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -432,8 +432,8 @@ end
 endsnippet
 
 snippet dov "do |<key>| ... end" i
-do |${0:v}|
-	$1
+do |${1:v}|
+	$2
 end
 endsnippet
 
diff --git a/snippets/php.snippets b/snippets/php.snippets
index b85d96e6c..29b1b45f1 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -405,3 +405,10 @@ snippet aw
 	array_walk($${1:foo}, function(&$${2:v}, $${3:k}) {
 		$$2 = ${4};
 	});
+
+# static var assign once
+snippet static_var
+	static $${1} = null;
+	if (is_null($$1)){
+		$$1 = ${2};
+	}
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 73db3667d..01358828b 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -422,8 +422,8 @@ snippet do
 # not be worth adding another snippet. should 0/1 placeholders change order?
 # its a good idea to think about the var name, so use it first
 snippet dov
-	do |${0:v}|
-		${1}
+	do |${1:v}|
+		${2}
 	end
 snippet :
 	:${1:key} => ${2:"value"}${3}

From 8024cfcecdc4bf8ad601d5eae9f7ca52426579a4 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 8 Aug 2013 11:24:27 +0200
Subject: [PATCH 0170/1587] while -> wh, see #230 and README.md

---
 README.md                      | 3 ++-
 UltiSnips/ocaml.snippets       | 2 +-
 UltiSnips/perl.snippets        | 2 +-
 UltiSnips/ruby.snippets        | 2 +-
 UltiSnips/sh.snippets          | 2 +-
 UltiSnips/tcl.snippets         | 2 +-
 snippets/actionscript.snippets | 2 +-
 snippets/autoit.snippets       | 2 +-
 snippets/falcon.snippets       | 2 +-
 snippets/htmltornado.snippets  | 2 +-
 snippets/processing.snippets   | 2 +-
 snippets/ruby.snippets         | 2 +-
 snippets/scala.snippets        | 2 +-
 13 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 35eac1bc7..6d3e41db4 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,7 @@ if : if without else
 ife: if $1 else $2
 eif : else if ($1) { .. }
 el  : else ..
+wh  : while (cond) ...
 ```
 
 If you're not satisfied with these defaults, open a ticket that we implement
@@ -89,7 +90,7 @@ Thus for conditions (while, if ..) and block bodies just use ${N} - Thanks
 
 Open questions:
 What about one line if ee then .. else .. vs if \n .. then \n ... \n else \n .. ?
-What about wh(ile), which trigger?
+Which additional policies to add?
 Discuss at: https://github.com/honza/vim-snippets/issues/230
 
 
diff --git a/UltiSnips/ocaml.snippets b/UltiSnips/ocaml.snippets
index 14926c899..157eb91a3 100644
--- a/UltiSnips/ocaml.snippets
+++ b/UltiSnips/ocaml.snippets
@@ -59,7 +59,7 @@ if ${1} then
   ${2}
 endsnippet
 
-snippet while "while"
+snippet wh "while"
 while ${1} do
   ${2}
 done
diff --git a/UltiSnips/perl.snippets b/UltiSnips/perl.snippets
index 6a9e8f9d1..e183b115e 100644
--- a/UltiSnips/perl.snippets
+++ b/UltiSnips/perl.snippets
@@ -117,7 +117,7 @@ unless ($1) {
 
 endsnippet
 
-snippet while "while"
+snippet wh "while"
 while ($1) {
 	${2:# body...}
 }
diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index 0b6836cb3..90001b1a4 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -455,7 +455,7 @@ endsnippet
 
 
 
-snippet while "while <expression> ... end"
+snippet wh "while <expression> ... end"
 while ${1:expression}
 	${0}
 end
diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 915c0df9a..cce06ef3d 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -79,7 +79,7 @@ until ${2:[[ ${1:condition} ]]}; do
 done
 endsnippet
 
-snippet while "while ... (done)"
+snippet wh "while ... (done)"
 while ${2:[[ ${1:condition} ]]}; do
 	${0:#statements}
 done
diff --git a/UltiSnips/tcl.snippets b/UltiSnips/tcl.snippets
index c5ae37ba2..fd53d2652 100644
--- a/UltiSnips/tcl.snippets
+++ b/UltiSnips/tcl.snippets
@@ -40,7 +40,7 @@ switch ${1:-exact} -- ${2:\$var} {
 
 endsnippet
 
-snippet while "while... (while)" b
+snippet wh "while... (while)" b
 while {${1}} {
 	${2}
 }
diff --git a/snippets/actionscript.snippets b/snippets/actionscript.snippets
index 5385d115d..1aeca1c93 100644
--- a/snippets/actionscript.snippets
+++ b/snippets/actionscript.snippets
@@ -75,7 +75,7 @@ snippet do
 	do {
 		${2}
 	} while (${1:cond})
-snippet while
+snippet wh
 	while ${1:cond}{
 		${2}
 	}
diff --git a/snippets/autoit.snippets b/snippets/autoit.snippets
index c266e339e..b214fd2b2 100644
--- a/snippets/autoit.snippets
+++ b/snippets/autoit.snippets
@@ -41,7 +41,7 @@ snippet select
 		{$4:; Else code}
 	EndSelect
 # While loop
-snippet while
+snippet wh
 	While (${1:condition})
 		${2:; code...}
 	WEnd
diff --git a/snippets/falcon.snippets b/snippets/falcon.snippets
index 78257b6e9..50c3694c9 100644
--- a/snippets/falcon.snippets
+++ b/snippets/falcon.snippets
@@ -65,7 +65,7 @@ snippet forto
 	end
 
 # While Loop
-snippet while
+snippet wh
 	while ${1:conidition}
 		${2}
 	end
diff --git a/snippets/htmltornado.snippets b/snippets/htmltornado.snippets
index e80499ce9..c52f0e890 100644
--- a/snippets/htmltornado.snippets
+++ b/snippets/htmltornado.snippets
@@ -49,7 +49,7 @@ snippet try
 	{% finallly %}
 	  ${3}
 	{% end %}
-snippet while
+snippet wh
 	{% while ${1:condition} %}
 	  ${2}
 	{% end %}
diff --git a/snippets/processing.snippets b/snippets/processing.snippets
index 27f3e005a..2aec1b122 100755
--- a/snippets/processing.snippets
+++ b/snippets/processing.snippets
@@ -63,7 +63,7 @@ snippet for
 		${4:$1[$2]}
 	};
 #loop while
-snippet while
+snippet wh
 	while (${1:/* condition */}) {
 		${2}
 	}
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 01358828b..06a7820e9 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -75,7 +75,7 @@ snippet unless
 	unless ${1:condition}
 		${2}
 	end
-snippet while
+snippet wh
 	while ${1:condition}
 		${2}
 	end
diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index e3999f850..1cbd36815 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -33,7 +33,7 @@ snippet eif
 		${4}
 	}
 #while loop
-snippet while
+snippet wh
 	while (${1:obj}) {
 		${2}
 	}

From 552aaa4dd02aa645d917dc8d45391afcd3ef50cb Mon Sep 17 00:00:00 2001
From: Kevin Mees <kev.mees@gmail.com>
Date: Fri, 9 Aug 2013 15:35:41 +0200
Subject: [PATCH 0171/1587] Converted Coffeescript SnipMate snippets to
 Livescript

---
 snippets/ls.snippets | 98 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 snippets/ls.snippets

diff --git a/snippets/ls.snippets b/snippets/ls.snippets
new file mode 100644
index 000000000..e4a1149f4
--- /dev/null
+++ b/snippets/ls.snippets
@@ -0,0 +1,98 @@
+# Closure loop
+snippet forinlet
+	for ${1:name} in ${2:array}
+		let $1
+			${3}
+# Array comprehension
+snippet fora
+	for ${1:name} in ${2:array}
+		${3}
+# Object comprehension
+snippet foro
+	for ${1:key}, ${2:value} of ${3:object}
+		${4}
+# Range comprehension (inclusive)
+snippet forr
+	for ${1:name} from ${2:start} to ${3:finish}
+		${4}
+snippet forrb
+	for ${1:name} from ${2:start} to ${3:finish} by ${4:step}
+		${5}
+# Range comprehension (exclusive)
+snippet forrex
+	for ${1:name} from ${2:start} til ${3:finish}
+		${4}
+snippet forrexb
+	for ${1:name} from ${2:start} til ${3:finish} by ${4:step}
+		${5}
+# Function
+snippet fun
+	(${1:args}) ->
+		${2}
+# Function (bound)
+snippet bfun
+	(${1:args}) ~>
+		${2}
+# Class
+snippet cla class ..
+	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		${2}
+snippet cla class .. constructor: ..
+	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		(${2:args}) ->
+			${3}
+
+		${4}
+snippet cla class .. extends ..
+	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+		${3}
+snippet cla class .. extends .. constructor: ..
+	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+		(${3:args}) ->
+			${4}
+
+		${5}
+# If
+snippet if
+	if ${1:condition}
+		${2}
+# If __ Else
+snippet ife
+	if ${1:condition}
+		${2}
+	else
+		${3}
+# Else if
+snippet elif
+	else if ${1:condition}
+		${2}
+# Ternary If
+snippet ifte
+	if ${1:condition} then ${2:value} else ${3:other}
+# Unless
+snippet unl
+	${1:action} unless ${2:condition}
+# Switch
+snippet swi
+	switch ${1:object}
+	case ${2:value}
+		${3}
+	default void
+
+# Log
+snippet log
+	console.log ${1}
+
+# Try __ Catch
+snippet try
+	try
+		${1}
+	catch ${2:error}
+		${3}
+# Require
+snippet req
+	${2:$1} = require '${1}'${3}
+
+# Export
+snippet exp
+	${1:root} = exports ? this

From 1fd1d3b53f856aa2b60df3fa13985aef46780dd4 Mon Sep 17 00:00:00 2001
From: Kevin Mees <kev.mees@gmail.com>
Date: Fri, 9 Aug 2013 15:36:34 +0200
Subject: [PATCH 0172/1587] Added livescript match snippet

---
 snippets/ls.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/ls.snippets b/snippets/ls.snippets
index e4a1149f4..37440f9a6 100644
--- a/snippets/ls.snippets
+++ b/snippets/ls.snippets
@@ -78,6 +78,10 @@ snippet swi
 	case ${2:value}
 		${3}
 	default void
+snippet mat
+	match ${1:object}
+	| ${2:value} => ${3}
+	| otherwise => void
 
 # Log
 snippet log

From 1df60aadd24b5bf9b358bea8a35ea134260a2865 Mon Sep 17 00:00:00 2001
From: Kevin Mees <kev.mees@gmail.com>
Date: Fri, 9 Aug 2013 15:37:35 +0200
Subject: [PATCH 0173/1587] Added livescript req! snippet

---
 snippets/ls.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/ls.snippets b/snippets/ls.snippets
index 37440f9a6..9d044ebe1 100644
--- a/snippets/ls.snippets
+++ b/snippets/ls.snippets
@@ -96,6 +96,9 @@ snippet try
 # Require
 snippet req
 	${2:$1} = require '${1}'${3}
+# Require!
+snippet req!
+	require! ${1}
 
 # Export
 snippet exp

From 883916a91d1ee1ac2280baa1974818ab79a57dce Mon Sep 17 00:00:00 2001
From: Kevin Mees <kev.mees@gmail.com>
Date: Fri, 9 Aug 2013 15:41:50 +0200
Subject: [PATCH 0174/1587] Added livescript str snippet

---
 snippets/ls.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/ls.snippets b/snippets/ls.snippets
index 9d044ebe1..909b35ee6 100644
--- a/snippets/ls.snippets
+++ b/snippets/ls.snippets
@@ -86,6 +86,9 @@ snippet mat
 # Log
 snippet log
 	console.log ${1}
+# stringify
+snippet str
+	JSON.stringify ${1}, void, 2
 
 # Try __ Catch
 snippet try

From 89c6f17ee986ea76a0d47de3c70f13f58e60c41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Garci=CC=81a?= <jorge.em223@gmail.com>
Date: Tue, 13 Aug 2013 23:51:47 -0700
Subject: [PATCH 0175/1587] Added Ember.js snippets

---
 UltiSnips/javascript_ember.snippets | 88 +++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 UltiSnips/javascript_ember.snippets

diff --git a/UltiSnips/javascript_ember.snippets b/UltiSnips/javascript_ember.snippets
new file mode 100644
index 000000000..543a26adc
--- /dev/null
+++ b/UltiSnips/javascript_ember.snippets
@@ -0,0 +1,88 @@
+###################################################################
+#                        Ember snippets                           #
+###################################################################
+
+# Application
+snippet eapp "App.Name = Ember.Application.create({});"
+${1:App.Name} = Ember.Application.create({});
+endsnippet
+
+# Models
+snippet emod "App.ModelName = Ember.Model.extend({...});"
+${1:model_name} = Ember.Model.extend({
+     ${0://Properties here...}
+});
+endsnippet
+
+# View
+snippet eview "App.ViewName = Ember.Model.extend({...});"
+${1:view_name} = Ember.View.extend({
+     ${0://Properties here...}
+});
+endsnippet
+
+# Controller
+snippet econtroller "App.ControllerName = Ember.Model.extend({...});"
+${1:controller_name} = Ember.ObjectController.extend({
+     ${0://Properties here...}
+});
+endsnippet
+
+# Route
+snippet eroute "App.RouteName = Ember.Route.extend({...});"
+${1:route_name} = Ember.Route.extend({
+     ${0://Properties here...}
+});
+endsnippet
+
+snippet eview "App.ViewName = Ember.Model.create({...});"
+${1:view_name} = Ember.View.create({
+     ${0://Properties here...}
+});
+endsnippet
+
+# Object
+snippet eobj "App.ObjectName = Ember.Object.extend({...});"
+${1:object_name} = Ember.Object.create({
+     ${0://Properties here...}
+});
+endsnippet
+
+# Mixin
+snippet emix "App.MixinName = Ember.Model.extend({...});"
+${1:view_name} = Ember.Mixin.create({
+     ${0://Properties here...}
+});
+endsnippet
+
+# Ember getter and setter
+snippet eget "this.get('property');"
+${1:this}.get('${2:property}');
+endsnippet
+
+snippet eset "this.set('property', value);"
+${1:this}.set('${2:property}', ${3:value});
+endsnippet
+
+# Computer properties
+snippet cpro "property_name: function() {...}.property(),"
+${1:property_name}: function() {
+    ${0://body...}
+}.property('${3:argumenet}'),
+endsnippet
+
+snippet cpro ": function() {...}.property('property'),"
+${1:property_name}: function() {
+    ${0://body...}
+}.property(),
+endsnippet
+
+
+# Observes
+snippet proo "property_name: function() {...}.property()"
+${1:property_name}: function() {
+    ${0://body...}
+}.observes('${3:property}'),
+endsnippet
+
+# vim:ft=snippets:

From db20c6140bc9927ca1d1e662018dcf3be62e1e90 Mon Sep 17 00:00:00 2001
From: carme <tkx264pp@gmail.com>
Date: Wed, 14 Aug 2013 22:07:31 +0900
Subject: [PATCH 0176/1587] fixed conflict ruby snippets.

---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 06a7820e9..43084f675 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -854,7 +854,7 @@ snippet format
 	format.${1:js|xml|html} { ${2} }
 snippet wc
 	where(${1:"conditions"}${2:, bind_var})
-snippet wh
+snippet wf
 	where(${1:field} => ${2:value})
 snippet xdelete
 	xhr :delete, :${1:destroy}, :id => ${2:1}${3}

From 62166691a8a84f17f88d5eeb570d525ca2f1f6c0 Mon Sep 17 00:00:00 2001
From: Mike Foley <mike@polleverywhere.com>
Date: Thu, 15 Aug 2013 12:32:07 -0700
Subject: [PATCH 0177/1587] add link_to, mail_to to haml snippets

---
 snippets/haml.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/haml.snippets b/snippets/haml.snippets
index fd66e7423..c369d59fe 100644
--- a/snippets/haml.snippets
+++ b/snippets/haml.snippets
@@ -19,6 +19,12 @@ snippet rpl
 	= render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}
 snippet rpo
 	= render :partial => "${1:item}", :object => ${2:@$1}
+snippet l link_to
+	= link_to ${1:name}, ${2:url}
+snippet m mail_to
+	= mail_to ${1:email_address}, ${2:name}
+snippet m mail_to subject body
+	= mail_to ${1:email_address}, ${2:name}, :subject => ${3:subject}, :body
 snippet ife
 	- if ${1:condition}
 		${2}

From 85a4bc5fc1b08b5980a24b174137ac641dad0ceb Mon Sep 17 00:00:00 2001
From: Mike Foley <mike@polleverywhere.com>
Date: Thu, 15 Aug 2013 15:04:30 -0700
Subject: [PATCH 0178/1587] fix typo in haml mail_to

---
 snippets/haml.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/haml.snippets b/snippets/haml.snippets
index c369d59fe..2054636d6 100644
--- a/snippets/haml.snippets
+++ b/snippets/haml.snippets
@@ -24,7 +24,7 @@ snippet l link_to
 snippet m mail_to
 	= mail_to ${1:email_address}, ${2:name}
 snippet m mail_to subject body
-	= mail_to ${1:email_address}, ${2:name}, :subject => ${3:subject}, :body
+	= mail_to ${1:email_address}, ${2:name}, :subject => ${3:subject}, :body => ${4:body}
 snippet ife
 	- if ${1:condition}
 		${2}

From 790355c688755ac3f837e48db59533e34fee50bd Mon Sep 17 00:00:00 2001
From: Mike Foley <mike@polleverywhere.com>
Date: Thu, 15 Aug 2013 17:34:23 -0700
Subject: [PATCH 0179/1587] remap haml triggers: mail_to = mt/mts, link_to = lt

---
 snippets/haml.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/snippets/haml.snippets b/snippets/haml.snippets
index 2054636d6..046608784 100644
--- a/snippets/haml.snippets
+++ b/snippets/haml.snippets
@@ -19,12 +19,12 @@ snippet rpl
 	= render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}
 snippet rpo
 	= render :partial => "${1:item}", :object => ${2:@$1}
-snippet l link_to
-	= link_to ${1:name}, ${2:url}
-snippet m mail_to
+snippet lt
+	= link_to ${1:name}, ${2:dest}
+snippet mt
 	= mail_to ${1:email_address}, ${2:name}
-snippet m mail_to subject body
-	= mail_to ${1:email_address}, ${2:name}, :subject => ${3:subject}, :body => ${4:body}
+snippet mts
+	= mail_to ${1:email_address}, ${2:name}, :subject => ${3}, :body => ${4}
 snippet ife
 	- if ${1:condition}
 		${2}

From 0f452a4875eb9cbffb359cfc23877835b5782216 Mon Sep 17 00:00:00 2001
From: Bruno Sutic <bruno.sutic@gmail.com>
Date: Sat, 17 Aug 2013 13:14:05 -0700
Subject: [PATCH 0180/1587] Fix ruby `super_call` snippet

There was no tab in the beginning of the line and snippet wasn't
working.
---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 43084f675..4c93c74f1 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -1075,4 +1075,4 @@ snippet isres
 snippet isresw
 	it { should respond_to(:${1}).with(${2}).arguments }
 snippet super_call
-      ${1:super_class}.instance_method(:${2:method}).bind(self).call
+	${1:super_class}.instance_method(:${2:method}).bind(self).call

From 786f9a66fa7d1361bfd78486392ff54d57fc5a0d Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Mon, 19 Aug 2013 11:58:09 +0800
Subject: [PATCH 0181/1587] snip `nc` auto detect `Abstract` and `Interface`

---
 UltiSnips/php.snippets          | 20 ++++++++++++++++++--
 UltiSnips/php/symfony2.snippets | 17 ++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 0e866d928..8b6a8ae76 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -18,7 +18,7 @@ if m:
 
 endsnippet
 
-snippet nc "php namespace and class" b
+snippet nc "php namespace and class or interface" b
 namespace ${1:`!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -29,7 +29,17 @@ if m:
 /**
  * ${3:@author `whoami`}${4}
  */
-class ${2:`!p
+`!p
+m = re.search(r'Abstract', path)
+if m:
+	snip.rv = 'abstract '
+``!p
+m = re.search(r'Interface', path)
+if m:
+	snip.rv = 'interface'
+else:
+	snip.rv = 'class'
+` ${2:`!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
 `}
 {
@@ -80,3 +90,9 @@ if (${1}) {
 	${2}
 }
 endsnippet
+
+snippet /** "php comment block" b
+/**
+ * @${1}
+ */
+endsnippet
diff --git a/UltiSnips/php/symfony2.snippets b/UltiSnips/php/symfony2.snippets
index 53df3d3df..df928bf56 100644
--- a/UltiSnips/php/symfony2.snippets
+++ b/UltiSnips/php/symfony2.snippets
@@ -1,3 +1,5 @@
+# sugguestion? report bugs? 
+# go to https://github.com/chrisyue/vim-snippets/issues
 snippet contr "symfony2 controller" b
 namespace `!p 
 abspath = os.path.abspath(path)
@@ -23,6 +25,18 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet act "symfony2 action" b
+/**
+ * @Route("${3}", name="${4}")
+ * @Method({${5:"POST"}})
+ */
+public function ${1}Action(${2})
+{
+	${6}
+	return $this->redirect($this->generate('home', [], false));
+}
+endsnippet
+
+snippet actt "symfony2 action and template" b
 /**
  * @Route("${3}", name="${4}")
  * @Method({${5:"GET"}})
@@ -32,7 +46,8 @@ public function ${1}Action(${2})
 {
 	${6}
 	return [];
-}
+}`!p
+abspath = os.path.abspath(path)`
 endsnippet
 
 snippet comm "symfony2 command" b

From 1eb75e363e8bfebd046ce22f328871590818f48b Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Wed, 21 Aug 2013 11:28:30 +0800
Subject: [PATCH 0182/1587] `nc` support trait

---
 UltiSnips/php.snippets | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 8b6a8ae76..5122f1ca2 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -34,9 +34,10 @@ m = re.search(r'Abstract', path)
 if m:
 	snip.rv = 'abstract '
 ``!p
-m = re.search(r'Interface', path)
-if m:
+if re.search(r'Interface', path):
 	snip.rv = 'interface'
+elif re.search(r'Trait', path):
+	snip.rv = 'trait'
 else:
 	snip.rv = 'class'
 ` ${2:`!p

From 481f74b86c111ac66c6821fd44850406d2539231 Mon Sep 17 00:00:00 2001
From: "Simeon F. Willbanks" <sfw@simeonfosterwillbanks.com>
Date: Wed, 21 Aug 2013 09:01:21 -0700
Subject: [PATCH 0183/1587] Add snippets for declaring and initializing a
 single variable, both longhand and shorthand.

---
 snippets/go.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 94610fc8d..7e2ad4ca7 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -1,3 +1,8 @@
+# variables
+snippet v
+	${1} := ${2}
+snippet vr
+	var ${1} ${2} = ${3}
 # append
 snippet ap
 	append(${1:slice}, ${2:value})

From ff7606bdc5edcb1722009891e94f305acabfddd7 Mon Sep 17 00:00:00 2001
From: Bruno Sutic <bruno.sutic@gmail.com>
Date: Wed, 21 Aug 2013 16:31:32 -0700
Subject: [PATCH 0184/1587] Ruby `pry` snippet inserts only one line

Problem: pry snippet inserts 2 lines instead of one. The other line is
used as a document header margin (for source code readability).
---
 snippets/ruby.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 4c93c74f1..1da6f3b47 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -585,7 +585,6 @@ snippet debug
 	require 'ruby-debug'; debugger; true;
 snippet pry
 	require 'pry'; binding.pry
-
 #############################################
 # Rails snippets - for pure Ruby, see above #
 #############################################

From 2f9163ddb59b1c5ea81f4df3bc1747d47c2cbfc8 Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Fri, 23 Aug 2013 13:59:47 +0800
Subject: [PATCH 0185/1587] add symfony2 DataTransformer and EventSubscriber

---
 UltiSnips/php/symfony2.snippets | 65 +++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/UltiSnips/php/symfony2.snippets b/UltiSnips/php/symfony2.snippets
index df928bf56..c38ca790c 100644
--- a/UltiSnips/php/symfony2.snippets
+++ b/UltiSnips/php/symfony2.snippets
@@ -88,3 +88,68 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 	}
 }
 endsnippet
+
+snippet subs "symfony2 subscriber" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * ${1:@author `whoami`}${2}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` implements EventSubscriberInterface
+{
+	public function __construct()
+	{
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public static function getSubscribedEvents()
+	{
+		return [];
+	}
+}
+endsnippet
+
+snippet transf "symfony2 form data transformer" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+/**
+ * ${3:@author `whoami`}${4}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` implements DataTransformerInterface
+{
+	/**
+	 * {@inheritDoc}
+	 */
+	public function transform(${1})
+	{
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function reverseTransform(${2})
+	{
+	}
+}
+endsnippet

From 702844eb2b6a3280b61aa3cfeee0873569747c5b Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Mon, 26 Aug 2013 21:11:23 +0800
Subject: [PATCH 0186/1587] add phpunit snippets

---
 UltiSnips/php.snippets         |  8 ++++++++
 UltiSnips/php/phpunit.snippets | 30 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 UltiSnips/php/phpunit.snippets

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 5122f1ca2..96cae3549 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -92,6 +92,14 @@ if (${1}) {
 }
 endsnippet
 
+snippet ife "php ife" !b
+if (${1}) {
+	${2}
+} else {
+
+}
+endsnippet
+
 snippet /** "php comment block" b
 /**
  * @${1}
diff --git a/UltiSnips/php/phpunit.snippets b/UltiSnips/php/phpunit.snippets
new file mode 100644
index 000000000..6609f3fa6
--- /dev/null
+++ b/UltiSnips/php/phpunit.snippets
@@ -0,0 +1,30 @@
+# sugguestion? report bugs? 
+# please go to https://github.com/chrisyue/vim-snippets/issues
+snippet test "phpunit test class" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+/**
+ * @author `whoami`
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends \PHPUnit_Framework_TestCase
+{
+	public function test${1}()
+	{
+		${2}
+	}
+}
+endsnippet
+
+snippet exp "phpunit expects" i
+expects($this->${1:once}())
+	->method('${2}')
+	->with($this->equalTo(${3})${4})
+	->will($this->returnValue(${5}));
+endsnippet

From 5d4cad3316509b7538fdcae5e302a369dd7fc40e Mon Sep 17 00:00:00 2001
From: Martxel Lasa <martxel@gmail.com>
Date: Mon, 26 Aug 2013 19:43:20 +0200
Subject: [PATCH 0187/1587] Fix html5 snippet indentation and meta tag.

---
 UltiSnips/html.snippets | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index bb0747890..fd11d70b8 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -281,16 +281,16 @@ snippet html5 "HTML5 Template"
 <!DOCTYPE html>
 <html>
 <head>
-    <title>${1}</title>
-    <meta charset="utf-8" />
+	<title>${1}</title>
+	<meta charset="utf-8">
 </head>
 <body>
-    <header>
-        ${2}
-    </header>
-    <footer>
-        ${4}
-    </footer>
+	<header>
+		${2}
+	</header>
+	<footer>
+		${4}
+	</footer>
 </body>
 </html>
 endsnippet

From 4c7fba87d59e45b319645061e77679c6eec6253d Mon Sep 17 00:00:00 2001
From: William Ma <williamjcma@gmail.com>
Date: Wed, 28 Aug 2013 04:41:41 +1000
Subject: [PATCH 0188/1587] fixed auto iterator in cpp

---
 snippets/cpp.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index e95d35342..1fa9ec876 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -116,9 +116,9 @@ snippet iter
 
 # auto iterator
 snippet itera
-	for (auto ${1:i} = $1.begin(); $1 != $1.end(); ++$1) {
-		${2:std::cout << *$1 << std::endl;}
-	}${3}
+	for (auto ${1:i} = ${2:container}.begin(); $1 != $2.end(); ++$1) {
+		${3:std::cout << *$1 << std::endl;}
+	}${4}
 ##
 ## Lambdas
 # lamda (one line)

From 5386637570b9e61063207929accfa6d3f181fe6a Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Sat, 31 Aug 2013 12:55:47 +0800
Subject: [PATCH 0189/1587] add symfony2 doctrine entity template

---
 UltiSnips/php/symfony2.snippets | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/UltiSnips/php/symfony2.snippets b/UltiSnips/php/symfony2.snippets
index c38ca790c..0c7951ae2 100644
--- a/UltiSnips/php/symfony2.snippets
+++ b/UltiSnips/php/symfony2.snippets
@@ -153,3 +153,32 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 	}
 }
 endsnippet
+
+snippet ent "symfony2 doctrine entity" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * ${3:@author `whoami`}${4}
+ *
+ * @ORM\Entity()
+ * @ORM\Table(name="`!p snip.rv = re.match(r'.*(?=\.)', fn).group().lower()`")
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+`
+{
+	/**
+	 * @ORM\Column(type="integer")
+	 * @ORM\GeneratedValue
+	 * @ORM\Id
+	 */
+	private $id;
+}
+endsnippet

From 7f9c4f58076d057e10348f2ba9329c9e1f36b116 Mon Sep 17 00:00:00 2001
From: Adnan Zafar <adnanjzafar@gmail.com>
Date: Thu, 25 Jul 2013 17:17:32 -0400
Subject: [PATCH 0190/1587] Modify snippets to support zero tabstop

---
 snippets/_.snippets                 |  24 +-
 snippets/actionscript.snippets      |  40 +-
 snippets/apache.snippets            |  12 +-
 snippets/autoit.snippets            |  34 +-
 snippets/c.snippets                 |  60 +--
 snippets/chef.snippets              |  22 +-
 snippets/clojure.snippets           |  62 +--
 snippets/cmake.snippets             |  20 +-
 snippets/coffee.snippets            |  46 +-
 snippets/cpp.snippets               |  54 +--
 snippets/cs.snippets                | 158 +++----
 snippets/css.snippets               | 372 +++++++--------
 snippets/dart.snippets              |  50 +--
 snippets/diff.snippets              |   2 +-
 snippets/django.snippets            |  64 +--
 snippets/elixir.snippets            |  56 +--
 snippets/erlang.snippets            |  34 +-
 snippets/eruby.snippets             |  98 ++--
 snippets/falcon.snippets            |  22 +-
 snippets/go.snippets                |  70 +--
 snippets/haml.snippets              |  16 +-
 snippets/haskell.snippets           |  52 +--
 snippets/html.snippets              | 522 ++++++++++-----------
 snippets/html_minimal.snippets      |  24 +-
 snippets/htmldjango.snippets        |  94 ++--
 snippets/htmltornado.snippets       |  32 +-
 snippets/java.snippets              | 114 ++---
 snippets/javascript-jquery.snippets | 416 ++++++++---------
 snippets/javascript.snippets        |  62 +--
 snippets/jsp.snippets               |  64 +--
 snippets/ledger.snippets            |   2 +-
 snippets/lua.snippets               |  10 +-
 snippets/make.snippets              |   2 +-
 snippets/mako.snippets              |  32 +-
 snippets/markdown.snippets          |  44 +-
 snippets/objc.snippets              | 112 ++---
 snippets/openfoam.snippets          |  10 +-
 snippets/perl.snippets              |  90 ++--
 snippets/php.snippets               | 152 +++----
 snippets/plsql.snippets             |  44 +-
 snippets/po.snippets                |   2 +-
 snippets/processing.snippets        | 416 ++++++++---------
 snippets/progress.snippets          |  16 +-
 snippets/puppet.snippets            |  80 ++--
 snippets/python.snippets            |  72 +--
 snippets/r.snippets                 |  90 ++--
 snippets/rst.snippets               |  42 +-
 snippets/ruby.snippets              | 672 ++++++++++++++--------------
 snippets/scala.snippets             | 134 +++---
 snippets/sh.snippets                |  16 +-
 snippets/snippets.snippets          |   4 +-
 snippets/sql.snippets               |  24 +-
 snippets/tcl.snippets               |  38 +-
 snippets/tex.snippets               | 128 +++---
 snippets/textile.snippets           |  12 +-
 snippets/vim.snippets               |  22 +-
 snippets/xslt.snippets              |  48 +-
 snippets/yii-chtml.snippets         | 122 ++---
 snippets/yii.snippets               |  84 ++--
 snippets/zsh.snippets               |  32 +-
 60 files changed, 2624 insertions(+), 2624 deletions(-)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index 6204aee5d..6a3d8b280 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -2,7 +2,7 @@
 
 # (c) holds no legal value ;)
 snippet c)
-	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`}. All Rights Reserved.${2}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`}. All Rights Reserved.
 snippet date
 	`strftime("%Y-%m-%d")`
 snippet ddate
@@ -30,7 +30,7 @@ snippet GPL2
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-	${3}
+	${0}
 snippet LGPL2
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -48,7 +48,7 @@ snippet LGPL2
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
 
-	${3}
+	${0}
 snippet GPL3
 	${1:one line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -66,7 +66,7 @@ snippet GPL3
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	${3}
+	${0}
 snippet LGPL3
 	${1:One line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -84,7 +84,7 @@ snippet LGPL3
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
 
-	${3}
+	${0}
 snippet BSD2
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -114,7 +114,7 @@ snippet BSD2
 	are those of the authors and should not be interpreted as representing
 	official policies, either expressedor implied, of $2.
 
-	${4}
+	${0}
 snippet BSD3
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -142,7 +142,7 @@ snippet BSD3
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-	${4}
+	${0}
 snippet BSD4
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -173,7 +173,7 @@ snippet BSD4
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-	${4}
+	${0}
 snippet MIT
 	${1:one line to give the program's name and a brief description}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
@@ -196,7 +196,7 @@ snippet MIT
 	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 	OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-	${3}
+	${0}
 snippet APACHE
 	${1:one line to give the program's name and a brief description}
 	Copyright `strftime("%Y")` ${2:copyright holder}
@@ -213,7 +213,7 @@ snippet APACHE
 	See the License for the specific language governing permissions and
 	limitations under the License.
 
-	${3}
+	${0}
 snippet BEERWARE
 	${2:one line to give the program's name and a brief description}
 	Copyright `strftime("%Y")` ${3:copyright holder}
@@ -223,13 +223,13 @@ snippet BEERWARE
 	can do whatever you want with this stuff. If we meet some day, and you think
 	this stuff is worth it, you can buy me a beer or coffee in return
 
-	${4}
+	${0}
 
 snippet WTFPL
 			DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 					Version 2, December 2004
 
-	Copyright `strftime("%Y")` ${1:copyright holder}
+	Copyright `strftime("%Y")` ${0:copyright holder}
 
 	Everyone is permitted to copy and distribute verbatim or modified
 	copies of this license document, and changing it is allowed as long
diff --git a/snippets/actionscript.snippets b/snippets/actionscript.snippets
index 1aeca1c93..6b1d8ebe6 100644
--- a/snippets/actionscript.snippets
+++ b/snippets/actionscript.snippets
@@ -20,7 +20,7 @@ snippet main
 
 	}
 snippet class
-	${1:public|internal} class ${2:name} ${3:extends } {
+	${1:public|internal} class ${2:name} ${0:extends } {
 		public function $2 (	) {
 			("start");
 		}
@@ -28,7 +28,7 @@ snippet class
 snippet all
 	package name {
 
-		${1:public|internal|final} class ${2:name} ${3:extends } {
+		${1:public|internal|final} class ${2:name} ${0:extends } {
 			private|public| static const FOO = "abc";
 			private|public| static var BAR = "abc";
 
@@ -55,48 +55,48 @@ snippet all
 snippet switch
 	switch(${1}){
 		case ${2}:
-			${3}
+			${0}
 		break;
 		default:
 	}
 snippet case
 		case ${1}:
-			${2}
+			${0}
 		break;
 snippet package
 	package ${1:package}{
-		${2}
+		${0}
 	}
 snippet wh
 	while ${1:cond}{
-		${2}
+		${0}
 	}
 snippet do
 	do {
-		${2}
+		${0}
 	} while (${1:cond})
 snippet wh
 	while ${1:cond}{
-		${2}
+		${0}
 	}
 snippet for enumerate names
 	for (${1:var} in ${2:object}){
-		${3}
+		${0}
 	}
 snippet for enumerate values
 	for each (${1:var} in ${2:object}){
-		${3}
+		${0}
 	}
 snippet get_set
 	function get ${1:name} {
 		return ${2}
 	}
 	function set $1 (newValue) {
-		${3}
+		${0}
 	}
 snippet interface
 	interface name {
-		function method(${1}):${2:returntype};
+		function method(${1}):${0:returntype};
 	}
 snippet try
 	try {
@@ -104,34 +104,34 @@ snippet try
 	} catch (error:ErrorType) {
 		${2}
 	} finally {
-		${3}
+		${0}
 	}
 # For Loop (same as c.snippet)
 snippet for for (..) {..}
 	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4}
+		${0}
 	}
 # Custom For Loop
 snippet forr
 	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
-		${5}
+		${0}
 	}
 # If Condition
 snippet if
 	if (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 snippet el
 	else {
-		${1}
+		${0}
 	}
 # Ternary conditional
 snippet t
-	${1:/* condition */} ? ${2:a} : ${3:b}
+	${1:/* condition */} ? ${2:a} : ${0:b}
 snippet fun
 	function ${1:function_name}(${2})${3}
 	{
-		${4}
+		${0}
 	}
 # FlxSprite (usefull when using the flixel library)
 snippet FlxSprite
@@ -150,7 +150,7 @@ snippet FlxSprite
 			override public function update():void
 			{
 				super.update();
-				${5}
+				${0}
 			}
 		}
 	}
diff --git a/snippets/apache.snippets b/snippets/apache.snippets
index 6f0c8873f..db3256e95 100644
--- a/snippets/apache.snippets
+++ b/snippets/apache.snippets
@@ -2,34 +2,34 @@
 # <Directory>
 snippet dir
 	<Directory ${1:/}>
-		DirectoryIndex ${2:index.html}
+		DirectoryIndex ${0:index.html}
 		Order Deny,Allow
 		Deny from All
 	</Directory>
 # <FilesMatch>
 snippet filesmatch
 	<FilesMatch "${1:regex}">
-		${2}
+		${0}
 	</FilesMatch>
 # <IfModule>
 snippet ifmodule
 	<IfModule ${1:mod_example.c}>
-		${2}
+		${0}
 	</IfModule>
 # <LimitExcept>
 snippet limitexcept
 	<LimitExcept ${1:POST GET}>
-		${2}
+		${0}
 	</LimitExcept>
 # <Proxy>
 snippet proxy
 	<Proxy ${1:*}>
-		${2}
+		${0}
 	</Proxy>
 # <VirtualHost>
 snippet virtualhost
 	<VirtualHost ${1:*}:${2:80}>
 		ServerAdmin ${3:webmaster@example.com}
 		DocumentRoot ${4:/www/example.com}
-		ServerName ${5:www.example.com}
+		ServerName ${0:www.example.com}
 	</VirtualHost>
diff --git a/snippets/autoit.snippets b/snippets/autoit.snippets
index b214fd2b2..f973fbc37 100644
--- a/snippets/autoit.snippets
+++ b/snippets/autoit.snippets
@@ -1,19 +1,19 @@
 snippet if
 	If ${1:condition} Then
-		${2:; True code}
+		${0:; True code}
 	EndIf
 snippet el
 	Else
-		${1}
+		${0}
 snippet eif
 	ElseIf ${1:condition} Then
-		${2:; True code}
+		${0:; True code}
 # If/Else block
 snippet ife
 	If ${1:condition} Then
 		${2:; True code}
 	Else
-		${3:; Else code}
+		${0:; Else code}
 	EndIf
 # If/ElseIf/Else block - because there is eif this is not really neccessary
 snippet ifelif
@@ -22,45 +22,45 @@ snippet ifelif
 	ElseIf ${3:condition 2} Then
 		${4:; True code}
 	Else
-		${5:; Else code}
+		${0:; Else code}
 	EndIf
 # Switch block
 snippet switch
 	Switch (${1:condition})
-	Case {$2:case1}:
-		{$3:; Case 1 code}
+	Case ${2:case1}:
+		${3:; Case 1 code}
 	Case Else:
-		{$4:; Else code}
+		${0:; Else code}
 	EndSwitch
 # Select block
 snippet select
 	Select (${1:condition})
-	Case {$2:case1}:
-		{$3:; Case 1 code}
+	Case ${2:case1}:
+		${3:; Case 1 code}
 	Case Else:
-		{$4:; Else code}
+		${0:; Else code}
 	EndSelect
 # While loop
 snippet wh
 	While (${1:condition})
-		${2:; code...}
+		${0:; code...}
 	WEnd
 # For loop
 snippet for
 	For ${1:n} = ${3:1} to ${2:count}
-		${4:; code...}
+		${0:; code...}
 	Next
 # New Function
 snippet func
 	Func ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
-		${4:Return}
+		${0:Return}
 	EndFunc
 # Message box
 snippet msg
-	MsgBox(${3:MsgType}, ${1:"Title"}, ${2:"Message Text"})
+	MsgBox(${0:MsgType}, ${1:"Title"}, ${2:"Message Text"})
 # Debug Message
 snippet debug
-	MsgBox(0, "Debug", ${1:"Debug Message"})
+	MsgBox(0, "Debug", ${0:"Debug Message"})
 # Show Variable Debug Message
 snippet showvar
-	MsgBox(0, "${1:VarName}", $1)
+	MsgBox(0, "${0:VarName}", $1)
diff --git a/snippets/c.snippets b/snippets/c.snippets
index 757802438..96e19a0ab 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -3,29 +3,29 @@
 snippet main
 	int main(int argc, const char *argv[])
 	{
-		${1}
+		${0}
 		return 0;
 	}
 # main(void)
 snippet mainn
 	int main(void)
 	{
-		${1}
+		${0}
 		return 0;
 	}
 ##
 ## Preprocessor
 # #include <...>
 snippet inc
-	#include <${1:stdio}.h>${2}
+	#include <${1:stdio}.h>
 # #include "..."
 snippet Inc
-	#include "${1:`vim_snippets#Filename("$1.h")`}"${2}
+	#include "${1:`vim_snippets#Filename("$1.h")`}"
 # ifndef...define...endif
 snippet ndef
 	#ifndef $1
 	#define ${1:SYMBOL} ${2:value}
-	#endif${3}
+	#endif
 # define
 snippet def
 	#define
@@ -33,11 +33,11 @@ snippet def
 snippet ifdef
 	#ifdef ${1:FOO}
 		${2:#define }
-	#endif${3}
+	#endif
 # if
 snippet #if
 	#if ${1:FOO}
-		${2}
+		${0}
 	#endif
 # header include guard
 snippet once
@@ -45,7 +45,7 @@ snippet once
 
 	#define $1
 
-	${2}
+	${0}
 
 	#endif /* end of include guard: $1 */
 ##
@@ -54,20 +54,20 @@ snippet once
 snippet if
 	if (${1:/* condition */}) {
 		${2}
-	}${3}
+	}
 # else
 snippet el
 	else {
 		${1}
-	}${2}
+	}
 # else if
 snippet elif
 	else if (${1:/* condition */}) {
 		${2}
-	}${3}
+	}
 # ifi
 snippet ifi
-	if (${1:/* condition */}) ${2};${3}
+	if (${1:/* condition */}) ${2};
 # ternary
 snippet t
 	${1:/* condition */} ? ${2:a} : ${3:b}
@@ -79,41 +79,41 @@ snippet switch
 			${4:break;}${5}
 		default:
 			${6}
-	}${7}
+	}
 # switch without default
 snippet switchndef
 	switch (${1:/* variable */}) {
 		case ${2:/* variable case */}:
 			${3}
 			${4:break;}${5}
-	}${6}
+	}
 # case
 snippet case
 	case ${1:/* variable case */}:
 		${2}
-		${3:break;}${4}
+		${3:break;}
 ##
 ## Loops
 # for
 snippet for
 	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
 		${4}
-	}${5}
+	}
 # for (custom)
 snippet forr
 	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
 		${5}
-	}${6}
+	}
 # while
 snippet wh
 	while (${1:/* condition */}) {
 		${2}
-	}${3}
+	}
 # do... while
 snippet do
 	do {
 		${2}
-	} while (${1:/* condition */});${3}
+	} while (${1:/* condition */});
 ##
 ## Functions
 # function definition
@@ -121,38 +121,38 @@ snippet fun
 	${1:void} ${2:function_name}(${3})
 	{
 		${4}
-	}${5}
+	}
 # function declaration
 snippet fund
-	${1:void} ${2:function_name}(${3});${4}
+	${1:void} ${2:function_name}(${3});
 ##
 ## Types
 # typedef
 snippet td
-	typedef ${1:int} ${2:MyCustomType};${3}
+	typedef ${1:int} ${2:MyCustomType};
 # struct
 snippet st
 	struct ${1:`vim_snippets#Filename('$1_t', 'name')`} {
 		${2:/* data */}
-	}${3: /* optional variable list */};${4}
+	}${3: /* optional variable list */};
 # typedef struct
 snippet tds
 	typedef struct ${2:_$1 }{
 		${3:/* data */}
-	} ${1:`vim_snippets#Filename('$1_t', 'name')`};${4}
+	} ${1:`vim_snippets#Filename('$1_t', 'name')`};
 # typedef enum
 snippet tde
 	typedef enum {
 		${1:/* data */}
-	} ${2:foo};${3}
+	} ${2:foo};
 ##
 ## Input/Output
 # printf
 snippet pr
-	printf("${1:%s}\n"${2});${3}
+	printf("${1:%s}\n"${2});
 # fprintf (again, this isn't as nice as TextMate's version, but it works)
 snippet fpr
-	fprintf(${1:stderr}, "${2:%s}\n"${3});${4}
+	fprintf(${1:stderr}, "${2:%s}\n"${3});
 # getopt
 snippet getopt
 	int choice;
@@ -207,14 +207,14 @@ snippet getopt
 	{
 		while ( optind < argc )
 		{
-			${4}
+			${0}
 		}
 	}
 ##
 ## Miscellaneous
 # This is kind of convenient
 snippet .
-	[${1}]${2}
+	[${1}]
 # GPL
 snippet gpl
 	/*
@@ -234,4 +234,4 @@ snippet gpl
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
 
-	${2}
+	${0}
diff --git a/snippets/chef.snippets b/snippets/chef.snippets
index d44f535ec..429146ad6 100644
--- a/snippets/chef.snippets
+++ b/snippets/chef.snippets
@@ -17,7 +17,7 @@ snippet cookbook_file
 
 		${14:#}${15: action :create} # Create this file (Default)
 		${16:#}${17: action :create_if_missing} # Create only if it doesn't exist yet
-		${18:#}${19: action :delete} # Delete this file
+		${18:#}${0: action :delete} # Delete this file
 	end
 
 snippet execute
@@ -34,7 +34,7 @@ snippet execute
 		${18:#}umask ${19:nil} # Umask for files created by the command
 
 		${20:#}${21:action :run} # Run this command (Default)
-		${22:#}${23:action :nothing} # Do not run this command
+		${22:#}${0:action :nothing} # Do not run this command
 	end
 
 snippet link
@@ -46,7 +46,7 @@ snippet link
 		${8:#}group ${9} # The group of the symlink
 
 		${10:#}${11:action :create} # Create a link (Default)
-		${12:#}${13:action :delete} # Delete a link
+		${12:#}${0:action :delete} # Delete a link
 	end
 
 snippet package
@@ -61,7 +61,7 @@ snippet package
 		${12:#}${13:action :install} # Install a package - if version is provided, install that specific version (Default)
 		${14:#}${15:action :upgrade} # Upgrade a package - if version is provided, upgrade to that specific version
 		${16:#}${17:action :remove} # Remove a package
-		${18:#}${19:action :purge} # Purge a package (this usually entails removing configuration files as well as the package itself)
+		${18:#}${0:action :purge} # Purge a package (this usually entails removing configuration files as well as the package itself)
 	end
 
 snippet service
@@ -83,7 +83,7 @@ snippet service
 		${26:#}${27:action :start} # Start this service
 		${28:#}${29:action :stop} # Stop this service
 		${30:#}${31:action :restart} # Restart this service
-		${32:#}${33:action :reload} # Reload the configuration for this service
+		${32:#}${0:action :reload} # Reload the configuration for this service
 	end
 
 snippet file
@@ -97,7 +97,7 @@ snippet file
 
 		${12:#}${13:action :create} # Create this file (Default)
 		${14:#}${15:action :delete} # Delete this file
-		${16:#}${17:action :touch} # Touch this file (update the mtime/atime)
+		${16:#}${0:action :touch} # Touch this file (update the mtime/atime)
 	end
 
 snippet directory
@@ -109,7 +109,7 @@ snippet directory
 		${10:#}recursive ${11:false} # When deleting the directory, delete it recursively. When creating the directory, create recursively (ie, mkdir -p)
 
 		${12:#}${13:action :create} # Create this directory (Default)
-		${14:#}${15:action :delete} # Delete this directory
+		${14:#}${0:action :delete} # Delete this directory
 	end
 
 snippet template
@@ -127,7 +127,7 @@ snippet template
 
 		${20:#}${21:action :create} # Create the file (Default)
 		${22:#}${23:action :delete} # Delete this file
-		${24:#}${25:action :touch} # Touch this file (update the mtime/atime)
+		${24:#}${0:action :touch} # Touch this file (update the mtime/atime)
 	end
 
 snippet svn
@@ -144,7 +144,7 @@ snippet svn
 
 		${18:#}${19:action :sync} # Update the source to the specified revision, or get a new checkout (Default)
 		${20:#}${21:action :checkout} # Checkout the source. Does nothing if a checkout is available
-		${22:#}${23:action :export} # Export the source, excluding or removing any version control artifacts
+		${22:#}${0:action :export} # Export the source, excluding or removing any version control artifacts
 	end
 
 snippet git
@@ -162,7 +162,7 @@ snippet git
 
 		${20:#}${21:action :sync} # Update the source to the specified revision, or get a new clone (Default)
 		${22:#}${23:action :checkout} # Clone the source. Does nothing if a checkout is available
-		${24:#}${25:action :export} # Export the source, excluding or removing any version control artifacts
+		${24:#}${0:action :export} # Export the source, excluding or removing any version control artifacts
 	end
 
 snippet deploy
@@ -200,5 +200,5 @@ snippet deploy
 
 		${60:#}${61::deploy} # Deploy the application (Default)
 		${62:#}${63::force_deploy} # For the revision deploy strategy, this removes any existing release of the same code version and re-deploys in its place
-		${64:#}${65::rollback} # Rollback the application to the previous release
+		${64:#}${0::rollback} # Rollback the application to the previous release
 	end
diff --git a/snippets/clojure.snippets b/snippets/clojure.snippets
index 59867b755..6fd653fcc 100644
--- a/snippets/clojure.snippets
+++ b/snippets/clojure.snippets
@@ -1,90 +1,90 @@
 snippet comm
 	(comment
-	  ${1}
+	  ${0}
 	  )
 snippet condp
 	(condp ${1:pred} ${2:expr}
-	  ${3})
+	  ${0})
 snippet def
-	(def ${1})
+	(def ${0})
 snippet defm
 	(defmethod ${1:multifn} "${2:doc-string}" ${3:dispatch-val} [${4:args}]
-	  ${5})
+	  ${0})
 snippet defmm
-	(defmulti ${1:name} "${2:doc-string}" ${3:dispatch-fn})
+	(defmulti ${1:name} "${2:doc-string}" ${0:dispatch-fn})
 snippet defma
-	(defmacro ${1:name} "${2:doc-string}" ${3:dispatch-fn})
+	(defmacro ${1:name} "${2:doc-string}" ${0:dispatch-fn})
 snippet defn
 	(defn ${1:name} "${2:doc-string}" [${3:arg-list}]
-	  ${4})
+	  ${0})
 snippet defp
 	(defprotocol ${1:name}
-	  ${2})
+	  ${0})
 snippet defr
 	(defrecord ${1:name} [${2:fields}]
 	  ${3:protocol}
-	  ${4})
+	  ${0})
 snippet deft
 	(deftest ${1:name}
 	    (is (= ${2:assertion})))
-	  ${3})
+	  ${0})
 snippet is
-	(is (= ${1} ${2}))
+	(is (= ${1} ${0}))
 snippet defty
 	(deftype ${1:Name} [${2:fields}]
 	  ${3:Protocol}
-	  ${4})
+	  ${0})
 snippet doseq
 	(doseq [${1:elem} ${2:coll}]
-	  ${3})
+	  ${0})
 snippet fn
-	(fn [${1:arg-list}] ${2})
+	(fn [${1:arg-list}] ${0})
 snippet if
 	(if ${1:test-expr}
 	  ${2:then-expr}
-	  ${3:else-expr})
+	  ${0:else-expr})
 snippet if-let
 	(if-let [${1:result} ${2:test-expr}]
 		(${3:then-expr} $1)
-		(${4:else-expr}))
+		(${0:else-expr}))
 snippet imp
 	(:import [${1:package}])
-	& {:keys [${1:keys}] :or {${2:defaults}}}
+	& {:keys [${1:keys}] :or {${0:defaults}}}
 snippet let
 	(let [${1:name} ${2:expr}]
-		${3})
+		${0})
 snippet letfn
 	(letfn [(${1:name) [${2:args}]
-	          ${3})])
+	          ${0})])
 snippet map
-	(map ${1:func} ${2:coll})
+	(map ${1:func} ${0:coll})
 snippet mapl
-	(map #(${1:lambda}) ${2:coll})
+	(map #(${1:lambda}) ${0:coll})
 snippet met
 	(${1:name} [${2:this} ${3:args}]
-	  ${4})
+	  ${0})
 snippet ns
 	(ns ${1:name}
-	  ${2})
+	  ${0})
 snippet dotimes
 	(dotimes [_ 10]
 	  (time
 	    (dotimes [_ ${1:times}]
-	      ${2})))
+	      ${0})))
 snippet pmethod
-	(${1:name} [${2:this} ${3:args}])
+	(${1:name} [${2:this} ${0:args}])
 snippet refer
-	(:refer-clojure :exclude [${1}])
+	(:refer-clojure :exclude [${0}])
 snippet require
-	(:require [${1:namespace} :as [${2}]])
+	(:require [${1:namespace} :as [${0}]])
 snippet use
-	(:use [${1:namespace} :only [${2}]])
+	(:use [${1:namespace} :only [${0}]])
 snippet print
-	(println ${1})
+	(println ${0})
 snippet reduce
 	(reduce ${1:(fn [p n] ${3})} ${2})
 snippet when
-	(when ${1:test} ${2:body})
+	(when ${1:test} ${0:body})
 snippet when-let
 	(when-let [${1:result} ${2:test}]
-		${3:body})
+		${0:body})
diff --git a/snippets/cmake.snippets b/snippets/cmake.snippets
index 0c3a21576..ef2256a40 100644
--- a/snippets/cmake.snippets
+++ b/snippets/cmake.snippets
@@ -8,7 +8,7 @@ snippet cmake
 		${$2_INCLUDE_DIR}
 	)
 
-	ADD_SUBDIRECTORY(${3:src})
+	ADD_SUBDIRECTORY(${0:src})
 
 	ADD_EXECUTABLE($1)
 
@@ -18,41 +18,41 @@ snippet cmake
 
 snippet include
 	INCLUDE_DIRECTORIES(
-		${${1:INCLUDE_DIR}}
+		${${0:INCLUDE_DIR}}
 	)
 
 snippet find
-	FIND_PACKAGE(${1:LIBRARY})
+	FIND_PACKAGE(${0:LIBRARY})
 
 snippet glob
-	FILE(GLOB ${1:SRCS} *.${2:cpp})
+	FILE(GLOB ${1:SRCS} *.${0:cpp})
 
 snippet subdir
-	ADD_SUBDIRECTORY(${1:src})
+	ADD_SUBDIRECTORY(${0:src})
 
 snippet lib
 	ADD_LIBRARY(${1:lib} ${2:STATIC}
-		${${3:SRCS}}
+		${${0:SRCS}}
 	)
 
 snippet link
 	TARGET_LINK_LIBRARIES(${1:bin}
-		${2:somelib}
+		${0:somelib}
 	)
 
 snippet bin
 	ADD_EXECUTABLE(${1:bin})
 
 snippet set
-	SET(${1:var} ${2:val})
+	SET(${1:var} ${0:val})
 
 snippet dep
 	ADD_DEPENDENCIES(${1:target}
-		${2:dep}
+		${0:dep}
 	)
 
 snippet props
 	SET_TARGET_PROPERTIES(${1:target}
 		${2:PROPERTIES} ${3:COMPILE_FLAGS}
-		${4:"-O3 -Wall -pedantic"}
+		${0:"-O3 -Wall -pedantic"}
 	)
diff --git a/snippets/coffee.snippets b/snippets/coffee.snippets
index 8e2f20e0b..aca6e81aa 100644
--- a/snippets/coffee.snippets
+++ b/snippets/coffee.snippets
@@ -2,94 +2,94 @@
 snippet forindo
 	for ${1:name} in ${2:array}
 		do ($1) ->
-			${3:// body}
+			${0:// body}
 # Array comprehension
 snippet fora
 	for ${1:name} in ${2:array}
-		${3:# body...}
+		${0:# body...}
 # Object comprehension
 snippet foro
 	for ${1:key}, ${2:value} of ${3:object}
-		${4:# body...}
+		${0:# body...}
 # Range comprehension (inclusive)
 snippet forr
 	for ${1:name} in [${2:start}..${3:finish}]
-		${4:# body...}
+		${0:# body...}
 snippet forrb
 	for ${1:name} in [${2:start}..${3:finish}] by ${4:step}
-		${5:# body...}
+		${0:# body...}
 # Range comprehension (exclusive)
 snippet forrex
 	for ${1:name} in [${2:start}...${3:finish}]
-		${4:# body...}
+		${0:# body...}
 snippet forrexb
 	for ${1:name} in [${2:start}...${3:finish}] by ${4:step}
-		${5:# body...}
+		${0:# body...}
 # Function
 snippet fun
 	(${1:args}) ->
-		${2:# body...}
+		${0:# body...}
 # Function (bound)
 snippet bfun
 	(${1:args}) =>
-		${2:# body...}
+		${0:# body...}
 # Class
 snippet cla class ..
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		${2}
+		${0}
 snippet cla class .. constructor: ..
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		constructor: (${2:args}) ->
 			${3}
 
-		${4}
+		${0}
 snippet cla class .. extends ..
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
-		${3}
+		${0}
 snippet cla class .. extends .. constructor: ..
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
 		constructor: (${3:args}) ->
 			${4}
 
-		${5}
+		${0}
 # If
 snippet if
 	if ${1:condition}
-		${2:# body...}
+		${0:# body...}
 # If __ Else
 snippet ife
 	if ${1:condition}
 		${2:# body...}
 	else
-		${3:# body...}
+		${0:# body...}
 # Else if
 snippet eif
 	else if ${1:condition}
-		${2:# body...}
+		${0:# body...}
 # Ternary If
 snippet ifte
-	if ${1:condition} then ${2:value} else ${3:other}
+	if ${1:condition} then ${2:value} else ${0:other}
 # Unless
 snippet unl
-	${1:action} unless ${2:condition}
+	${1:action} unless ${0:condition}
 # Switch
 snippet swi
 	switch ${1:object}
 		when ${2:value}
-			${3:# body...}
+			${0:# body...}
 
 # Log
 snippet log
-	console.log ${1}
+	console.log ${0}
 # Try __ Catch
 snippet try
 	try
 		${1}
 	catch ${2:error}
-		${3}
+		${0}
 # Require
 snippet req
-	${2:$1} = require '${1:sys}'${3}
+	${2:$1} = require '${1:sys}'
 # Export
 snippet exp
-	${1:root} = exports ? this
+	${0:root} = exports ? this
diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 1fa9ec876..cdccf1eba 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -1,52 +1,52 @@
 ## STL Collections
 # std::array
 snippet array
-	std::array<${1:T}, ${2:N}> ${3};${4}
+	std::array<${1:T}, ${2:N}> ${3};
 # std::vector
 snippet vector
-	std::vector<${1:T}> ${2};${3}
+	std::vector<${1:T}> ${2};
 # std::deque
 snippet deque
-	std::deque<${1:T}> ${2};${3}
+	std::deque<${1:T}> ${2};
 # std::forward_list
 snippet flist
-	std::forward_list<${1:T}> ${2};${3}
+	std::forward_list<${1:T}> ${2};
 # std::list
 snippet list
-	std::list<${1:T}> ${2};${3}
+	std::list<${1:T}> ${2};
 # std::set
 snippet set
-	std::set<${1:T}> ${2};${3}
+	std::set<${1:T}> ${2};
 # std::map
 snippet map
-	std::map<${1:Key}, ${2:T}> ${3};${4}
+	std::map<${1:Key}, ${2:T}> ${3};
 # std::multiset
 snippet mset
-	std::multiset<${1:T}> ${2};${3}
+	std::multiset<${1:T}> ${2};
 # std::multimap
 snippet mmap
-	std::multimap<${1:Key}, ${2:T}> ${3};${4}
+	std::multimap<${1:Key}, ${2:T}> ${3};
 # std::unordered_set
 snippet uset
-	std::unordered_set<${1:T}> ${2};${3}
+	std::unordered_set<${1:T}> ${2};
 # std::unordered_map
 snippet umap
-	std::unordered_map<${1:Key}, ${2:T}> ${3};${4}
+	std::unordered_map<${1:Key}, ${2:T}> ${3};
 # std::unordered_multiset
 snippet umset
-	std::unordered_multiset<${1:T}> ${2};${3}
+	std::unordered_multiset<${1:T}> ${2};
 # std::unordered_multimap
 snippet ummap
-	std::unordered_multimap<${1:Key}, ${2:T}> ${3};${4}
+	std::unordered_multimap<${1:Key}, ${2:T}> ${3};
 # std::stack
 snippet stack
-	std::stack<${1:T}> ${2};${3}
+	std::stack<${1:T}> ${2};
 # std::queue
 snippet queue
-	std::queue<${1:T}> ${2};${3}
+	std::queue<${1:T}> ${2};
 # std::priority_queue
 snippet pqueue
-	std::priority_queue<${1:T}> ${2};${3}
+	std::priority_queue<${1:T}> ${2};
 ##
 ## Access Modifiers
 # private
@@ -75,57 +75,57 @@ snippet cl
 		~$1();
 
 	private:
-		${3:/* data */}
+		${0:/* data */}
 	};
 # member function implementation
 snippet mfun
 	${4:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
-		${5}
+		${0}
 	}
 # namespace
 snippet ns
 	namespace ${1:`vim_snippets#Filename('', 'my')`} {
-		${2}
+		${0}
 	} /* namespace $1 */
 ##
 ## Input/Output
 # std::cout
 snippet cout
-	std::cout << ${1} << std::endl;${2}
+	std::cout << ${1} << std::endl;
 # std::cin
 snippet cin
-	std::cin >> ${1};${2}
+	std::cin >> ${1};
 ##
 ## Iteration
 # for i
 snippet fori
 	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
 		${4}
-	}${5}
+	}
 
 # foreach
 snippet fore
 	for (${1:auto} ${2:i} : ${3:container}) {
 		${4}
-	}${5}
+	}
 # iterator
 snippet iter
 	for (${1:std::vector}<${2:type}>::${3:const_iterator} ${4:i} = ${5:container}.begin(); $4 != $5.end(); ++$4) {
 		${6}
-	}${7}
+	}
 
 # auto iterator
 snippet itera
 	for (auto ${1:i} = ${2:container}.begin(); $1 != $2.end(); ++$1) {
 		${3:std::cout << *$1 << std::endl;}
-	}${4}
+	}
 ##
 ## Lambdas
 # lamda (one line)
 snippet ld
-	[${1}](${2}){${3}}${4}
+	[${1}](${2}){${3}}
 # lambda (multi-line)
 snippet lld
 	[${1}](${2}){
 		${3}
-	}${4}
+	}
diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 9a915f094..e537bce4c 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -59,203 +59,203 @@
 # entry point
 snippet sim
 	public static int Main(string[] args) {
-		${1}
+		${0}
 		return 0;
 	}
 snippet simc
 	public class Application {
 		public static int Main(string[] args) {
-			${1}
+			${0}
 			return 0;
 		}
 	}
 # if condition
 snippet if
 	if (${1}) {
-		${2}
+		${0}
 	}
 snippet el
 	else {
-		${1}
+		${0}
 	}
 snippet ifs
 	if (${1})
-		${2}
+		${0}
 # ternary conditional
 snippet t
-	${1} ? ${2} : ${3}
+	${1} ? ${2} : ${0}
 snippet ?
-	${1} ? ${2} : ${3}
+	${1} ? ${2} : ${0}
 # do while loop
 snippet do
 	do {
-		${2}
+		${0}
 	} while (${1});
 # while loop
 snippet wh
 	while (${1}) {
-		${2}
+		${0}
 	}
 # for loop
 snippet for
 	for (int ${1:i} = 0; $1 < ${2:count}; $1${3:++}) {
-		${4}
+		${0}
 	}
 # foreach
 snippet fore
 	foreach (var ${1:entry} in ${2}) {
-		${3}
+		${0}
 	}
 snippet foreach
 	foreach (var ${1:entry} in ${2}) {
-		${3}
+		${0}
 	}
 snippet each
 	foreach (var ${1:entry} in ${2}) {
-		${3}
+		${0}
 	}
 # interfaces
 snippet interface
 	public interface ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet if+
 	public interface ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 # class bodies
 snippet class
 	public class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls
 	${2:public} class ${1:`vim_snippets#Filename()`} {
-		${3}
+		${0}
 	}
 snippet cls+
 	public class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls+^
 	public static class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls&
 	internal class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls&^
 	internal static class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls|
 	protected class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 snippet cls|%
 	protected abstract class ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 # constructor
 snippet ctor
 	public ${1:`vim_snippets#Filename()`}() {
-		${2}
+		${0}
 	}
 # properties - auto properties by default.
 # default type is int with layout get / set.
 snippet prop
-	${1:public} ${2:int} ${3:} { get; set; }${4}
+	${1:public} ${2:int} ${3:} { get; set; }
 snippet p
-	${1:public} ${2:int} ${3:} { get; set; }${4}
+	${1:public} ${2:int} ${3:} { get; set; }
 snippet p+
-	public ${1:int} ${2:} { get; set; }${3}
+	public ${1:int} ${2:} { get; set; }
 snippet p+&
-	public ${1:int} ${2:} { get; internal set; }${3}
+	public ${1:int} ${2:} { get; internal set; }
 snippet p+|
-	public ${1:int} ${2:} { get; protected set; }${3}
+	public ${1:int} ${2:} { get; protected set; }
 snippet p+-
-	public ${1:int} ${2:} { get; private set; }${3}
+	public ${1:int} ${2:} { get; private set; }
 snippet p&
-	internal ${1:int} ${2:} { get; set; }${3}
+	internal ${1:int} ${2:} { get; set; }
 snippet p&|
-	internal ${1:int} ${2:} { get; protected set; }${3}
+	internal ${1:int} ${2:} { get; protected set; }
 snippet p&-
-	internal ${1:int} ${2:} { get; private set; }${3}
+	internal ${1:int} ${2:} { get; private set; }
 snippet p|
-	protected ${1:int} ${2:} { get; set; }${3}
+	protected ${1:int} ${2:} { get; set; }
 snippet p|-
-	protected ${1:int} ${2:} { get; private set; }${3}
+	protected ${1:int} ${2:} { get; private set; }
 snippet p-
-	private ${1:int} ${2:} { get; set; }${3}
+	private ${1:int} ${2:} { get; set; }
 # property - bool
 snippet pi
-	${1:public} int ${2:} { get; set; }${3}
+	${1:public} int ${2:} { get; set; }
 snippet pi+
-	public int ${1} { get; set; }${2}
+	public int ${1} { get; set; }
 snippet pi+&
-	public int ${1} { get; internal set; }${2}
+	public int ${1} { get; internal set; }
 snippet pi+|
-	public int ${1} { get; protected set; }${2}
+	public int ${1} { get; protected set; }
 snippet pi+-
-	public int ${1} { get; private set; }${2}
+	public int ${1} { get; private set; }
 snippet pi&
-	internal int ${1} { get; set; }${2}
+	internal int ${1} { get; set; }
 snippet pi&|
-	internal int ${1} { get; protected set; }${2}
+	internal int ${1} { get; protected set; }
 snippet pi&-
-	internal int ${1} { get; private set; }${2}
+	internal int ${1} { get; private set; }
 snippet pi|
-	protected int ${1} { get; set; }${2}
+	protected int ${1} { get; set; }
 snippet pi|-
-	protected int ${1} { get; private set; }${2}
+	protected int ${1} { get; private set; }
 snippet pi-
-	private int ${1} { get; set; }${2}
+	private int ${1} { get; set; }
 # property - bool
 snippet pb
-	${1:public} bool ${2:} { get; set; }${3}
+	${1:public} bool ${2:} { get; set; }
 snippet pb+
-	public bool ${1} { get; set; }${2}
+	public bool ${1} { get; set; }
 snippet pb+&
-	public bool ${1} { get; internal set; }${2}
+	public bool ${1} { get; internal set; }
 snippet pb+|
-	public bool ${1} { get; protected set; }${2}
+	public bool ${1} { get; protected set; }
 snippet pb+-
-	public bool ${1} { get; private set; }${2}
+	public bool ${1} { get; private set; }
 snippet pb&
-	internal bool ${1} { get; set; }${2}
+	internal bool ${1} { get; set; }
 snippet pb&|
-	internal bool ${1} { get; protected set; }${2}
+	internal bool ${1} { get; protected set; }
 snippet pb&-
-	internal bool ${1} { get; private set; }${2}
+	internal bool ${1} { get; private set; }
 snippet pb|
-	protected bool ${1} { get; set; }${2}
+	protected bool ${1} { get; set; }
 snippet pb|-
-	protected bool ${1} { get; private set; }${2}
+	protected bool ${1} { get; private set; }
 snippet pb-
-	private bool ${1} { get; set; }${2}
+	private bool ${1} { get; set; }
 # property - string
 snippet ps
-	${1:public} string ${2:} { get; set; }${3}
+	${1:public} string ${2:} { get; set; }
 snippet ps+
-	public string ${1} { get; set; }${2}
+	public string ${1} { get; set; }
 snippet ps+&
-	public string ${1} { get; internal set; }${2}
+	public string ${1} { get; internal set; }
 snippet ps+|
-	public string ${1} { get; protected set; }${2}
+	public string ${1} { get; protected set; }
 snippet ps+-
-	public string ${1} { get; private set; }${2}
+	public string ${1} { get; private set; }
 snippet ps&
-	internal string ${1} { get; set; }${2}
+	internal string ${1} { get; set; }
 snippet ps&|
-	internal string ${1} { get; protected set; }${2}
+	internal string ${1} { get; protected set; }
 snippet ps&-
-	internal string ${1} { get; private set; }${2}
+	internal string ${1} { get; private set; }
 snippet ps|
-	protected string ${1} { get; set; }${2}
+	protected string ${1} { get; set; }
 snippet ps|-
-	protected string ${1} { get; private set; }${2}
+	protected string ${1} { get; private set; }
 snippet ps-
-	private string ${1} { get; set; }${2}
+	private string ${1} { get; set; }
 # members - void
 snippet m
 	${1:public} ${2:void} ${3:}(${4:}) {
@@ -343,32 +343,32 @@ snippet ms-
 # structure
 snippet struct
 	public struct ${1:`vim_snippets#Filename()`} {
-		${2}
+		${0}
 	}
 # enumeration
 snippet enum
 	public enum ${1} {
-		${2}
+		${0}
 	}
 # preprocessor directives
 snippet #if
 	#if
-		${1}
+		${0}
 	#endif
 # inline xml documentation
 snippet ///
 	/// <summary>
-	/// ${1}
+	/// ${0}
 	/// </summary>
 snippet <p
-	<param name="${1}">${2:$1}</param>${3}
+	<param name="${1}">${2:$1}</param>
 snippet <ex
-	<exception cref="${1:System.Exception}">${2}</exception>${3}
+	<exception cref="${1:System.Exception}">${2}</exception>
 snippet <r
-	<returns>${1}</returns>{${2}
+	<returns>${1}</returns>{
 snippet <s
-	<see cref="${1}"/>${2}
+	<see cref="${1}"/>
 snippet <rem
-	<remarks>${1}</remarks>${2}
+	<remarks>${1}</remarks>
 snippet <c
-	<code>${1}</code>${2}
+	<code>${1}</code>
diff --git a/snippets/css.snippets b/snippets/css.snippets
index 72212d2d8..8886643a4 100644
--- a/snippets/css.snippets
+++ b/snippets/css.snippets
@@ -1,50 +1,50 @@
 snippet .
 	${1} {
-		${2}
+		${0}
 	}
 snippet !
 	 !important
 snippet bdi:m+
-	-moz-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${7:stretch};
+	-moz-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
 snippet bdi:m
-	-moz-border-image: ${1};
+	-moz-border-image: ${0};
 snippet bdrz:m
-	-moz-border-radius: ${1};
+	-moz-border-radius: ${0};
 snippet bxsh:m+
-	-moz-box-shadow: ${1:0} ${2:0} ${3:0} #${4:000};
+	-moz-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
 snippet bxsh:m
-	-moz-box-shadow: ${1};
+	-moz-box-shadow: ${0};
 snippet bdi:w+
-	-webkit-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${7:stretch};
+	-webkit-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
 snippet bdi:w
-	-webkit-border-image: ${1};
+	-webkit-border-image: ${0};
 snippet bdrz:w
-	-webkit-border-radius: ${1};
+	-webkit-border-radius: ${0};
 snippet bxsh:w+
-	-webkit-box-shadow: ${1:0} ${2:0} ${3:0} #${4:000};
+	-webkit-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
 snippet bxsh:w
-	-webkit-box-shadow: ${1};
+	-webkit-box-shadow: ${0};
 snippet @f
 	@font-face {
 		font-family: ${1};
-		src: url(${2});
+		src: url(${0});
 	}
 snippet @i
-	@import url(${1});
+	@import url(${0});
 snippet @m
 	@media ${1:print} {
-		${2}
+		${0}
 	}
 snippet bg+
-	background: #${1:FFF} url(${2}) ${3:0} ${4:0} ${5:no-repeat};
+	background: #${1:FFF} url(${2}) ${3:0} ${4:0} ${0:no-repeat};
 snippet bga
-	background-attachment: ${1};
+	background-attachment: ${0};
 snippet bga:f
 	background-attachment: fixed;
 snippet bga:s
 	background-attachment: scroll;
 snippet bgbk
-	background-break: ${1};
+	background-break: ${0};
 snippet bgbk:bb
 	background-break: bounding-box;
 snippet bgbk:c
@@ -52,7 +52,7 @@ snippet bgbk:c
 snippet bgbk:eb
 	background-break: each-box;
 snippet bgcp
-	background-clip: ${1};
+	background-clip: ${0};
 snippet bgcp:bb
 	background-clip: border-box;
 snippet bgcp:cb
@@ -62,15 +62,15 @@ snippet bgcp:nc
 snippet bgcp:pb
 	background-clip: padding-box;
 snippet bgc
-	background-color: #${1:FFF};
+	background-color: #${0:FFF};
 snippet bgc:t
 	background-color: transparent;
 snippet bgi
-	background-image: url(${1});
+	background-image: url(${0});
 snippet bgi:n
 	background-image: none;
 snippet bgo
-	background-origin: ${1};
+	background-origin: ${0};
 snippet bgo:bb
 	background-origin: border-box;
 snippet bgo:cb
@@ -78,13 +78,13 @@ snippet bgo:cb
 snippet bgo:pb
 	background-origin: padding-box;
 snippet bgpx
-	background-position-x: ${1};
+	background-position-x: ${0};
 snippet bgpy
-	background-position-y: ${1};
+	background-position-y: ${0};
 snippet bgp
-	background-position: ${1:0} ${2:0};
+	background-position: ${1:0} ${0:0};
 snippet bgr
-	background-repeat: ${1};
+	background-repeat: ${0};
 snippet bgr:n
 	background-repeat: no-repeat;
 snippet bgr:x
@@ -94,7 +94,7 @@ snippet bgr:y
 snippet bgr:r
 	background-repeat: repeat;
 snippet bgz
-	background-size: ${1};
+	background-size: ${0};
 snippet bgz:a
 	background-size: auto;
 snippet bgz:ct
@@ -102,67 +102,67 @@ snippet bgz:ct
 snippet bgz:cv
 	background-size: cover;
 snippet bg
-	background: ${1};
+	background: ${0};
 snippet bg:ie
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${2:crop}');
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}');
 snippet bg:n
 	background: none;
 snippet bd+
-	border: ${1:1px} ${2:solid} #${3:000};
+	border: ${1:1px} ${2:solid} #${0:000};
 snippet bdb+
-	border-bottom: ${1:1px} ${2:solid} #${3:000};
+	border-bottom: ${1:1px} ${2:solid} #${0:000};
 snippet bdbc
-	border-bottom-color: #${1:000};
+	border-bottom-color: #${0:000};
 snippet bdbi
-	border-bottom-image: url(${1});
+	border-bottom-image: url(${0});
 snippet bdbi:n
 	border-bottom-image: none;
 snippet bdbli
-	border-bottom-left-image: url(${1});
+	border-bottom-left-image: url(${0});
 snippet bdbli:c
 	border-bottom-left-image: continue;
 snippet bdbli:n
 	border-bottom-left-image: none;
 snippet bdblrz
-	border-bottom-left-radius: ${1};
+	border-bottom-left-radius: ${0};
 snippet bdbri
-	border-bottom-right-image: url(${1});
+	border-bottom-right-image: url(${0});
 snippet bdbri:c
 	border-bottom-right-image: continue;
 snippet bdbri:n
 	border-bottom-right-image: none;
 snippet bdbrrz
-	border-bottom-right-radius: ${1};
+	border-bottom-right-radius: ${0};
 snippet bdbs
-	border-bottom-style: ${1};
+	border-bottom-style: ${0};
 snippet bdbs:n
 	border-bottom-style: none;
 snippet bdbw
-	border-bottom-width: ${1};
+	border-bottom-width: ${0};
 snippet bdb
-	border-bottom: ${1};
+	border-bottom: ${0};
 snippet bdb:n
 	border-bottom: none;
 snippet bdbk
-	border-break: ${1};
+	border-break: ${0};
 snippet bdbk:c
 	border-break: close;
 snippet bdcl
-	border-collapse: ${1};
+	border-collapse: ${0};
 snippet bdcl:c
 	border-collapse: collapse;
 snippet bdcl:s
 	border-collapse: separate;
 snippet bdc
-	border-color: #${1:000};
+	border-color: #${0:000};
 snippet bdci
-	border-corner-image: url(${1});
+	border-corner-image: url(${0});
 snippet bdci:c
 	border-corner-image: continue;
 snippet bdci:n
 	border-corner-image: none;
 snippet bdf
-	border-fit: ${1};
+	border-fit: ${0};
 snippet bdf:c
 	border-fit: clip;
 snippet bdf:of
@@ -178,55 +178,55 @@ snippet bdf:sp
 snippet bdf:st
 	border-fit: stretch;
 snippet bdi
-	border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${7:stretch};
+	border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
 snippet bdi:n
 	border-image: none;
 snippet bdl+
-	border-left: ${1:1px} ${2:solid} #${3:000};
+	border-left: ${1:1px} ${2:solid} #${0:000};
 snippet bdlc
-	border-left-color: #${1:000};
+	border-left-color: #${0:000};
 snippet bdli
-	border-left-image: url(${1});
+	border-left-image: url(${0});
 snippet bdli:n
 	border-left-image: none;
 snippet bdls
-	border-left-style: ${1};
+	border-left-style: ${0};
 snippet bdls:n
 	border-left-style: none;
 snippet bdlw
-	border-left-width: ${1};
+	border-left-width: ${0};
 snippet bdl
-	border-left: ${1};
+	border-left: ${0};
 snippet bdl:n
 	border-left: none;
 snippet bdlt
-	border-length: ${1};
+	border-length: ${0};
 snippet bdlt:a
 	border-length: auto;
 snippet bdrz
-	border-radius: ${1};
+	border-radius: ${0};
 snippet bdr+
-	border-right: ${1:1px} ${2:solid} #${3:000};
+	border-right: ${1:1px} ${2:solid} #${0:000};
 snippet bdrc
-	border-right-color: #${1:000};
+	border-right-color: #${0:000};
 snippet bdri
-	border-right-image: url(${1});
+	border-right-image: url(${0});
 snippet bdri:n
 	border-right-image: none;
 snippet bdrs
-	border-right-style: ${1};
+	border-right-style: ${0};
 snippet bdrs:n
 	border-right-style: none;
 snippet bdrw
-	border-right-width: ${1};
+	border-right-width: ${0};
 snippet bdr
-	border-right: ${1};
+	border-right: ${0};
 snippet bdr:n
 	border-right: none;
 snippet bdsp
-	border-spacing: ${1};
+	border-spacing: ${0};
 snippet bds
-	border-style: ${1};
+	border-style: ${0};
 snippet bds:ds
 	border-style: dashed;
 snippet bds:dtds
@@ -254,69 +254,69 @@ snippet bds:s
 snippet bds:w
 	border-style: wave;
 snippet bdt+
-	border-top: ${1:1px} ${2:solid} #${3:000};
+	border-top: ${1:1px} ${2:solid} #${0:000};
 snippet bdtc
-	border-top-color: #${1:000};
+	border-top-color: #${0:000};
 snippet bdti
-	border-top-image: url(${1});
+	border-top-image: url(${0});
 snippet bdti:n
 	border-top-image: none;
 snippet bdtli
-	border-top-left-image: url(${1});
+	border-top-left-image: url(${0});
 snippet bdtli:c
 	border-corner-image: continue;
 snippet bdtli:n
 	border-corner-image: none;
 snippet bdtlrz
-	border-top-left-radius: ${1};
+	border-top-left-radius: ${0};
 snippet bdtri
-	border-top-right-image: url(${1});
+	border-top-right-image: url(${0});
 snippet bdtri:c
 	border-top-right-image: continue;
 snippet bdtri:n
 	border-top-right-image: none;
 snippet bdtrrz
-	border-top-right-radius: ${1};
+	border-top-right-radius: ${0};
 snippet bdts
-	border-top-style: ${1};
+	border-top-style: ${0};
 snippet bdts:n
 	border-top-style: none;
 snippet bdtw
-	border-top-width: ${1};
+	border-top-width: ${0};
 snippet bdt
-	border-top: ${1};
+	border-top: ${0};
 snippet bdt:n
 	border-top: none;
 snippet bdw
-	border-width: ${1};
+	border-width: ${0};
 snippet bd
-	border: ${1};
+	border: ${0};
 snippet bd:n
 	border: none;
 snippet b
-	bottom: ${1};
+	bottom: ${0};
 snippet b:a
 	bottom: auto;
 snippet bxsh+
-	box-shadow: ${1:0} ${2:0} ${3:0} #${4:000};
+	box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
 snippet bxsh
-	box-shadow: ${1};
+	box-shadow: ${0};
 snippet bxsh:n
 	box-shadow: none;
 snippet bxz
-	box-sizing: ${1};
+	box-sizing: ${0};
 snippet bxz:bb
 	box-sizing: border-box;
 snippet bxz:cb
 	box-sizing: content-box;
 snippet cps
-	caption-side: ${1};
+	caption-side: ${0};
 snippet cps:b
 	caption-side: bottom;
 snippet cps:t
 	caption-side: top;
 snippet cl
-	clear: ${1};
+	clear: ${0};
 snippet cl:b
 	clear: both;
 snippet cl:l
@@ -326,23 +326,23 @@ snippet cl:n
 snippet cl:r
 	clear: right;
 snippet cp
-	clip: ${1};
+	clip: ${0};
 snippet cp:a
 	clip: auto;
 snippet cp:r
-	clip: rect(${1:0} ${2:0} ${3:0} ${4:0});
+	clip: rect(${1:0} ${2:0} ${3:0} ${0:0});
 snippet c
-	color: #${1:000};
+	color: #${0:000};
 snippet ct
-	content: ${1};
+	content: ${0};
 snippet ct:a
-	content: attr(${1});
+	content: attr(${0});
 snippet ct:cq
 	content: close-quote;
 snippet ct:c
-	content: counter(${1});
+	content: counter(${0});
 snippet ct:cs
-	content: counters(${1});
+	content: counters(${0});
 snippet ct:ncq
 	content: no-close-quote;
 snippet ct:noq
@@ -352,11 +352,11 @@ snippet ct:n
 snippet ct:oq
 	content: open-quote;
 snippet coi
-	counter-increment: ${1};
+	counter-increment: ${0};
 snippet cor
-	counter-reset: ${1};
+	counter-reset: ${0};
 snippet cur
-	cursor: ${1};
+	cursor: ${0};
 snippet cur:a
 	cursor: auto;
 snippet cur:c
@@ -374,7 +374,7 @@ snippet cur:p
 snippet cur:t
 	cursor: text;
 snippet d
-	display: ${1};
+	display: ${0};
 snippet d:mib
 	display: -moz-inline-box;
 snippet d:mis
@@ -414,7 +414,7 @@ snippet d:tbr
 snippet d:tb
 	display: table;
 snippet ec
-	empty-cells: ${1};
+	empty-cells: ${0};
 snippet ec:h
 	empty-cells: hide;
 snippet ec:s
@@ -422,7 +422,7 @@ snippet ec:s
 snippet exp
 	expression()
 snippet fl
-	float: ${1};
+	float: ${0};
 snippet fl:l
 	float: left;
 snippet fl:n
@@ -430,9 +430,9 @@ snippet fl:n
 snippet fl:r
 	float: right;
 snippet f+
-	font: ${1:1em} ${2:Arial},${3:sans-serif};
+	font: ${1:1em} ${2:Arial},${0:sans-serif};
 snippet fef
-	font-effect: ${1};
+	font-effect: ${0};
 snippet fef:eb
 	font-effect: emboss;
 snippet fef:eg
@@ -442,13 +442,13 @@ snippet fef:n
 snippet fef:o
 	font-effect: outline;
 snippet femp
-	font-emphasize-position: ${1};
+	font-emphasize-position: ${0};
 snippet femp:a
 	font-emphasize-position: after;
 snippet femp:b
 	font-emphasize-position: before;
 snippet fems
-	font-emphasize-style: ${1};
+	font-emphasize-style: ${0};
 snippet fems:ac
 	font-emphasize-style: accent;
 snippet fems:c
@@ -460,27 +460,27 @@ snippet fems:dt
 snippet fems:n
 	font-emphasize-style: none;
 snippet fem
-	font-emphasize: ${1};
+	font-emphasize: ${0};
 snippet ff
-	font-family: ${1};
+	font-family: ${0};
 snippet ff:c
-	font-family: ${1:'Monotype Corsiva','Comic Sans MS'},cursive;
+	font-family: ${0:'Monotype Corsiva','Comic Sans MS'},cursive;
 snippet ff:f
-	font-family: ${1:Capitals,Impact},fantasy;
+	font-family: ${0:Capitals,Impact},fantasy;
 snippet ff:m
-	font-family: ${1:Monaco,'Courier New'},monospace;
+	font-family: ${0:Monaco,'Courier New'},monospace;
 snippet ff:ss
-	font-family: ${1:Helvetica,Arial},sans-serif;
+	font-family: ${0:Helvetica,Arial},sans-serif;
 snippet ff:s
-	font-family: ${1:Georgia,'Times New Roman'},serif;
+	font-family: ${0:Georgia,'Times New Roman'},serif;
 snippet fza
-	font-size-adjust: ${1};
+	font-size-adjust: ${0};
 snippet fza:n
 	font-size-adjust: none;
 snippet fz
-	font-size: ${1};
+	font-size: ${0};
 snippet fsm
-	font-smooth: ${1};
+	font-smooth: ${0};
 snippet fsm:aw
 	font-smooth: always;
 snippet fsm:a
@@ -488,7 +488,7 @@ snippet fsm:a
 snippet fsm:n
 	font-smooth: never;
 snippet fst
-	font-stretch: ${1};
+	font-stretch: ${0};
 snippet fst:c
 	font-stretch: condensed;
 snippet fst:e
@@ -508,7 +508,7 @@ snippet fst:uc
 snippet fst:ue
 	font-stretch: ultra-expanded;
 snippet fs
-	font-style: ${1};
+	font-style: ${0};
 snippet fs:i
 	font-style: italic;
 snippet fs:n
@@ -516,13 +516,13 @@ snippet fs:n
 snippet fs:o
 	font-style: oblique;
 snippet fv
-	font-variant: ${1};
+	font-variant: ${0};
 snippet fv:n
 	font-variant: normal;
 snippet fv:sc
 	font-variant: small-caps;
 snippet fw
-	font-weight: ${1};
+	font-weight: ${0};
 snippet fw:b
 	font-weight: bold;
 snippet fw:br
@@ -532,31 +532,31 @@ snippet fw:lr
 snippet fw:n
 	font-weight: normal;
 snippet f
-	font: ${1};
+	font: ${0};
 snippet h
-	height: ${1};
+	height: ${0};
 snippet h:a
 	height: auto;
 snippet l
-	left: ${1};
+	left: ${0};
 snippet l:a
 	left: auto;
 snippet lts
-	letter-spacing: ${1};
+	letter-spacing: ${0};
 snippet lh
-	line-height: ${1};
+	line-height: ${0};
 snippet lisi
-	list-style-image: url(${1});
+	list-style-image: url(${0});
 snippet lisi:n
 	list-style-image: none;
 snippet lisp
-	list-style-position: ${1};
+	list-style-position: ${0};
 snippet lisp:i
 	list-style-position: inside;
 snippet lisp:o
 	list-style-position: outside;
 snippet list
-	list-style-type: ${1};
+	list-style-type: ${0};
 snippet list:c
 	list-style-type: circle;
 snippet list:dclz
@@ -574,75 +574,75 @@ snippet list:s
 snippet list:ur
 	list-style-type: upper-roman;
 snippet lis
-	list-style: ${1};
+	list-style: ${0};
 snippet lis:n
 	list-style: none;
 snippet mb
-	margin-bottom: ${1};
+	margin-bottom: ${0};
 snippet mb:a
 	margin-bottom: auto;
 snippet ml
-	margin-left: ${1};
+	margin-left: ${0};
 snippet ml:a
 	margin-left: auto;
 snippet mr
-	margin-right: ${1};
+	margin-right: ${0};
 snippet mr:a
 	margin-right: auto;
 snippet mt
-	margin-top: ${1};
+	margin-top: ${0};
 snippet mt:a
 	margin-top: auto;
 snippet m
-	margin: ${1};
+	margin: ${0};
 snippet m:4
-	margin: ${1:0} ${2:0} ${3:0} ${4:0};
+	margin: ${1:0} ${2:0} ${3:0} ${0:0};
 snippet m:3
-	margin: ${1:0} ${2:0} ${3:0};
+	margin: ${1:0} ${2:0} ${0:0};
 snippet m:2
-	margin: ${1:0} ${2:0};
+	margin: ${1:0} ${0:0};
 snippet m:0
 	margin: 0;
 snippet m:a
 	margin: auto;
 snippet mah
-	max-height: ${1};
+	max-height: ${0};
 snippet mah:n
 	max-height: none;
 snippet maw
-	max-width: ${1};
+	max-width: ${0};
 snippet maw:n
 	max-width: none;
 snippet mih
-	min-height: ${1};
+	min-height: ${0};
 snippet miw
-	min-width: ${1};
+	min-width: ${0};
 snippet op
-	opacity: ${1};
+	opacity: ${0};
 snippet op:ie
-	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=${1:100});
+	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100});
 snippet op:ms
-	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${1:100})';
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})';
 snippet orp
-	orphans: ${1};
+	orphans: ${0};
 snippet o+
-	outline: ${1:1px} ${2:solid} #${3:000};
+	outline: ${1:1px} ${2:solid} #${0:000};
 snippet oc
-	outline-color: ${1:#000};
+	outline-color: ${0:#000};
 snippet oc:i
 	outline-color: invert;
 snippet oo
-	outline-offset: ${1};
+	outline-offset: ${0};
 snippet os
-	outline-style: ${1};
+	outline-style: ${0};
 snippet ow
-	outline-width: ${1};
+	outline-width: ${0};
 snippet o
-	outline: ${1};
+	outline: ${0};
 snippet o:n
 	outline: none;
 snippet ovs
-	overflow-style: ${1};
+	overflow-style: ${0};
 snippet ovs:a
 	overflow-style: auto;
 snippet ovs:mq
@@ -654,7 +654,7 @@ snippet ovs:p
 snippet ovs:s
 	overflow-style: scrollbar;
 snippet ovx
-	overflow-x: ${1};
+	overflow-x: ${0};
 snippet ovx:a
 	overflow-x: auto;
 snippet ovx:h
@@ -664,7 +664,7 @@ snippet ovx:s
 snippet ovx:v
 	overflow-x: visible;
 snippet ovy
-	overflow-y: ${1};
+	overflow-y: ${0};
 snippet ovy:a
 	overflow-y: auto;
 snippet ovy:h
@@ -674,7 +674,7 @@ snippet ovy:s
 snippet ovy:v
 	overflow-y: visible;
 snippet ov
-	overflow: ${1};
+	overflow: ${0};
 snippet ov:a
 	overflow: auto;
 snippet ov:h
@@ -684,25 +684,25 @@ snippet ov:s
 snippet ov:v
 	overflow: visible;
 snippet pb
-	padding-bottom: ${1};
+	padding-bottom: ${0};
 snippet pl
-	padding-left: ${1};
+	padding-left: ${0};
 snippet pr
-	padding-right: ${1};
+	padding-right: ${0};
 snippet pt
-	padding-top: ${1};
+	padding-top: ${0};
 snippet p
-	padding: ${1};
+	padding: ${0};
 snippet p:4
-	padding: ${1:0} ${2:0} ${3:0} ${4:0};
+	padding: ${1:0} ${2:0} ${3:0} ${0:0};
 snippet p:3
-	padding: ${1:0} ${2:0} ${3:0};
+	padding: ${1:0} ${2:0} ${0:0};
 snippet p:2
-	padding: ${1:0} ${2:0};
+	padding: ${1:0} ${0:0};
 snippet p:0
 	padding: 0;
 snippet pgba
-	page-break-after: ${1};
+	page-break-after: ${0};
 snippet pgba:aw
 	page-break-after: always;
 snippet pgba:a
@@ -712,7 +712,7 @@ snippet pgba:l
 snippet pgba:r
 	page-break-after: right;
 snippet pgbb
-	page-break-before: ${1};
+	page-break-before: ${0};
 snippet pgbb:aw
 	page-break-before: always;
 snippet pgbb:a
@@ -722,13 +722,13 @@ snippet pgbb:l
 snippet pgbb:r
 	page-break-before: right;
 snippet pgbi
-	page-break-inside: ${1};
+	page-break-inside: ${0};
 snippet pgbi:a
 	page-break-inside: auto;
 snippet pgbi:av
 	page-break-inside: avoid;
 snippet pos
-	position: ${1};
+	position: ${0};
 snippet pos:a
 	position: absolute;
 snippet pos:f
@@ -738,7 +738,7 @@ snippet pos:r
 snippet pos:s
 	position: static;
 snippet q
-	quotes: ${1};
+	quotes: ${0};
 snippet q:en
 	quotes: '\201C' '\201D' '\2018' '\2019';
 snippet q:n
@@ -746,7 +746,7 @@ snippet q:n
 snippet q:ru
 	quotes: '\00AB' '\00BB' '\201E' '\201C';
 snippet rz
-	resize: ${1};
+	resize: ${0};
 snippet rz:b
 	resize: both;
 snippet rz:h
@@ -756,17 +756,17 @@ snippet rz:n
 snippet rz:v
 	resize: vertical;
 snippet r
-	right: ${1};
+	right: ${0};
 snippet r:a
 	right: auto;
 snippet tbl
-	table-layout: ${1};
+	table-layout: ${0};
 snippet tbl:a
 	table-layout: auto;
 snippet tbl:f
 	table-layout: fixed;
 snippet tal
-	text-align-last: ${1};
+	text-align-last: ${0};
 snippet tal:a
 	text-align-last: auto;
 snippet tal:c
@@ -776,7 +776,7 @@ snippet tal:l
 snippet tal:r
 	text-align-last: right;
 snippet ta
-	text-align: ${1};
+	text-align: ${0};
 snippet ta:c
 	text-align: center;
 snippet ta:l
@@ -784,7 +784,7 @@ snippet ta:l
 snippet ta:r
 	text-align: right;
 snippet td
-	text-decoration: ${1};
+	text-decoration: ${0};
 snippet td:l
 	text-decoration: line-through;
 snippet td:n
@@ -794,7 +794,7 @@ snippet td:o
 snippet td:u
 	text-decoration: underline;
 snippet te
-	text-emphasis: ${1};
+	text-emphasis: ${0};
 snippet te:ac
 	text-emphasis: accent;
 snippet te:a
@@ -810,7 +810,7 @@ snippet te:dt
 snippet te:n
 	text-emphasis: none;
 snippet th
-	text-height: ${1};
+	text-height: ${0};
 snippet th:a
 	text-height: auto;
 snippet th:f
@@ -820,11 +820,11 @@ snippet th:m
 snippet th:t
 	text-height: text-size;
 snippet ti
-	text-indent: ${1};
+	text-indent: ${0};
 snippet ti:-
 	text-indent: -9999px;
 snippet tj
-	text-justify: ${1};
+	text-justify: ${0};
 snippet tj:a
 	text-justify: auto;
 snippet tj:d
@@ -840,23 +840,23 @@ snippet tj:k
 snippet tj:t
 	text-justify: tibetan;
 snippet to+
-	text-outline: ${1:0} ${2:0} #${3:000};
+	text-outline: ${1:0} ${2:0} #${0:000};
 snippet to
-	text-outline: ${1};
+	text-outline: ${0};
 snippet to:n
 	text-outline: none;
 snippet tr
-	text-replace: ${1};
+	text-replace: ${0};
 snippet tr:n
 	text-replace: none;
 snippet tsh+
-	text-shadow: ${1:0} ${2:0} ${3:0} #${4:000};
+	text-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
 snippet tsh
-	text-shadow: ${1};
+	text-shadow: ${0};
 snippet tsh:n
 	text-shadow: none;
 snippet tt
-	text-transform: ${1};
+	text-transform: ${0};
 snippet tt:c
 	text-transform: capitalize;
 snippet tt:l
@@ -866,7 +866,7 @@ snippet tt:n
 snippet tt:u
 	text-transform: uppercase;
 snippet tw
-	text-wrap: ${1};
+	text-wrap: ${0};
 snippet tw:no
 	text-wrap: none;
 snippet tw:n
@@ -876,11 +876,11 @@ snippet tw:s
 snippet tw:u
 	text-wrap: unrestricted;
 snippet t
-	top: ${1};
+	top: ${0};
 snippet t:a
 	top: auto;
 snippet va
-	vertical-align: ${1};
+	vertical-align: ${0};
 snippet va:bl
 	vertical-align: baseline;
 snippet va:b
@@ -898,7 +898,7 @@ snippet va:tt
 snippet va:t
 	vertical-align: top;
 snippet v
-	visibility: ${1};
+	visibility: ${0};
 snippet v:c
 	visibility: collapse;
 snippet v:h
@@ -906,7 +906,7 @@ snippet v:h
 snippet v:v
 	visibility: visible;
 snippet whsc
-	white-space-collapse: ${1};
+	white-space-collapse: ${0};
 snippet whsc:ba
 	white-space-collapse: break-all;
 snippet whsc:bs
@@ -918,7 +918,7 @@ snippet whsc:l
 snippet whsc:n
 	white-space-collapse: normal;
 snippet whs
-	white-space: ${1};
+	white-space: ${0};
 snippet whs:n
 	white-space: normal;
 snippet whs:nw
@@ -930,13 +930,13 @@ snippet whs:pw
 snippet whs:p
 	white-space: pre;
 snippet wid
-	widows: ${1};
+	widows: ${0};
 snippet w
-	width: ${1};
+	width: ${0};
 snippet w:a
 	width: auto;
 snippet wob
-	word-break: ${1};
+	word-break: ${0};
 snippet wob:ba
 	word-break: break-all;
 snippet wob:bs
@@ -948,9 +948,9 @@ snippet wob:l
 snippet wob:n
 	word-break: normal;
 snippet wos
-	word-spacing: ${1};
+	word-spacing: ${0};
 snippet wow
-	word-wrap: ${1};
+	word-wrap: ${0};
 snippet wow:no
 	word-wrap: none;
 snippet wow:n
@@ -960,7 +960,7 @@ snippet wow:s
 snippet wow:u
 	word-wrap: unrestricted;
 snippet z
-	z-index: ${1};
+	z-index: ${0};
 snippet z:a
 	z-index: auto;
 snippet zoo
diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index a74520022..0093f2bfb 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -1,82 +1,82 @@
 snippet lib
 	#library('${1}');
-	${2}
+	${0}
 snippet im
 	#import('${1}');
-	${2}
+	${0}
 snippet so
 	#source('${1}');
-	${2}
+	${0}
 snippet main
 	static void main() {
-	  ${1}
+	  ${0}
 	}
 snippet st
-	static ${1}
+	static ${0}
 snippet fi
-	final ${1}
+	final ${0}
 snippet re
-	return ${1}
+	return ${0}
 snippet br
 	break;
 snippet th
-	throw ${1}
+	throw ${0}
 snippet cl
-	class ${1:`vim_snippets#Filename("", "untitled")`} ${2}
+	class ${1:`vim_snippets#Filename("", "untitled")`} ${0}
 snippet in
-	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2}
+	interface ${1:`vim_snippets#Filename("", "untitled")`} ${0}
 snippet imp
-	implements ${1}
+	implements ${0}
 snippet ext
-	extends ${1}
+	extends ${0}
 snippet if
 	if (${1:true}) {
-	  ${2}
+	  ${0}
 	}
 snippet ife
 	if (${1:true}) {
 	  ${2}
 	} else {
-	  ${3}
+	  ${0}
 	}
 snippet el
 	else
 snippet sw
 	switch (${1}) {
-	  ${2}
+	  ${0}
 	}
 snippet cs
 	case ${1}:
-	  ${2}
+	  ${0}
 snippet de
 	default:
-	  ${1}
+	  ${0}
 snippet for
 	for (var ${2:i} = 0, len = ${1:things}.length; $2 < len; ${3:++}$2) {
-	  ${4:$1[$2]}
+	  ${0:$1[$2]}
 	}
 snippet fore
 	for (final ${2:item} in ${1:itemList}) {
-	  ${3}
+	  ${0}
 	}
 snippet wh
 	while (${1:/* condition */}) {
-	  ${2}
+	  ${0}
 	}
 snippet dowh
 	do {
-	  ${2}
-	} while (${1:/* condition */});
+	  ${0}
+	} while (${0:/* condition */});
 snippet as
-	assert(${1:/* condition */});
+	assert(${0:/* condition */});
 snippet try
 	try {
-	  ${2}
+	  ${0}
 	} catch (${1:Exception e}) {
 	}
 snippet tryf
 	try {
-	  ${2}
+	  ${0}
 	} catch (${1:Exception e}) {
 	} finally {
 	}
diff --git a/snippets/diff.snippets b/snippets/diff.snippets
index 7ba288ded..89bc31d7e 100644
--- a/snippets/diff.snippets
+++ b/snippets/diff.snippets
@@ -7,5 +7,5 @@ snippet header DEP-3 style header
 	Author: ${6:`g:snips_author`}
 	Reviewed-by: ${7:name and email}
 	Last-Update: ${8:`strftime("%Y-%m-%d")`}
-	Applied-Upstream: ${9:upstream version|url|commit}
+	Applied-Upstream: ${0:upstream version|url|commit}
 
diff --git a/snippets/django.snippets b/snippets/django.snippets
index 5c72b2b9e..cad80eb24 100644
--- a/snippets/django.snippets
+++ b/snippets/django.snippets
@@ -9,65 +9,65 @@
 # can either not specify them, or override them, e.g. auto_now_add=False.
 
 snippet auto
-	${1:FIELDNAME} = models.AutoField(${2})
+	${1:FIELDNAME} = models.AutoField(${0})
 snippet bool
-	${1:FIELDNAME} = models.BooleanField(${2:default=True})
+	${1:FIELDNAME} = models.BooleanField(${0:default=True})
 snippet char
-	${1:FIELDNAME} = models.CharField(max_length=${2}${3:, blank=True})
+	${1:FIELDNAME} = models.CharField(max_length=${2}${0:, blank=True})
 snippet comma
-	${1:FIELDNAME} = models.CommaSeparatedIntegerField(max_length=${2}${3:, blank=True})
+	${1:FIELDNAME} = models.CommaSeparatedIntegerField(max_length=${2}${0:, blank=True})
 snippet date
-	${1:FIELDNAME} = models.DateField(${2:auto_now_add=True, auto_now=True}${3:, blank=True, null=True})
+	${1:FIELDNAME} = models.DateField(${2:auto_now_add=True, auto_now=True}${0:, blank=True, null=True})
 snippet datetime
-	${1:FIELDNAME} = models.DateTimeField(${2:auto_now_add=True, auto_now=True}${3:, blank=True, null=True})
+	${1:FIELDNAME} = models.DateTimeField(${2:auto_now_add=True, auto_now=True}${0:, blank=True, null=True})
 snippet decimal
-	${1:FIELDNAME} = models.DecimalField(max_digits=${2}, decimal_places=${3})
+	${1:FIELDNAME} = models.DecimalField(max_digits=${2}, decimal_places=${0})
 snippet email
-	${1:FIELDNAME} = models.EmailField(max_length=${2:75}${3:, blank=True})
+	${1:FIELDNAME} = models.EmailField(max_length=${2:75}${0:, blank=True})
 snippet file
-	${1:FIELDNAME} = models.FileField(upload_to=${2:path/for/upload}${3:, max_length=100})
+	${1:FIELDNAME} = models.FileField(upload_to=${2:path/for/upload}${0:, max_length=100})
 snippet filepath
-	${1:FIELDNAME} = models.FilePathField(path=${2:"/abs/path/to/dir"}${3:, max_length=100}${4:, match="*.ext"}${5:, recursive=True}${6:, blank=True, })
+	${1:FIELDNAME} = models.FilePathField(path=${2:"/abs/path/to/dir"}${3:, max_length=100}${4:, match="*.ext"}${5:, recursive=True}${0:, blank=True, })
 snippet float
-	${1:FIELDNAME} = models.FloatField(${2})
+	${1:FIELDNAME} = models.FloatField(${0})
 snippet image
-	${1:FIELDNAME} = models.ImageField(upload_to=${2:path/for/upload}${3:, height_field=height, width_field=width}${4:, max_length=100})
+	${1:FIELDNAME} = models.ImageField(upload_to=${2:path/for/upload}${3:, height_field=height, width_field=width}${0:, max_length=100})
 snippet int
-	${1:FIELDNAME} = models.IntegerField(${2})
+	${1:FIELDNAME} = models.IntegerField(${0})
 snippet ip
-	${1:FIELDNAME} = models.IPAddressField(${2})
+	${1:FIELDNAME} = models.IPAddressField(${0})
 snippet nullbool
-	${1:FIELDNAME} = models.NullBooleanField(${2})
+	${1:FIELDNAME} = models.NullBooleanField(${0})
 snippet posint
-	${1:FIELDNAME} = models.PositiveIntegerField(${2})
+	${1:FIELDNAME} = models.PositiveIntegerField(${0})
 snippet possmallint
-	${1:FIELDNAME} = models.PositiveSmallIntegerField(${2})
+	${1:FIELDNAME} = models.PositiveSmallIntegerField(${0})
 snippet slug
-	${1:FIELDNAME} = models.SlugField(max_length=${2:50}${3:, blank=True})
+	${1:FIELDNAME} = models.SlugField(max_length=${2:50}${0:, blank=True})
 snippet smallint
-	${1:FIELDNAME} = models.SmallIntegerField(${2})
+	${1:FIELDNAME} = models.SmallIntegerField(${0})
 snippet text
-	${1:FIELDNAME} = models.TextField(${2:blank=True})
+	${1:FIELDNAME} = models.TextField(${0:blank=True})
 snippet time
-	${1:FIELDNAME} = models.TimeField(${2:auto_now_add=True, auto_now=True}${3:, blank=True, null=True})
+	${1:FIELDNAME} = models.TimeField(${2:auto_now_add=True, auto_now=True}${0:, blank=True, null=True})
 snippet url
-	${1:FIELDNAME} = models.URLField(${2:verify_exists=False}${3:, max_length=200}${4:, blank=True})
+	${1:FIELDNAME} = models.URLField(${2:verify_exists=False}${3:, max_length=200}${0:, blank=True})
 snippet xml
-	${1:FIELDNAME} = models.XMLField(schema_path=${2:None}${3:, blank=True})
+	${1:FIELDNAME} = models.XMLField(schema_path=${2:None}${0:, blank=True})
 # Relational Fields
 snippet fk
-	${1:FIELDNAME} = models.ForeignKey(${2:OtherModel}${3:, related_name=''}${4:, limit_choices_to=}${5:, to_field=''})
+	${1:FIELDNAME} = models.ForeignKey(${2:OtherModel}${3:, related_name=''}${4:, limit_choices_to=}${0:, to_field=''})
 snippet m2m
-	${1:FIELDNAME} = models.ManyToManyField(${2:OtherModel}${3:, related_name=''}${4:, limit_choices_to=}${5:, symmetrical=False}${6:, through=''}${7:, db_table=''})
+	${1:FIELDNAME} = models.ManyToManyField(${2:OtherModel}${3:, related_name=''}${4:, limit_choices_to=}${5:, symmetrical=False}${6:, through=''}${0:, db_table=''})
 snippet o2o
-	${1:FIELDNAME} = models.OneToOneField(${2:OtherModel}${3:, parent_link=True}${4:, related_name=''}${5:, limit_choices_to=}${6:, to_field=''})
+	${1:FIELDNAME} = models.OneToOneField(${2:OtherModel}${3:, parent_link=True}${4:, related_name=''}${5:, limit_choices_to=}${0:, to_field=''})
 
 # Code Skeletons
 
 snippet form
 	class ${1:FormName}(forms.Form):
 		"""${2:docstring}"""
-		${3}
+		${0}
 
 snippet model
 	class ${1:ModelName}(models.Model):
@@ -85,24 +85,24 @@ snippet model
 
 		@models.permalink
 		def get_absolute_url(self):
-			return ('${7:view_or_url_name}' ${8})
+			return ('${7:view_or_url_name}' ${0})
 
 snippet modeladmin
 	class ${1:ModelName}Admin(admin.ModelAdmin):
-		${2}
+		${0}
 
 	admin.site.register($1, $1Admin)
 
 snippet tabularinline
-	class ${1:ModelName}Inline(admin.TabularInline):
+	class ${0:ModelName}Inline(admin.TabularInline):
 		model = $1
 
 snippet stackedinline
-	class ${1:ModelName}Inline(admin.StackedInline):
+	class ${0:ModelName}Inline(admin.StackedInline):
 		model = $1
 
 snippet r2r
 	return render_to_response('${1:template.html}', {
 			${2}
-		}${3:, context_instance=RequestContext(request)}
+		}${0:, context_instance=RequestContext(request)}
 	)
diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index eb3319e0d..54aa180b3 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -1,127 +1,127 @@
 snippet do
 	do
-		${1}
+		${0}
 	end
 snippet if if .. do .. end
 	if ${1} do
-		${2}
+		${0}
 	end
 
 snippet if if .. do: ..
-	if ${1:condition}, do: ${2}
+	if ${1:condition}, do: ${0}
 
 snippet ife if .. do .. else .. end
 	if ${1:condition} do
 		${2}
 	else
-		${3}
+		${0}
 	end
 
 snippet ife if .. do: .. else:
-	if ${1:condition}, do: ${2}, else: ${3}
+	if ${1:condition}, do: ${2}, else: ${0}
 
 snippet unless unless .. do .. end
 	unless ${1} do
-		${2}
+		${0}
 	end
 
 snippet unless unless .. do: ..
-	unless ${1:condition}, do: ${2}
+	unless ${1:condition}, do: ${0}
 
 snippet unlesse unless .. do .. else .. end
 	unless ${1:condition} do
 		${2}
 	else
-		${3}
+		${0}
 	end
 
 snippet unlesse unless .. do: .. else:
-	unless ${1:condition}, do: ${2}, else: ${3}
+	unless ${1:condition}, do: ${2}, else: ${0}
 
 snippet cond
 	cond do
 	${1} ->
-		${2}
+		${0}
 	end
 
 snippet case
 	case ${1} do
 	${2} ->
-		${3}
+		${0}
 	end
 
 snippet def
 	def ${1:name} do
-		${2}
+		${0}
 	end
 
 snippet defim
 	defimpl ${1:protocol_name}, for: ${2:data_type} do
-		${3}
+		${0}
 	end
 
 snippet defma
 	defmacro ${1:name} do
-		${2}
+		${0}
 	end
 
 snippet defmo
 	defmodule ${1:module_name} do
-		${2}
+		${0}
 	end
 
 snippet defp
 	defp ${1:name} do
-		${2}
+		${0}
 	end
 
 snippet defpr
-	defprotocol ${1:name}, [${2:function}]
+	defprotocol ${1:name}, [${0:function}]
 
 snippet defr
-	defrecord ${1:record_name}, ${2:fields}
+	defrecord ${1:record_name}, ${0:fields}
 
 snippet doc
 	@doc """
-	${1}
+	${0}
 	"""
 
 snippet fn
-	fn(${1:args}) -> ${2} end
+	fn(${1:args}) -> ${0} end
 
 snippet fun
         function do
-        	${1}
+        	${0}
         end
 
 snippet mdoc
 	@moduledoc """
-	${1}
+	${0}
 	"""
 
 snippet rec
 	receive do
 	${1} ->
-		${2}
+		${0}
 	end
 
 snippet req
-	require ${1:module_name}
+	require ${0:module_name}
 
 snippet imp
-	import ${1:module_name}
+	import ${0:module_name}
 
 snippet ali
-	alias ${1:module_name}
+	alias ${0:module_name}
 
 snippet test
 	test "${1:test_name}" do
-		${2}
+		${0}
 	end
 
 snippet try try .. rescue .. end
 	try do
 		${1}
 	rescue
-		${2} -> ${3}
+		${2} -> ${0}
 	end
diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index cfad09a36..799d7f57c 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -5,62 +5,62 @@ snippet mod
 	-compile([export_all]).
 
 	start() ->
-	    ${2}
+	    ${0}
 
 	stop() ->
 	    ok.
 # define directive
 snippet def
-	-define(${1:macro}, ${2:body}).${3}
+	-define(${1:macro}, ${2:body}).
 # export directive
 snippet exp
-	-export([${1:function}/${2:arity}]).
+	-export([${1:function}/${0:arity}]).
 # include directive
 snippet inc
-	-include("${1:file}").${2}
+	-include("${1:file}").
 # behavior directive
 snippet beh
-	-behaviour(${1:behaviour}).${2}
+	-behaviour(${1:behaviour}).
 # if expression
 snippet if
 	if
 	    ${1:guard} ->
-	        ${2:body}
+	        ${0:body}
 	end
 # case expression
 snippet case
 	case ${1:expression} of
 	    ${2:pattern} ->
-	        ${3:body};
+	        ${0:body};
 	end
 # anonymous function
 snippet fun
-	fun (${1:Parameters}) -> ${2:body} end${3}
+	fun (${1:Parameters}) -> ${2:body} end
 # try...catch
 snippet try
 	try
 	    ${1}
 	catch
-	    ${2:_:_} -> ${3:got_some_exception}
+	    ${2:_:_} -> ${0:got_some_exception}
 	end
 # record directive
 snippet rec
 	-record(${1:record}, {
-	    ${2:field}=${3:value}}).${4}
+	    ${2:field}=${3:value}}).
 # todo comment
 snippet todo
-	%% TODO: ${1}
+	%% TODO: ${0}
 ## Snippets below (starting with '%') are in EDoc format.
 ## See http://www.erlang.org/doc/apps/edoc/chapter.html#id56887 for more details
 # doc comment
 snippet %d
-	%% @doc ${1}
+	%% @doc ${0}
 # end of doc comment
 snippet %e
 	%% @end
 # specification comment
 snippet %s
-	%% @spec ${1}
+	%% @spec ${0}
 # private function marker
 snippet %p
 	%% @private
@@ -73,7 +73,7 @@ snippet application
 	-export([start/2, stop/1]).
 
 	start(_Type, _StartArgs) ->
-	    case ${2:root_supervisor}:start_link() of
+	    case ${0:root_supervisor}:start_link() of
 	        {ok, Pid} ->
 	            {ok, Pid};
 	        Other ->
@@ -100,14 +100,14 @@ snippet supervisor
 	    supervisor:start_link({local, ?SERVER}, ?MODULE, []).
 
 	init([]) ->
-	    Server = {${2:my_server}, {$2, start_link, []},
+	    Server = {${0:my_server}, {$2, start_link, []},
 	      permanent, 2000, worker, [$2]},
 	    Children = [Server],
 	    RestartStrategy = {one_for_one, 0, 1},
 	    {ok, {RestartStrategy, Children}}.
 # OTP gen_server
 snippet gen_server
-	-module(${1:`vim_snippets#Filename('', 'my')`}).
+	-module(${0:`vim_snippets#Filename('', 'my')`}).
 
 	-behaviour(gen_server).
 
@@ -159,7 +159,7 @@ snippet gen_server
 	%%%===================================================================
 # common_test test_SUITE
 snippet testsuite
-	-module(${1:`vim_snippets#Filename('', 'my')`}).
+	-module(${0:`vim_snippets#Filename('', 'my')`}).
 
 	-include_lib("common_test/include/ct.hrl").
 	
diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index e3f421366..95418350d 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -4,124 +4,124 @@
 
 # Rails *****************************
 snippet rc
-	<% ${1} %>
+	<% ${0} %>
 snippet rce
-	<%= ${1} %>${2}
+	<%= ${1} %>
 snippet %
-	<% ${1} %>
+	<% ${0} %>
 snippet =
-	<%= ${1} %>${2}
+	<%= ${1} %>
 snippet end
-	<% end %>${1}
+	<% end %>
 snippet ead
 	<% ${1}.each do |${2}| %>
-		${3}
+		${0}
 	<% end %>
 snippet for
 	<% for ${2:item} in ${1} %>
-		${3}
+		${0}
 	<% end %>
 snippet rp
-	<%= render :partial => '${1:item}' %>
+	<%= render :partial => '${0:item}' %>
 snippet rpl
-	<%= render :partial => '${1:item}', :locals => { :${2:name} => '${3:value}'$4 } %>
+	<%= render :partial => '${1:item}', :locals => { :${2:name} => '${3:value}'${0} } %>
 snippet rps
-	<%= render :partial => '${1:item}', :status => ${2:500} %>
+	<%= render :partial => '${1:item}', :status => ${0:500} %>
 snippet rpc
-	<%= render :partial => '${1:item}', :collection => ${2:items} %>
+	<%= render :partial => '${1:item}', :collection => ${0:items} %>
 snippet lia
-	<%= link_to '${1:link text...}', :action => '${2:index}' %>
+	<%= link_to '${1:link text...}', :action => '${0:index}' %>
 snippet liai
-	<%= link_to '${1:link text...}', :action => '${2:edit}', :id => ${3:@item} %>
+	<%= link_to '${1:link text...}', :action => '${2:edit}', :id => ${0:@item} %>
 snippet lic
-	<%= link_to '${1:link text...}', :controller => '${2:items}' %>
+	<%= link_to '${1:link text...}', :controller => '${0:items}' %>
 snippet lica
-	<%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${3:index}' %>
+	<%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${0:index}' %>
 snippet licai
-	<%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${3:edit}', :id => ${4:@item} %>
+	<%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${3:edit}', :id => ${0:@item} %>
 snippet yield
-	<%= yield ${1::content_symbol} %>${2}
+	<%= yield ${1::content_symbol} %>
 snippet conf
 	<% content_for :${1:head} do %>
-		${2}
+		${0}
 	<% end %>
 snippet cs
 	<%= collection_select <+object+>, <+method+>, <+collection+>, <+value_method+>, <+text_method+><+, <+[options]+>, <+[html_options]+>+> %>
 snippet ct
-	<%= content_tag '${1:DIV}', ${2:content}${3:,options} %>
+	<%= content_tag '${1:DIV}', ${2:content}${0:,options} %>
 snippet ff
 	<%= form_for @${1:model} do |f| %>
-		${2}
+		${0}
 	<% end %>
 snippet ffi
-	<%= ${1:f}.input :${2:attribute} %>
+	<%= ${1:f}.input :${0:attribute} %>
 snippet ffcb
-	<%= ${1:f}.check_box :${2:attribute} %>
+	<%= ${1:f}.check_box :${0:attribute} %>
 snippet ffe
 	<% error_messages_for :${1:model} %>
 
 	<%= form_for @${2:model} do |f| %>
-		${3}
+		${0}
 	<% end %>
 snippet ffff
-	<%= ${1:f}.file_field :${2:attribute} %>
+	<%= ${1:f}.file_field :${0:attribute} %>
 snippet ffhf
-	<%= ${1:f}.hidden_field :${2:attribute} %>
+	<%= ${1:f}.hidden_field :${0:attribute} %>
 snippet ffl
-	<%= ${1:f}.label :${2:attribute}, '${3:$2}' %>
+	<%= ${1:f}.label :${2:attribute}, '${0:$2}' %>
 snippet ffpf
-	<%= ${1:f}.password_field :${2:attribute} %>
+	<%= ${1:f}.password_field :${0:attribute} %>
 snippet ffrb
-	<%= ${1:f}.radio_button :${2:attribute}, :${3:tag_value} %>
+	<%= ${1:f}.radio_button :${2:attribute}, :${0:tag_value} %>
 snippet ffs
-	<%= ${1:f}.submit "${2:submit}" %>
+	<%= ${1:f}.submit "${0:submit}" %>
 snippet ffta
-	<%= ${1:f}.text_area :${2:attribute} %>
+	<%= ${1:f}.text_area :${0:attribute} %>
 snippet fftf
-	<%= ${1:f}.text_field :${2:attribute} %>
+	<%= ${1:f}.text_field :${0:attribute} %>
 snippet fields
 	<%= fields_for :${1:model}, @$1 do |${2:f}| %>
-		${3}
+		${0}
 	<% end %>
 snippet i18
-	I18n.t('${1:type.key}')${2}
+	I18n.t('${1:type.key}')
 snippet it
-	<%= image_tag "${1}"${2} %>
+	<%= image_tag "${1}"${0} %>
 snippet jit
-	<%= javascript_include_tag ${1::all} %>
+	<%= javascript_include_tag ${0::all} %>
 snippet jsit
-	<%= javascript_include_tag "${1}" %>
+	<%= javascript_include_tag "${0}" %>
 snippet lim
-	<%= link_to ${1:model}.${2:name}, ${3:$1}_path(${4:$1}) %>
+	<%= link_to ${1:model}.${2:name}, ${3:$1}_path(${0:$1}) %>
 snippet linp
-	<%= link_to "${1:Link text...}", ${2:parent}_${3:child}_path(${4:@$2}, ${5:@$3}) %>
+	<%= link_to "${1:Link text...}", ${2:parent}_${3:child}_path(${4:@$2}, ${0:@$3}) %>
 snippet linpp
-	<%= link_to "${1:Link text...}", ${2:parent}_${3:child}_path(${4:@$2}) %>
+	<%= link_to "${1:Link text...}", ${2:parent}_${3:child}_path(${0:@$2}) %>
 snippet lip
-	<%= link_to "${1:Link text...}", ${2:model}_path(${3:@$2}) %>
+	<%= link_to "${1:Link text...}", ${2:model}_path(${0:@$2}) %>
 snippet lipp
-	<%= link_to "${1:Link text...}", ${2:model}s_path %>
+	<%= link_to "${1:Link text...}", ${0:model}s_path %>
 snippet lt
-	<%= link_to "${1:name}", ${2:dest} %>
+	<%= link_to "${1:name}", ${0:dest} %>
 snippet ntc
 	<%= number_to_currency(${1}) %>
 snippet ofcfs
-	<%= options_from_collection_for_select ${1:collection}, ${2:value_method}, ${3:text_method}, ${4:selected_value} %>
+	<%= options_from_collection_for_select ${1:collection}, ${2:value_method}, ${3:text_method}, ${0:selected_value} %>
 snippet rf
-	<%= render :file => "${1:file}"${2} %>
+	<%= render :file => "${1:file}"${0} %>
 snippet rt
-	<%= render :template => "${1:file}"${2} %>
+	<%= render :template => "${1:file}"${0} %>
 snippet slt
-	<%= stylesheet_link_tag ${1::all}, :cache => ${2:true} %>
+	<%= stylesheet_link_tag ${1::all}, :cache => ${0:true} %>
 snippet sslt
-	<%= stylesheet_link_tag "${1}" %>
+	<%= stylesheet_link_tag "${0}" %>
 snippet if
 	<% if ${1} %>
-		${2}
+		${0}
 	<% end %>
 snippet ife
 	<% if ${1} %>
 		${2}
 	<% else %>
-		${3}
+		${0}
 	<% end %>
diff --git a/snippets/falcon.snippets b/snippets/falcon.snippets
index 50c3694c9..c523980d6 100644
--- a/snippets/falcon.snippets
+++ b/snippets/falcon.snippets
@@ -3,30 +3,30 @@ snippet #!
 
 # Import
 snippet imp
-	import ${1:module}
+	import ${0:module}
 
 # Function
 snippet fun
 	function ${2:function_name}(${3})
-		${4}
+		${0}
 	end
 
 # Class
 snippet class
 	class ${1:class_name}(${2:class_params})
-		${3:/* members/methods */}
+		${0:/* members/methods */}
 	end
 
 # If
 snippet if
 	if ${1:condition}
-		${2}
+		${0}
 	end
 
 # If else
 snippet ife
 	if ${1:condition}
-		${2}
+		${0}
 	else
 	    ${1}
 	end
@@ -34,13 +34,13 @@ snippet ife
 # If else if
 snippet eif
 	elif ${1:condition}
-		${2}
+		${0}
 
 # Switch case
 snippet switch
 	switch ${1:expression}
 		case ${2:item}
-		case ${3:item}
+		case ${0:item}
 		default
 	end
 
@@ -48,24 +48,24 @@ snippet switch
 snippet select
 	select ${1:variable}
 		case ${2:TypeSpec}
-		case ${3:TypeSpec}
+		case ${0:TypeSpec}
 		default
 	end
 
 # For/in Loop
 snippet forin
 	for ${1:element} in ${2:container}
-		${3}
+		${0}
 	end
 
 # For/to Loop
 snippet forto
 	for ${1:lowerbound} to ${2:upperbound}
-		${3}
+		${0}
 	end
 
 # While Loop
 snippet wh
 	while ${1:conidition}
-		${2}
+		${0}
 	end
diff --git a/snippets/go.snippets b/snippets/go.snippets
index 7e2ad4ca7..03f7649d8 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -5,7 +5,7 @@ snippet vr
 	var ${1} ${2} = ${3}
 # append
 snippet ap
-	append(${1:slice}, ${2:value})
+	append(${1:slice}, ${0:value})
 # bool
 snippet bl
 	bool
@@ -17,31 +17,31 @@ snippet br
 	break
 # channel
 snippet ch
-	chan ${1:int}
+	chan ${0:int}
 # case
 snippet cs
 	case ${1:value}:
-		${2}
+		${0}
 # const
 snippet c
-	const ${1:NAME} = ${2:0}
+	const ${1:NAME} = ${0:0}
 # constants with iota
 snippet co
 	const (
 		${1:NAME1} = iota
-		${2:NAME2}
+		${0:NAME2}
 	)
 # continue
 snippet cn
 	continue
 # defer
 snippet df
-	defer ${1:func}()
+	defer ${0:func}()
 # defer recover
 snippet dfr
 	defer func() {
 		if err := recover(); err != nil {
-			${1}
+			${0}
 		}
 	}()
 # gpl
@@ -63,7 +63,7 @@ snippet gpl
 	 * Copyright (C) ${1:Author}, `strftime("%Y")`
 	 */
 
-	${2}
+	${0}
 # int
 snippet i
 	int
@@ -71,7 +71,7 @@ snippet i
 snippet im
 	import (
 		"${1:package}"
-	)${2}
+	)
 # interface
 snippet in
 	interface{}
@@ -79,23 +79,23 @@ snippet in
 snippet inf
 	interface ${1:name} {
 		${2:/* methods */}
-	}${3}
+	}
 # if condition
 snippet if
 	if ${1:/* condition */} {
 		${2}
-	}${3}
+	}
 # else snippet
 snippet el
 	else {
 		${1}
-	}${2}
+	}
 # error snippet
 snippet ir
 	if err != nil {
 		return err
 	}
-	${1}
+	${0}
 # false
 snippet f
 	false
@@ -118,64 +118,64 @@ snippet ie
 	} else {
 		${3}
 	}
-	${4}
+	${0}
 # for loop
 snippet fo
 	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
 		${4}
 	}
-	${5}
+	${0}
 # for range loop
 snippet fr
 	for ${1:k}, ${2:v} := range ${3} {
 		${4}
 	}
-	${5}
+	${0}
 # function simple
 snippet fun
 	func ${1:funcName}(${2}) ${3:error} {
 		${4}
 	}
-	${5}
+	${0}
 # function on receiver
 snippet fum
 	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
 		${5}
 	}
-	${6}
+	${0}
 # log printf
 snippet lf
-	log.Printf("%${1:s}", ${2:var})${3}
+	log.Printf("%${1:s}", ${2:var})
 # log printf
 snippet lp
-	log.Println("${1}")${2}
+	log.Println("${1}")
 # make
 snippet mk
-	make(${1:[]string}, ${2:0})
+	make(${1:[]string}, ${0:0})
 # map
 snippet mp
-	map[${1:string}]${2:int}
+	map[${1:string}]${0:int}
 # main()
 snippet main
 	func main() {
 		${1}
 	}
-	${2}
+	${0}
 # new
 snippet nw
-	new(${1:type})
+	new(${0:type})
 # panic
 snippet pn
-	panic("${1:msg}")
+	panic("${0:msg}")
 # print
 snippet pr
-	fmt.Printf("%${1:s}\n", ${2:var})${3}
+	fmt.Printf("%${1:s}\n", ${2:var})
 # range
 snippet rn
-	range ${1}
+	range ${0}
 # return
 snippet rt
-	return ${1}
+	return ${0}
 # result
 snippet rs
 	result
@@ -187,7 +187,7 @@ snippet sl
 	case ${4:v2} := <-${5:chan2}
 		${6}
 	default:
-		${7}
+		${0}
 	}
 # string
 snippet sr
@@ -197,7 +197,7 @@ snippet st
 	struct ${1:name} {
 		${2:/* data */}
 	}
-	${3}
+	${0}
 # switch
 snippet sw
 	switch ${1:var} {
@@ -206,21 +206,21 @@ snippet sw
 	case ${4:value2}:
 		${5}
 	default:
-		${6}
+		${0}
 	}
 snippet sp
-	fmt.Sprintf("%${1:s}", ${2:var})${3}
+	fmt.Sprintf("%${1:s}", ${2:var})
 # true
 snippet t
 	true
 # variable declaration
 snippet v
-	var ${1:t} ${2:string}
+	var ${1:t} ${0:string}
 # goroutine named function
 snippet g
-	go ${1:funcName}(${2})
+	go ${1:funcName}(${0})
 # goroutine anonymous function 
 snippet ga
 	go func(${1} ${2:type}) {
 		${3:/* code */}
-	}(${4})
+	}(${0})
diff --git a/snippets/haml.snippets b/snippets/haml.snippets
index 046608784..09217c6c4 100644
--- a/snippets/haml.snippets
+++ b/snippets/haml.snippets
@@ -5,20 +5,20 @@ snippet t
 				${1:headers}
 		%tr
 			%td
-				${2:headers}
+				${0:headers}
 snippet ul
 	%ul
 		%li
-			${1:item}
+			${0:item}
 		%li
 snippet rp
-	= render :partial => "${1:item}"
+	= render :partial => "${0:item}"
 snippet rpc
-	= render :partial => "${1:item}", :collection => ${2:@$1s}
+	= render :partial => "${1:item}", :collection => ${0:@$1s}
 snippet rpl
-	= render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}
+	= render :partial => "${1:item}", :locals => { :${2:$1} => ${0:@$1}
 snippet rpo
-	= render :partial => "${1:item}", :object => ${2:@$1}
+	= render :partial => "${1:item}", :object => ${0:@$1}
 snippet lt
 	= link_to ${1:name}, ${2:dest}
 snippet mt
@@ -29,9 +29,9 @@ snippet ife
 	- if ${1:condition}
 		${2}
 	- else
-		${3}
+		${0}
 snippet ifp
 	- if ${1:condition}.presence?
-		${2}
+		${0}
 snippet ntc
 	= number_to_currency(${1})
diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 3857d8b4e..f5f159845 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -1,5 +1,5 @@
 snippet lang
-	{-# LANGUAGE ${1:OverloadedStrings} #-}
+	{-# LANGUAGE ${0:OverloadedStrings} #-}
 snippet info
 	-- |
 	-- Module      :  ${1:Module.Namespace}
@@ -10,26 +10,26 @@ snippet info
 	-- Stability   :  ${6:experimental}
 	-- Portability :  ${7:unknown}
 	--
-	-- ${8:Description}
+	-- ${0:Description}
 	--
 snippet import
-	import           ${1:Data.Text}
+	import           ${0:Data.Text}
 snippet import2
-	import           ${1:Data.Text} (${2:head})
+	import           ${1:Data.Text} (${0:head})
 snippet importq
-	import qualified ${1:Data.Text} as ${2:T}
+	import qualified ${1:Data.Text} as ${0:T}
 snippet inst
 	instance ${1:Monoid} ${2:Type} where
-		${3}
+		${0}
 snippet type
-	type ${1:Type} = ${2:Type}
+	type ${1:Type} = ${0:Type}
 snippet data
-	data ${1:Type} = ${2:$1} ${3:Int}
+	data ${1:Type} = ${2:$1} ${0:Int}
 snippet newtype
-	newtype ${1:Type} = ${2:$1} ${3:Int}
+	newtype ${1:Type} = ${2:$1} ${0:Int}
 snippet class
 	class ${1:Class} a where
-		${2}
+		${0}
 snippet module
 	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (
 	)	where
@@ -37,46 +37,46 @@ snippet module
 
 snippet const
 	${1:name} :: ${2:a}
-	$1 = ${3:undefined}
+	$1 = ${0:undefined}
 snippet fn
 	${1:fn} :: ${2:a} -> ${3:a}
-	$1 ${4} = ${5:undefined}
+	$1 ${4} = ${0:undefined}
 snippet fn2
 	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a}
-	$1 ${5} = ${6:undefined}
+	$1 ${5} = ${0:undefined}
 snippet ap
-	${1:map} ${2:fn} ${3:list}
+	${1:map} ${2:fn} ${0:list}
 snippet do
 	do
 
 snippet λ
-	\${1:x} -> ${2}
+	\${1:x} -> ${0}
 snippet \
-	\${1:x} -> ${2}
+	\${1:x} -> ${0}
 snippet <-
-	${1:a} <- ${2:m a}
+	${1:a} <- ${0:m a}
 snippet ←
-	${1:a} <- ${2:m a}
+	${1:a} <- ${0:m a}
 snippet ->
-	${1:m a} -> ${2:a}
+	${1:m a} -> ${0:a}
 snippet →
-	${1:m a} -> ${2:a}
+	${1:m a} -> ${0:a}
 snippet tup
-	(${1:a}, ${2:b})
+	(${1:a}, ${0:b})
 snippet tup2
-	(${1:a}, ${2:b}, ${3:c})
+	(${1:a}, ${2:b}, ${0:c})
 snippet tup3
-	(${1:a}, ${2:b}, ${3:c}, ${4:d})
+	(${1:a}, ${2:b}, ${3:c}, ${0:d})
 snippet rec
 	${1:Record} { ${2:recFieldA} = ${3:undefined}
-				, ${4:recFieldB} = ${5:undefined}
+				, ${4:recFieldB} = ${0:undefined}
 				}
 snippet case
 	case ${1:something} of
-		${2} -> ${3}
+		${2} -> ${0}
 snippet let
 	let ${1} = ${2}
 	in ${3}
 snippet where
 	where
-		${1:fn} = ${2:undefined}
+		${1:fn} = ${0:undefined}
diff --git a/snippets/html.snippets b/snippets/html.snippets
index a83089c81..f25e1bc73 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -97,353 +97,353 @@ snippet docx
 	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 # Attributes
 snippet attr
-	${1:attribute}="${2:property}"
+	${1:attribute}="${0:property}"
 snippet attr+
-	${1:attribute}="${2:property}" attr+${3}
+	${1:attribute}="${2:property}" attr+
 snippet .
-	class="${1}"${2}
+	class="${1}"
 snippet #
-	id="${1}"${2}
+	id="${1}"
 snippet alt
-	alt="${1}"${2}
+	alt="${1}"
 snippet charset
-	charset="${1:utf-8}"${2}
+	charset="${1:utf-8}"
 snippet data
-	data-${1}="${2:$1}"${3}
+	data-${1}="${2:$1}"
 snippet for
-	for="${1}"${2}
+	for="${1}"
 snippet height
-	height="${1}"${2}
+	height="${1}"
 snippet href
-	href="${1:#}"${2}
+	href="${1:#}"
 snippet lang
-	lang="${1:en}"${2}
+	lang="${1:en}"
 snippet media
-	media="${1}"${2}
+	media="${1}"
 snippet name
-	name="${1}"${2}
+	name="${1}"
 snippet rel
-	rel="${1}"${2}
+	rel="${1}"
 snippet scope
-	scope="${1:row}"${2}
+	scope="${1:row}"
 snippet src
-	src="${1}"${2}
+	src="${1}"
 snippet title=
-	title="${1}"${2}
+	title="${1}"
 snippet type
-	type="${1}"${2}
+	type="${1}"
 snippet value
-	value="${1}"${2}
+	value="${1}"
 snippet width
-	width="${1}"${2}
+	width="${1}"
 # Elements
 snippet a
-	<a href="${1:#}">${2:$1}</a>
+	<a href="${1:#}">${0:$1}</a>
 snippet a.
-	<a class="${1}" href="${2:#}">${3:$1}</a>
+	<a class="${1}" href="${2:#}">${0:$1}</a>
 snippet a#
-	<a id="${1}" href="${2:#}">${3:$1}</a>
+	<a id="${1}" href="${2:#}">${0:$1}</a>
 snippet a:ext
-	<a href="http://${1:example.com}">${2:$1}</a>
+	<a href="http://${1:example.com}">${0:$1}</a>
 snippet a:mail
-	<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
+	<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${0:email me}</a>
 snippet abbr
-	<abbr title="${1}">${2}</abbr>
+	<abbr title="${1}">${0}</abbr>
 snippet address
 	<address>
-		${1}
+		${0}
 	</address>
 snippet area
-	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}" />
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}" />
 snippet area+
 	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}" />
-	area+${5}
+	area+
 snippet area:c
-	<area shape="circle" coords="${1}" href="${2}" alt="${3}" />
+	<area shape="circle" coords="${1}" href="${2}" alt="${0}" />
 snippet area:d
-	<area shape="default" coords="${1}" href="${2}" alt="${3}" />
+	<area shape="default" coords="${1}" href="${2}" alt="${0}" />
 snippet area:p
-	<area shape="poly" coords="${1}" href="${2}" alt="${3}" />
+	<area shape="poly" coords="${1}" href="${2}" alt="${0}" />
 snippet area:r
-	<area shape="rect" coords="${1}" href="${2}" alt="${3}" />
+	<area shape="rect" coords="${1}" href="${2}" alt="${0}" />
 snippet article
 	<article>
-		${1}
+		${0}
 	</article>
 snippet article.
 	<article class="${1}">
-		${2}
+		${0}
 	</article>
 snippet article#
 	<article id="${1}">
-		${2}
+		${0}
 	</article>
 snippet aside
 	<aside>
-		${1}
+		${0}
 	</aside>
 snippet aside.
 	<aside class="${1}">
-		${2}
+		${0}
 	</aside>
 snippet aside#
 	<aside id="${1}">
-		${2}
+		${0}
 	</aside>
 snippet audio
-	<audio src="${1}>${2}</audio>
+	<audio src="${1}>${0}</audio>
 snippet b
-	<b>${1}</b>
+	<b>${0}</b>
 snippet base
-	<base href="${1}" target="${2}" />
+	<base href="${1}" target="${0}" />
 snippet bdi
-	<bdi>${1}</bdo>
+	<bdi>${0}</bdo>
 snippet bdo
-	<bdo dir="${1}">${2}</bdo>
+	<bdo dir="${1}">${0}</bdo>
 snippet bdo:l
-	<bdo dir="ltr">${1}</bdo>
+	<bdo dir="ltr">${0}</bdo>
 snippet bdo:r
-	<bdo dir="rtl">${1}</bdo>
+	<bdo dir="rtl">${0}</bdo>
 snippet blockquote
 	<blockquote>
-		${1}
+		${0}
 	</blockquote>
 snippet body
 	<body>
-		${1}
+		${0}
 	</body>
 snippet br
-	<br />${1}
+	<br />
 snippet button
-	<button type="${1:submit}">${2}</button>
+	<button type="${1:submit}">${0}</button>
 snippet button.
-	<button class="${1:button}" type="${2:submit}">${3}</button>
+	<button class="${1:button}" type="${2:submit}">${0}</button>
 snippet button#
-	<button id="${1}" type="${2:submit}">${3}</button>
+	<button id="${1}" type="${2:submit}">${0}</button>
 snippet button:s
-	<button type="submit">${1}</button>
+	<button type="submit">${0}</button>
 snippet button:r
-	<button type="reset">${1}</button>
+	<button type="reset">${0}</button>
 snippet canvas
 	<canvas>
-		${1}
+		${0}
 	</canvas>
 snippet caption
-	<caption>${1}</caption>
+	<caption>${0}</caption>
 snippet cite
-	<cite>${1}</cite>
+	<cite>${0}</cite>
 snippet code
-	<code>${1}</code>
+	<code>${0}</code>
 snippet col
-	<col />${1}
+	<col />
 snippet col+
 	<col />
-	col+${1}
+	col+
 snippet colgroup
 	<colgroup>
-		${1}
+		${0}
 	</colgroup>
 snippet colgroup+
 	<colgroup>
 		<col />
-		col+${1}
+		col+${0}
 	</colgroup>
 snippet command
-	<command type="command" label="${1}" icon="${2}" />
+	<command type="command" label="${1}" icon="${0}" />
 snippet command:c
-	<command type="checkbox" label="${1}" icon="${2}" />
+	<command type="checkbox" label="${1}" icon="${0}" />
 snippet command:r
-	<command type="radio" radiogroup="${1}" label="${2}" icon="${3}" />
+	<command type="radio" radiogroup="${1}" label="${2}" icon="${0}" />
 snippet datagrid
 	<datagrid>
-		${1}
+		${0}
 	</datagrid>
 snippet datalist
 	<datalist>
-		${1}
+		${0}
 	</datalist>
 snippet datatemplate
 	<datatemplate>
-		${1}
+		${0}
 	</datatemplate>
 snippet dd
-	<dd>${1}</dd>
+	<dd>${0}</dd>
 snippet dd.
-	<dd class="${1}">${2}</dd>
+	<dd class="${1}">${0}</dd>
 snippet dd#
-	<dd id="${1}">${2}</dd>
+	<dd id="${1}">${0}</dd>
 snippet del
-	<del>${1}</del>
+	<del>${0}</del>
 snippet details
-	<details>${1}</details>
+	<details>${0}</details>
 snippet dfn
-	<dfn>${1}</dfn>
+	<dfn>${0}</dfn>
 snippet dialog
 	<dialog>
-		${1}
+		${0}
 	</dialog>
 snippet div
 	<div>
-		${1}
+		${0}
 	</div>
 snippet div.
 	<div class="${1}">
-		${2}
+		${0}
 	</div>
 snippet div#
 	<div id="${1}">
-		${2}
+		${0}
 	</div>
 snippet dl
 	<dl>
-		${1}
+		${0}
 	</dl>
 snippet dl.
 	<dl class="${1}">
-		${2}
+		${0}
 	</dl>
 snippet dl#
 	<dl id="${1}">
-		${2}
+		${0}
 	</dl>
 snippet dl+
 	<dl>
 		<dt>${1}</dt>
 		<dd>${2}</dd>
-		dt+${3}
+		dt+${0}
 	</dl>
 snippet dt
-	<dt>${1}</dt>
+	<dt>${0}</dt>
 snippet dt.
-	<dt class="${1}">${2}</dt>
+	<dt class="${1}">${0}</dt>
 snippet dt#
-	<dt id="${1}">${2}</dt>
+	<dt id="${1}">${0}</dt>
 snippet dt+
 	<dt>${1}</dt>
 	<dd>${2}</dd>
-	dt+${3}
+	dt+${0}
 snippet em
-	<em>${1}</em>
+	<em>${0}</em>
 snippet embed
-	<embed src=${1} type="${2} />
+	<embed src=${1} type="${0} />
 snippet fieldset
 	<fieldset>
-		${1}
+		${0}
 	</fieldset>
 snippet fieldset.
 	<fieldset class="${1}">
-		${2}
+		${0}
 	</fieldset>
 snippet fieldset#
 	<fieldset id="${1}">
-		${2}
+		${0}
 	</fieldset>
 snippet fieldset+
 	<fieldset>
 		<legend><span>${1}</span></legend>
 		${2}
 	</fieldset>
-	fieldset+${3}
+	fieldset+${0}
 snippet figcaption
-	<figcaption>${1}</figcaption>
+	<figcaption>${0}</figcaption>
 snippet figure
-	<figure>${1}</figure>
+	<figure>${0}</figure>
 snippet footer
 	<footer>
-		${1}
+		${0}
 	</footer>
 snippet footer.
 	<footer class="${1}">
-		${2}
+		${0}
 	</footer>
 snippet footer#
 	<footer id="${1}">
-		${2}
+		${0}
 	</footer>
 snippet form
 	<form action="${1}" method="${2:get}" accept-charset="utf-8">
-		${3}
+		${0}
 	</form>
 snippet form.
 	<form class="${1}" action="${2}" method="${3:get}" accept-charset="utf-8">
-		${4}
+		${0}
 	</form>
 snippet form#
 	<form id="${1}" action="${2}" method="${3:get}" accept-charset="utf-8">
-		${4}
+		${0}
 	</form>
 snippet h1
-	<h1>${1}</h1>
+	<h1>${0}</h1>
 snippet h1.
-	<h1 class="${1}">${2}</h1>
+	<h1 class="${1}">${0}</h1>
 snippet h1#
-	<h1 id="${1}">${2}</h1>
+	<h1 id="${1}">${0}</h1>
 snippet h2
-	<h2>${1}</h2>
+	<h2>${0}</h2>
 snippet h2.
-	<h2 class="${1}">${2}</h2>
+	<h2 class="${1}">${0}</h2>
 snippet h2#
-	<h2 id="${1}">${2}</h2>
+	<h2 id="${1}">${0}</h2>
 snippet h3
-	<h3>${1}</h3>
+	<h3>${0}</h3>
 snippet h3.
-	<h3 class="${1}">${2}</h3>
+	<h3 class="${1}">${0}</h3>
 snippet h3#
-	<h3 id="${1}">${2}</h3>
+	<h3 id="${1}">${0}</h3>
 snippet h4
-	<h4>${1}</h4>
+	<h4>${0}</h4>
 snippet h4.
-	<h4 class="${1}">${2}</h4>
+	<h4 class="${1}">${0}</h4>
 snippet h4#
-	<h4 id="${1}">${2}</h4>
+	<h4 id="${1}">${0}</h4>
 snippet h5
-	<h5>${1}</h5>
+	<h5>${0}</h5>
 snippet h5.
-	<h5 class="${1}">${2}</h5>
+	<h5 class="${1}">${0}</h5>
 snippet h5#
-	<h5 id="${1}">${2}</h5>
+	<h5 id="${1}">${0}</h5>
 snippet h6
-	<h6>${1}</h6>
+	<h6>${0}</h6>
 snippet h6.
-	<h6 class="${1}">${2}</h6>
+	<h6 class="${1}">${0}</h6>
 snippet h6#
-	<h6 id="${1}">${2}</h6>
+	<h6 id="${1}">${0}</h6>
 snippet head
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
 		<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
-		${2}
+		${0}
 	</head>
 snippet header
 	<header>
-		${1}
+		${0}
 	</header>
 snippet header.
 	<header class="${1}">
-		${2}
+		${0}
 	</header>
 snippet header#
 	<header id="${1}">
-		${2}
+		${0}
 	</header>
 snippet hgroup
 	<hgroup>
-		${1}
+		${0}
 	</hgroup>
 snippet hgroup.
 	<hgroup class="${1}>
-		${2}
+		${0}
 	</hgroup>
 snippet hr
-	<hr />${1}
+	<hr />
 snippet html
 	<html>
-	${1}
+	${0}
 	</html>
 snippet xhtml
 	<html xmlns="http://www.w3.org/1999/xhtml">
-	${1}
+	${0}
 	</html>
 snippet html5
 	<!DOCTYPE html>
@@ -454,175 +454,175 @@ snippet html5
 			${2:meta}
 		</head>
 		<body>
-			${3:body}
+			${0:body}
 		</body>
 	</html>
 snippet i
-	<i>${1}</i>
+	<i>${0}</i>
 snippet iframe
-	<iframe src="${1}" frameborder="0"></iframe>${2}
+	<iframe src="${1}" frameborder="0"></iframe>
 snippet iframe.
-	<iframe class="${1}" src="${2}" frameborder="0"></iframe>${3}
+	<iframe class="${1}" src="${2}" frameborder="0"></iframe>
 snippet iframe#
-	<iframe id="${1}" src="${2}" frameborder="0"></iframe>${3}
+	<iframe id="${1}" src="${2}" frameborder="0"></iframe>
 snippet img
-	<img src="${1}" alt="${2}" />${3}
+	<img src="${1}" alt="${2}" />
 snippet img.
-	<img class="${1}" src="${2}" alt="${3}" />${4}
+	<img class="${1}" src="${2}" alt="${3}" />
 snippet img#
-	<img id="${1}" src="${2}" alt="${3}" />${4}
+	<img id="${1}" src="${2}" alt="${3}" />
 snippet input
-	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}" />${5}
+	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}" />
 snippet input.
-	<input class="${1}" type="${2:text/submit/hidden/button/image}" name="${3}" id="${4:$3}" value="${5}" />${6}
+	<input class="${1}" type="${2:text/submit/hidden/button/image}" name="${3}" id="${4:$3}" value="${5}" />
 snippet input:text
-	<input type="text" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="text" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:submit
-	<input type="submit" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="submit" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:hidden
-	<input type="hidden" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="hidden" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:button
-	<input type="button" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="button" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:image
-	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}" />${5}
+	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}" />
 snippet input:checkbox
-	<input type="checkbox" name="${1}" id="${2:$1}" />${3}
+	<input type="checkbox" name="${1}" id="${2:$1}" />
 snippet input:radio
-	<input type="radio" name="${1}" id="${2:$1}" />${3}
+	<input type="radio" name="${1}" id="${2:$1}" />
 snippet input:color
-	<input type="color" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="color" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:date
-	<input type="date" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="date" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:datetime
-	<input type="datetime" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="datetime" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:datetime-local
-	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:email
-	<input type="email" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="email" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:file
-	<input type="file" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="file" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:month
-	<input type="month" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="month" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:number
-	<input type="number" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="number" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:password
-	<input type="password" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="password" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:range
-	<input type="range" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="range" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:reset
-	<input type="reset" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="reset" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:search
-	<input type="search" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="search" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:time
-	<input type="time" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="time" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:url
-	<input type="url" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="url" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:week
-	<input type="week" name="${1}" id="${2:$1}" value="${3}" />${4}
+	<input type="week" name="${1}" id="${2:$1}" value="${3}" />
 snippet ins
-	<ins>${1}</ins>
+	<ins>${0}</ins>
 snippet kbd
-	<kbd>${1}</kbd>
+	<kbd>${0}</kbd>
 snippet keygen
-	<keygen>${1}</keygen>
+	<keygen>${0}</keygen>
 snippet label
-	<label for="${2:$1}">${1}</label>
+	<label for="${0:$1}">${1}</label>
 snippet label:i
 	<label for="${2:$1}">${1}</label>
-	<input type="${3:text/submit/hidden/button}" name="${4:$2}" id="${5:$2}" value="${6}" />${7}
+	<input type="${3:text/submit/hidden/button}" name="${4:$2}" id="${5:$2}" value="${6}" />
 snippet label:s
 	<label for="${2:$1}">${1}</label>
 	<select name="${3:$2}" id="${4:$2}">
-		<option value="${5}">${6:$5}</option>
+		<option value="${5}">${0:$5}</option>
 	</select>
 snippet legend
-	<legend>${1}</legend>
+	<legend>${0}</legend>
 snippet legend+
-	<legend><span>${1}</span></legend>
+	<legend><span>${0}</span></legend>
 snippet li
-	<li>${1}</li>
+	<li>${0}</li>
 snippet li.
-	<li class="${1}">${2}</li>
+	<li class="${1}">${0}</li>
 snippet li+
 	<li>${1}</li>
-	li+${2}
+	li+
 snippet lia
-	<li><a href="${2:#}">${1}</a></li>
+	<li><a href="${0:#}">${1}</a></li>
 snippet lia+
 	<li><a href="${2:#}">${1}</a></li>
-	lia+${3}
+	lia+
 snippet link
-	<link rel="${1}" href="${2}" title="${3}" type="${4}" />${5}
+	<link rel="${1}" href="${2}" title="${3}" type="${4}" />
 snippet link:atom
-	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml" />${2}
+	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml" />
 snippet link:css
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />${3}
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />
 snippet link:favicon
-	<link rel="shortcut icon" href="${1:favicon.ico}" type="image/x-icon" />${2}
+	<link rel="shortcut icon" href="${1:favicon.ico}" type="image/x-icon" />
 snippet link:rss
-	<link rel="alternate" href="${1:rss.xml}" title="RSS" type="application/atom+xml" />${2}
+	<link rel="alternate" href="${1:rss.xml}" title="RSS" type="application/atom+xml" />
 snippet link:touch
-	<link rel="apple-touch-icon" href="${1:favicon.png}" />${2}
+	<link rel="apple-touch-icon" href="${1:favicon.png}" />
 snippet map
 	<map name="${1}">
-		${2}
+		${0}
 	</map>
 snippet map.
 	<map class="${1}" name="${2}">
-		${3}
+		${0}
 	</map>
 snippet map#
 	<map name="${1}" id="${2:$1}>
-		${3}
+		${0}
 	</map>
 snippet map+
 	<map name="${1}">
 		<area shape="${2}" coords="${3}" href="${4}" alt="${5}" />${6}
-	</map>${7}
+	</map>
 snippet mark
-	<mark>${1}</mark>
+	<mark>${0}</mark>
 snippet menu
 	<menu>
-		${1}
+		${0}
 	</menu>
 snippet menu:c
 	<menu type="context">
-		${1}
+		${0}
 	</menu>
 snippet menu:t
 	<menu type="toolbar">
-		${1}
+		${0}
 	</menu>
 snippet meta
-	<meta http-equiv="${1}" content="${2}" />${3}
+	<meta http-equiv="${1}" content="${2}" />
 snippet meta:compat
-	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}" />${3}
+	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}" />
 snippet meta:refresh
-	<meta http-equiv="refresh" content="text/html;charset=UTF-8" />${3}
+	<meta http-equiv="refresh" content="text/html;charset=UTF-8" />
 snippet meta:utf
-	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />${3}
+	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
 snippet meter
-	<meter>${1}</meter>
+	<meter>${0}</meter>
 snippet nav
 	<nav>
-		${1}
+		${0}
 	</nav>
 snippet nav.
 	<nav class="${1}">
-		${2}
+		${0}
 	</nav>
 snippet nav#
 	<nav id="${1}">
-		${2}
+		${0}
 	</nav>
 snippet noscript
 	<noscript>
-		${1}
+		${0}
 	</noscript>
 snippet object
 	<object data="${1}" type="${2}">
 		${3}
-	</object>${4}
+	</object>
 # Embed QT Movie
 snippet movie
 	<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
@@ -635,198 +635,198 @@ snippet movie
 			controller="${4:true}" autoplay="${5:true}"
 			scale="tofit" cache="true"
 			pluginspage="http://www.apple.com/quicktime/download/" />
-	</object>${6}
+	</object>
 snippet ol
 	<ol>
-		${1}
+		${0}
 	</ol>
 snippet ol.
 	<ol class="${1}>
-		${2}
+		${0}
 	</ol>
 snippet ol#
 	<ol id="${1}>
-		${2}
+		${0}
 	</ol>
 snippet ol+
 	<ol>
 		<li>${1}</li>
-		li+${2}
+		li+${0}
 	</ol>
 snippet opt
-	<option value="${1}">${2:$1}</option>
+	<option value="${1}">${0:$1}</option>
 snippet opt+
 	<option value="${1}">${2:$1}</option>
-	opt+${3}
+	opt+${0}
 snippet optt
-	<option>${1}</option>
+	<option>${0}</option>
 snippet optgroup
 	<optgroup>
 		<option value="${1}">${2:$1}</option>
-		opt+${3}
+		opt+${0}
 	</optgroup>
 snippet output
-	<output>${1}</output>
+	<output>${0}</output>
 snippet p
-	<p>${1}</p>
+	<p>${0}</p>
 snippet param
-	<param name="${1}" value="${2}" />${3}
+	<param name="${1}" value="${2}" />
 snippet pre
 	<pre>
-		${1}
+		${0}
 	</pre>
 snippet progress
-	<progress>${1}</progress>
+	<progress>${0}</progress>
 snippet q
-	<q>${1}</q>
+	<q>${0}</q>
 snippet rp
-	<rp>${1}</rp>
+	<rp>${0}</rp>
 snippet rt
-	<rt>${1}</rt>
+	<rt>${0}</rt>
 snippet ruby
 	<ruby>
-		<rp><rt>${1}</rt></rp>
+		<rp><rt>${0}</rt></rp>
 	</ruby>
 snippet s
-	<s>${1}</s>
+	<s>${0}</s>
 snippet samp
 	<samp>
-		${1}
+		${0}
 	</samp>
 snippet script
 	<script type="text/javascript" charset="utf-8">
-		${1}
+		${0}
 	</script>
 snippet scriptsrc
-	<script src="${1}.js" type="text/javascript" charset="utf-8"></script>
+	<script src="${0}.js" type="text/javascript" charset="utf-8"></script>
 snippet section
 	<section>
-		${1}
+		${0}
 	</section>
 snippet section.
 	<section class="${1}">
-		${2}
+		${0}
 	</section>
 snippet section#
 	<section id="${1}">
-		${2}
+		${0}
 	</section>
 snippet select
 	<select name="${1}" id="${2:$1}">
-		${3}
+		${0}
 	</select>
 snippet select.
 	<select name="${1}" id="${2:$1}" class="${3}>
-		${4}
+		${0}
 	</select>
 snippet select+
 	<select name="${1}" id="${2:$1}">
 		<option value="${3}">${4:$3}</option>
-		opt+${5}
+		opt+${0}
 	</select>
 snippet small
-	<small>${1}</small>
+	<small>${0}</small>
 snippet source
-	<source src="${1}" type="${2}" media="${3}" />
+	<source src="${1}" type="${2}" media="${0}" />
 snippet span
-	<span>${1}</span>
+	<span>${0}</span>
 snippet span.
-	<span class="${1}">${2}</span>
+	<span class="${1}">${0}</span>
 snippet span#
-	<span id="${1}">${2}</span>
+	<span id="${1}">${0}</span>
 snippet strong
-	<strong>${1}</strong>
+	<strong>${0}</strong>
 snippet style
 	<style type="text/css" media="${1:all}">
-		${2}
+		${0}
 	</style>
 snippet sub
-	<sub>${1}</sub>
+	<sub>${0}</sub>
 snippet summary
 	<summary>
-		${1}
+		${0}
 	</summary>
 snippet sup
-	<sup>${1}</sup>
+	<sup>${0}</sup>
 snippet table
 	<table border="${1:0}">
-		${2}
+		${0}
 	</table>
 snippet table.
 	<table class="${1}" border="${2:0}">
-		${3}
+		${0}
 	</table>
 snippet table#
 	<table id="${1}" border="${2:0}">
-		${3}
+		${0}
 	</table>
 snippet tbody
 	<tbody>
-		${1}
+		${0}
 	</tbody>
 snippet td
-	<td>${1}</td>
+	<td>${0}</td>
 snippet td.
-	<td class="${1}">${2}</td>
+	<td class="${1}">${0}</td>
 snippet td#
-	<td id="${1}">${2}</td>
+	<td id="${1}">${0}</td>
 snippet td+
 	<td>${1}</td>
-	td+${2}
+	td+${0}
 snippet textarea
-	<textarea name="${1}" id=${2:$1} rows="${3:8}" cols="${4:40}">${5}</textarea>${6}
+	<textarea name="${1}" id=${2:$1} rows="${3:8}" cols="${4:40}">${5}</textarea>
 snippet tfoot
 	<tfoot>
-		${1}
+		${0}
 	</tfoot>
 snippet th
-	<th>${1}</th>
+	<th>${0}</th>
 snippet th.
-	<th class="${1}">${2}</th>
+	<th class="${1}">${0}</th>
 snippet th#
-	<th id="${1}">${2}</th>
+	<th id="${1}">${0}</th>
 snippet th+
 	<th>${1}</th>
-	th+${2}
+	th+${0}
 snippet thead
 	<thead>
-		${1}
+		${0}
 	</thead>
 snippet time
-	<time datetime="${1}" pubdate="${2:$1}">${3:$1}</time>
+	<time datetime="${1}" pubdate="${2:$1}">${0:$1}</time>
 snippet title
-	<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+	<title>${0:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 snippet tr
 	<tr>
-		${1}
+		${0}
 	</tr>
 snippet tr+
 	<tr>
 		<td>${1}</td>
-		td+${2}
+		td+${0}
 	</tr>
 snippet track
-	<track src="${1}" srclang="${2}" label="${3}" default="${4:default}>${5}</track>${6}
+	<track src="${1}" srclang="${2}" label="${3}" default="${4:default}>${5}</track>
 snippet ul
 	<ul>
-		${1}
+		${0}
 	</ul>
 snippet ul.
 	<ul class="${1}">
-		${2}
+		${0}
 	</ul>
 snippet ul#
 	<ul id="${1}">
-		${2}
+		${0}
 	</ul>
 snippet ul+
 	<ul>
 		<li>${1}</li>
-		li+${2}
+		li+${0}
 	</ul>
 snippet var
-	<var>${1}</var>
+	<var>${0}</var>
 snippet video
-	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>${8}
+	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>
 snippet wbr
-	<wbr />${1}
+	<wbr />
diff --git a/snippets/html_minimal.snippets b/snippets/html_minimal.snippets
index bc6d3e0af..308f44dfe 100644
--- a/snippets/html_minimal.snippets
+++ b/snippets/html_minimal.snippets
@@ -18,31 +18,31 @@ snippet html5
 # ==== TAGS
 # you always need these:
 snippet .
-	class="${1}"${2}
+	class="${1}"
 snippet n
-	name="${1}"${2}
+	name="${1}"
 snippet r
-	rel="${1}"${2}
+	rel="${1}"
 snippet t
-	title="${1}"${2}
+	title="${1}"
 
 # not using # because id is faster to type
 snippet id
-	id="${1}"${2}
+	id="${1}"
 snippet idn
-	id="${1}" name="${2:$1}"
+	id="${1}" name="${0:$1}"
 
 snippet label_and_input
-	<label for="${2:$1}">${1}</label>
-	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}">${7}
+	<label for="${0:$1}">${1}</label>
+	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}">
 
 
 # FORMS
 # use idn . or n to add id
 snippet input
-	<input type="${1:text}" value="${2}" ${3}>${7}
+	<input type="${1:text}" value="${2}" ${3}>
 snippet submit
-	<input type="submit" value="${2}" ${3}>${7}
+	<input type="submit" value="${2}" ${3}>
 snippet textarea
 	<textarea $1>$2</textarea>
 
@@ -61,9 +61,9 @@ snippet img
 	<img src="$1" alt="$2"/>
 # JS/CSS
 snippet css_file
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">${3}
-snippet css_block
 	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
+snippet css_block
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${0:all}">
         </link>
 
 snippet script_block
diff --git a/snippets/htmldjango.snippets b/snippets/htmldjango.snippets
index 4ff5d336d..be087cec5 100644
--- a/snippets/htmldjango.snippets
+++ b/snippets/htmldjango.snippets
@@ -1,89 +1,89 @@
 # Generic tags
 
 snippet %
-	{% ${1} %}${2}
+	{% ${1} %}
 snippet %%
 	{% ${1:tag_name} %}
-	${2}
+	${0}
 	{% end$1 %}
 snippet {
-	{{ ${1} }}${2}
+	{{ ${1} }}
 # Template Tags
 
 snippet autoescape
 	{% autoescape ${1:off} %}
-		${2}
+		${0}
 	{% endautoescape %}
 snippet block
 	{% block ${1} %}
-		${2}
+		${0}
 	{% endblock %}
 snippet #
-	{# ${1:comment} #}
+	{# ${0:comment} #}
 snippet comment
 	{% comment %}
-		${1}
+		${0}
 	{% endcomment %}
 snippet cycle
 	{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
 snippet debug
 	{% debug %}
 snippet extends
-	{% extends "${1:base.html}" %}
+	{% extends "${0:base.html}" %}
 snippet filter
 	{% filter ${1} %}
-		${2}
+		${0}
 	{% endfilter %}
 snippet firstof
 	{% firstof ${1} %}
 snippet for
 	{% for ${1} in ${2} %}
-		${3}
+		${0}
 	{% endfor %}
 snippet empty
 	{% empty %}
-	${1}
+	${0}
 snippet if
 	{% if ${1} %}
-		${2}
+		${0}
 	{% endif %}
 snippet el
 	{% else %}
 		${1}
 snippet eif
 	{% elif ${1} %}
-		${2}
+		${0}
 snippet ifchanged
 	{% ifchanged %}${1}{% endifchanged %}
 snippet ifequal
 	{% ifequal ${1} ${2} %}
-		${3}
+		${0}
 	{% endifequal %}
 snippet ifnotequal
 	{% ifnotequal ${1} ${2} %}
-		${3}
+		${0}
 	{% endifnotequal %}
 snippet include
-	{% include "${1}" %}
+	{% include "${0}" %}
 snippet load
-	{% load ${1} %}
+	{% load ${0} %}
 snippet now
-	{% now "${1:jS F Y H:i}" %}
+	{% now "${0:jS F Y H:i}" %}
 snippet regroup
-	{% regroup ${1} by ${2} as ${3} %}
+	{% regroup ${1} by ${2} as ${0} %}
 snippet spaceless
-	{% spaceless %}${1}{% endspaceless %}
+	{% spaceless %}${0}{% endspaceless %}
 snippet ssi
-	{% ssi ${1} %}
+	{% ssi ${0} %}
 snippet trans
-	{% trans "${1:string}" %}
+	{% trans "${0:string}" %}
 snippet url
-	{% url ${1} as ${2} %}
+	{% url ${1} as ${0} %}
 snippet widthratio
-	{% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
+	{% widthratio ${1:this_value} ${2:max_value} ${0:100} %}
 snippet with
 	{% with ${1} as ${2} %}
-		${3}
+		${0}
 	{% endwith %}
 
 # Template Filters
@@ -95,47 +95,47 @@ snippet with
 # Note: Template tags that take no arguments are not implemented.
 
 snippet add
-	add:"${1}"
+	add:"${0}"
 snippet center
-	center:"${1}"
+	center:"${0}"
 snippet cut
-	cut:"${1}"
+	cut:"${0}"
 snippet date
-	date:"${1}"
+	date:"${0}"
 snippet default
-	default:"${1}"
+	default:"${0}"
 snippet defaultifnone
-	default_if_none:"${1}"
+	default_if_none:"${0}"
 snippet dictsort
-	dictsort:"${1}"
+	dictsort:"${0}"
 snippet dictsortrev
-	dictsortreversed:"${1}"
+	dictsortreversed:"${0}"
 snippet divisibleby
-	divisibleby:"${1}"
+	divisibleby:"${0}"
 snippet floatformat
-	floatformat:"${1}"
+	floatformat:"${0}"
 snippet getdigit
-	get_digit:"${1}"
+	get_digit:"${0}"
 snippet join
-	join:"${1}"
+	join:"${0}"
 snippet lengthis
-	length_is:"${1}"
+	length_is:"${0}"
 snippet pluralize
-	pluralize:"${1}"
+	pluralize:"${0}"
 snippet removetags
-	removetags:"${1}"
+	removetags:"${0}"
 snippet slice
-	slice:"${1}"
+	slice:"${0}"
 snippet stringformat
-	stringformat:"${1}"
+	stringformat:"${0}"
 snippet time
-	time:"${1}"
+	time:"${0}"
 snippet truncatewords
-	truncatewords:${1}
+	truncatewords:${0}
 snippet truncatewordshtml
-	truncatewords_html:${1}
+	truncatewords_html:${0}
 snippet urlizetrunc
-	urlizetrunc:${1}
+	urlizetrunc:${0}
 snippet wordwrap
-	wordwrap:${1}
+	wordwrap:${0}
 
diff --git a/snippets/htmltornado.snippets b/snippets/htmltornado.snippets
index c52f0e890..46f5dab4c 100644
--- a/snippets/htmltornado.snippets
+++ b/snippets/htmltornado.snippets
@@ -1,55 +1,55 @@
 # Generic tags
 
 snippet {
-	{{ ${1} }}
+	{{ ${0} }}
 
 # Template tags
 
 snippet extends
-	{% extends "${1:base.html}" %}
+	{% extends "${0:base.html}" %}
 snippet autoescape
-	{% autoescape ${1:xhtml_escape | None} %}
+	{% autoescape ${0:xhtml_escape | None} %}
 snippet apply
 	{% apply ${1:function} %}
-	  ${2}
+	  ${0}
 	{% end %}
 snippet block
 	{% block ${1} %}
-	  ${2}
+	  ${0}
 	{% end %}
 snippet for
 	{% for ${1:item} in ${2} %}
-	  ${3}
+	  ${0}
 	{% end %}
 snippet from
-	{% from ${1:x} import ${2:y} %}
+	{% from ${1:x} import ${0:y} %}
 snippet if
 	{% if ${1:condition} %}
-	  ${2}
+	  ${0}
 	{% end %}
 snippet eif
-	{% elif ${1:condition} %}
+	{% elif ${0:condition} %}
 snippet el
 	{% else %}
 snippet import
-	{% import ${1:module} %}
+	{% import ${0:module} %}
 snippet include
-	{% include "${1:filename}" %}
+	{% include "${0:filename}" %}
 snippet module
-	{% module ${1:expression} %}
+	{% module ${0:expression} %}
 snippet raw
-	{% raw ${1:expression} %}
+	{% raw ${0:expression} %}
 snippet set
-	{% set ${1:x} = ${2:y} %}
+	{% set ${1:x} = ${0:y} %}
 snippet try
 	{% try %}
 	  ${1}
 	{% except %}
 	  ${2}
 	{% finallly %}
-	  ${3}
+	  ${0}
 	{% end %}
 snippet wh
 	{% while ${1:condition} %}
-	  ${2}
+	  ${0}
 	{% end %}
diff --git a/snippets/java.snippets b/snippets/java.snippets
index a36e0f158..1595ffc1a 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -9,16 +9,16 @@ snippet pr
 ## Annotations
 snippet before
 	@Before
-	static void ${1:intercept}(${2:args}) { ${3} }
+	static void ${1:intercept}(${2:args}) { ${0} }
 snippet mm
 	@ManyToMany
-	${1}
+	${0}
 snippet mo
 	@ManyToOne
-	${1}
+	${0}
 snippet om
 	@OneToMany${1:(cascade=CascadeType.ALL)}
-	${2}
+	${0}
 snippet oo
 	@OneToOne
 	${1}
@@ -39,11 +39,11 @@ snippet j.u
 ##
 ## Class
 snippet cl
-	class ${1:`vim_snippets#Filename("", "untitled")`} ${2}
+	class ${1:`vim_snippets#Filename("", "untitled")`} ${0}
 snippet in
-	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2:extends Parent}${3}
+	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2:extends Parent}
 snippet tc
-	public class ${1:`vim_snippets#Filename()`} extends ${2:TestCase}
+	public class ${1:`vim_snippets#Filename()`} extends ${0:TestCase}
 ##
 ## Class Enhancements
 snippet ext
@@ -54,40 +54,40 @@ snippet imp
 ## Comments
 snippet /*
 	/*
-	 * ${1}
+	 * ${0}
 	 */
 ##
 ## Constants
 snippet co
-	static public final ${1:String} ${2:var} = ${3};${4}
+	static public final ${1:String} ${2:var} = ${3};
 snippet cos
-	static public final String ${1:var} = "${2}";${3}
+	static public final String ${1:var} = "${2}";
 ##
 ## Control Statements
 snippet case
 	case ${1}:
-		${2}
+		${0}
 snippet def
 	default:
-		${2}
+		${0}
 snippet el
 	else
 snippet eif
-	else if (${1}) ${2}
+	else if (${1}) ${0}
 snippet if
-	if (${1}) ${2}
+	if (${1}) ${0}
 snippet sw
 	switch (${1}) {
-		${2}
+		${0}
 	}
 ##
 ## Create a Method
 snippet m
-	${1:void} ${2:method}(${3}) ${4:throws }${5}
+	${1:void} ${2:method}(${3}) ${4:throws }
 ##
 ## Create a Variable
 snippet v
-	${1:String} ${2:var}${3: = null}${4};${5}
+	${1:String} ${2:var}${3: = null}${4};
 ##
 ## Enhancements to Methods, variables, classes, etc.
 snippet ab
@@ -101,107 +101,107 @@ snippet sy
 ##
 ## Error Methods
 snippet err
-	System.err.print("${1:Message}");
+	System.err.print("${0:Message}");
 snippet errf
-	System.err.printf("${1:Message}", ${2:exception});
+	System.err.printf("${1:Message}", ${0:exception});
 snippet errln
-	System.err.println("${1:Message}");
+	System.err.println("${0:Message}");
 ##
 ## Exception Handling
 snippet as
-	assert ${1:test} : "${2:Failure message}";${3}
+	assert ${1:test} : "${2:Failure message}";
 snippet ca
-	catch(${1:Exception} ${2:e}) ${3}
+	catch(${1:Exception} ${2:e}) ${0}
 snippet thr
 	throw
 snippet ths
 	throws
 snippet try
 	try {
-		${3}
+		${0}
 	} catch(${1:Exception} ${2:e}) {
 	}
 snippet tryf
 	try {
-		${3}
+		${0}
 	} catch(${1:Exception} ${2:e}) {
 	} finally {
 	}
 ##
 ## Find Methods
 snippet findall
-	List<${1:listName}> ${2:items} = ${1}.findAll();${3}
+	List<${1:listName}> ${2:items} = ${1}.findAll();
 snippet findbyid
-	${1:var} ${2:item} = ${1}.findById(${3});${4}
+	${1:var} ${2:item} = ${1}.findById(${3});
 ##
 ## Javadocs
 snippet /**
 	/**
-	 * ${1}
+	 * ${0}
 	 */
 snippet @au
 	@author `system("grep \`id -un\` /etc/passwd | cut -d \":\" -f5 | cut -d \",\" -f1")`
 snippet @br
-	@brief ${1:Description}
+	@brief ${0:Description}
 snippet @fi
-	@file ${1:`vim_snippets#Filename()`}.java
+	@file ${0:`vim_snippets#Filename()`}.java
 snippet @pa
-	@param ${1:param}
+	@param ${0:param}
 snippet @re
-	@return ${1:param}
+	@return ${0:param}
 ##
 ## Logger Methods
 snippet debug
-	Logger.debug(${1:param});${2}
+	Logger.debug(${1:param});
 snippet error
-	Logger.error(${1:param});${2}
+	Logger.error(${1:param});
 snippet info
-	Logger.info(${1:param});${2}
+	Logger.info(${1:param});
 snippet warn
-	Logger.warn(${1:param});${2}
+	Logger.warn(${1:param});
 ##
 ## Loops
 snippet enfor
-	for (${1} : ${2}) ${3}
+	for (${1} : ${2}) ${0}
 snippet for
-	for (${1}; ${2}; ${3}) ${4}
+	for (${1}; ${2}; ${3}) ${0}
 snippet wh
-	while (${1}) ${2}
+	while (${1}) ${0}
 ##
 ## Main method
 snippet main
 	public static void main (String[] args) {
-		${1}
+		${0}
 	}
 ##
 ## Print Methods
 snippet print
-	System.out.print("${1:Message}");
+	System.out.print("${0:Message}");
 snippet printf
-	System.out.printf("${1:Message}", ${2:args});
+	System.out.printf("${1:Message}", ${0:args});
 snippet println
-	System.out.println(${1});
+	System.out.println(${0});
 ##
 ## Render Methods
 snippet ren
-	render(${1:param});${2}
+	render(${1:param});
 snippet rena
-	renderArgs.put("${1}", ${2});${3}
+	renderArgs.put("${1}", ${2});
 snippet renb
-	renderBinary(${1:param});${2}
+	renderBinary(${1:param});
 snippet renj
-	renderJSON(${1:param});${2}
+	renderJSON(${1:param});
 snippet renx
-	renderXml(${1:param});${2}
+	renderXml(${1:param});
 ##
 ## Setter and Getter Methods
 snippet set
-	${1:public} void set${3:}(${2:String} ${4:}){
+	${1:public} void set${3:}(${2:String} ${0:}){
 		this.$4 = $4;
 	}
 snippet get
 	${1:public} ${2:String} get${3:}(){
-		return this.${4:};
+		return this.${0:};
 	}
 ##
 ## Terminate Methods or Loops
@@ -213,12 +213,12 @@ snippet br
 ## Test Methods
 snippet t
 	public void test${1:Name}() throws Exception {
-		${2}
+		${0}
 	}
 snippet test
 	@Test
 	public void test${1:Name}() throws Exception {
-		${2}
+		${0}
 	}
 ##
 ## Utils
@@ -227,14 +227,14 @@ snippet Sc
 ##
 ## Miscellaneous
 snippet action
-	public static void ${1:index}(${2:args}) { ${3} }
+	public static void ${1:index}(${2:args}) { ${0} }
 snippet rnf
-	notFound(${1:param});${2}
+	notFound(${1:param});
 snippet rnfin
-	notFoundIfNull(${1:param});${2}
+	notFoundIfNull(${1:param});
 snippet rr
-	redirect(${1:param});${2}
+	redirect(${1:param});
 snippet ru
-	unauthorized(${1:param});${2}
+	unauthorized(${1:param});
 snippet unless
-	(unless=${1:param});${2}
+	(unless=${1:param});
diff --git a/snippets/javascript-jquery.snippets b/snippets/javascript-jquery.snippets
index 014c6158d..ef6f66c70 100644
--- a/snippets/javascript-jquery.snippets
+++ b/snippets/javascript-jquery.snippets
@@ -1,9 +1,9 @@
 snippet add
-	${1:obj}.add('${2:selector expression}')${3}
+	${1:obj}.add('${2:selector expression}')
 snippet addClass
-	${1:obj}.addClass('${2:class name}')${3}
+	${1:obj}.addClass('${2:class name}')
 snippet after
-	${1:obj}.after('${2:Some text <b>and bold!</b>}')${3}
+	${1:obj}.after('${2:Some text <b>and bold!</b>}')
 snippet ajax
 	$.ajax({
 		url: '${1:mydomain.com/url}',
@@ -17,41 +17,41 @@ snippet ajax
 			${6:// success callback}
 		},
 		error: function (jqXHR, textStatus, errorThrown) {
-			${7:// error callback}
+			${0:// error callback}
 		}
 	});
 snippet ajaxcomplete
 	${1:obj}.ajaxComplete(function (${1:e}, xhr, settings) {
-		${2:// callback}
+		${0:// callback}
 	});
 snippet ajaxerror
 	${1:obj}.ajaxError(function (${1:e}, xhr, settings, thrownError) {
 		${2:// error callback}
 	});
-	${3}
+	${0}
 snippet ajaxget
 	$.get('${1:mydomain.com/url}',
 		${2:{ param1: value1 },}
 		function (data, textStatus, jqXHR) {
-			${3:// success callback}
+			${0:// success callback}
 		}
 	);
 snippet ajaxpost
 	$.post('${1:mydomain.com/url}',
 		${2:{ param1: value1 },}
 		function (data, textStatus, jqXHR) {
-			${3:// success callback}
+			${0:// success callback}
 		}
 	);
 snippet ajaxprefilter
 	$.ajaxPrefilter(function (${1:options}, ${2:originalOptions}, jqXHR) {
-		${3: // Modify options, control originalOptions, store jqXHR, etc}
+		${0: // Modify options, control originalOptions, store jqXHR, etc}
 	});
 snippet ajaxsend
 	${1:obj}.ajaxSend(function (${1:request, settings}) {
 		${2:// error callback}
 	});
-	${3}
+	${0}
 snippet ajaxsetup
 	$.ajaxSetup({
 		url: "${1:mydomain.com/url}",
@@ -65,525 +65,525 @@ snippet ajaxsetup
 			${6:// success callback}
 		},
 		error: function (jqXHR, textStatus, errorThrown) {
-			${7:// error callback}
+			${0:// error callback}
 		}
 	});
 snippet ajaxstart
 	$.ajaxStart(function () {
 		${1:// handler for when an AJAX call is started and no other AJAX calls are in progress};
 	});
-	${2}
+	${0}
 snippet ajaxstop
 	$.ajaxStop(function () {
 		${1:// handler for when all AJAX calls have been completed};
 	});
-	${2}
+	${0}
 snippet ajaxsuccess
 	$.ajaxSuccess(function (${1:e}, xhr, settings) {
 		${2:// handler for when any AJAX call is successfully completed};
 	});
-	${2}
+	${0}
 snippet andself
-	${1:obj}.andSelf()${2}
+	${1:obj}.andSelf()
 snippet animate
-	${1:obj}.animate({${2:param1: value1, param2: value2}}, ${3:speed})${4}
+	${1:obj}.animate({${2:param1: value1, param2: value2}}, ${3:speed})
 snippet append
-	${1:obj}.append('${2:Some text <b>and bold!</b>}')${3}
+	${1:obj}.append('${2:Some text <b>and bold!</b>}')
 snippet appendTo
-	${1:obj}.appendTo('${2:selector expression}')${3}
+	${1:obj}.appendTo('${2:selector expression}')
 snippet attr
-	${1:obj}.attr('${2:attribute}', '${3:value}')${4}
+	${1:obj}.attr('${2:attribute}', '${3:value}')
 snippet attrm
-	${1:obj}.attr({'${2:attr1}': '${3:value1}', '${4:attr2}': '${5:value2}'})${6}
+	${1:obj}.attr({'${2:attr1}': '${3:value1}', '${4:attr2}': '${5:value2}'})
 snippet before
-	${1:obj}.before('${2:Some text <b>and bold!</b>}')${3}
+	${1:obj}.before('${2:Some text <b>and bold!</b>}')
 snippet bind
 	${1:obj}.bind('${2:event name}', function (${3:e}) {
-		${4:// event handler}
+		${0:// event handler}
 	});
 snippet blur
 	${1:obj}.blur(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet C
-	$.Callbacks()${1}
+	$.Callbacks()
 snippet Cadd
-	${1:callbacks}.add(${2:callbacks})${3}
+	${1:callbacks}.add(${2:callbacks})
 snippet Cdis
-	${1:callbacks}.disable()${2}
+	${1:callbacks}.disable()
 snippet Cempty
-	${1:callbacks}.empty()${2}
+	${1:callbacks}.empty()
 snippet Cfire
-	${1:callbacks}.fire(${2:args})${3}
+	${1:callbacks}.fire(${2:args})
 snippet Cfired
-	${1:callbacks}.fired()${2}
+	${1:callbacks}.fired()
 snippet Cfirew
-	${1:callbacks}.fireWith(${2:this}, ${3:args})${4}
+	${1:callbacks}.fireWith(${2:this}, ${3:args})
 snippet Chas
-	${1:callbacks}.has(${2:callback})${3}
+	${1:callbacks}.has(${2:callback})
 snippet Clock
-	${1:callbacks}.lock()${2}
+	${1:callbacks}.lock()
 snippet Clocked
-	${1:callbacks}.locked()${2}
+	${1:callbacks}.locked()
 snippet Crem
-	${1:callbacks}.remove(${2:callbacks})${3}
+	${1:callbacks}.remove(${2:callbacks})
 snippet change
 	${1:obj}.change(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet children
-	${1:obj}.children('${2:selector expression}')${3}
+	${1:obj}.children('${2:selector expression}')
 snippet clearq
-	${1:obj}.clearQueue(${2:'queue name'})${3}
+	${1:obj}.clearQueue(${2:'queue name'})
 snippet click
 	${1:obj}.click(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet clone
-	${1:obj}.clone()${2}
+	${1:obj}.clone()
 snippet contains
-	$.contains(${1:container}, ${2:contents});
+	$.contains(${1:container}, ${0:contents});
 snippet css
-	${1:obj}.css('${2:attribute}', '${3:value}')${4}
+	${1:obj}.css('${2:attribute}', '${3:value}')
 snippet csshooks
 	$.cssHooks['${1:CSS prop}'] = {
 		get: function (elem, computed, extra) {
 			${2: // handle getting the CSS property}
 		},
 		set: function (elem, value) {
-			${3: // handle setting the CSS value}
+			${0: // handle setting the CSS value}
 		}
 	};
 snippet cssm
-	${1:obj}.css({${2:attribute1}: '${3:value1}', ${4:attribute2}: '${5:value2}'})${6}
+	${1:obj}.css({${2:attribute1}: '${3:value1}', ${4:attribute2}: '${5:value2}'})
 snippet D
-	$.Deferred()${1}
+	$.Deferred()
 snippet Dalways
-	${1:deferred}.always(${2:callbacks})${3}
+	${1:deferred}.always(${2:callbacks})
 snippet Ddone
-	${1:deferred}.done(${2:callbacks})${3}
+	${1:deferred}.done(${2:callbacks})
 snippet Dfail
-	${1:deferred}.fail(${2:callbacks})${3}
+	${1:deferred}.fail(${2:callbacks})
 snippet Disrej
-	${1:deferred}.isRejected()${2}
+	${1:deferred}.isRejected()
 snippet Disres
-	${1:deferred}.isResolved()${2}
+	${1:deferred}.isResolved()
 snippet Dnotify
-	${1:deferred}.notify(${2:args})${3}
+	${1:deferred}.notify(${2:args})
 snippet Dnotifyw
-	${1:deferred}.notifyWith(${2:this}, ${3:args})${4}
+	${1:deferred}.notifyWith(${2:this}, ${3:args})
 snippet Dpipe
-	${1:deferred}.then(${2:doneFilter}, ${3:failFilter}, ${4:progressFilter})${5}
+	${1:deferred}.then(${2:doneFilter}, ${3:failFilter}, ${4:progressFilter})
 snippet Dprog
-	${1:deferred}.progress(${2:callbacks})${3}
+	${1:deferred}.progress(${2:callbacks})
 snippet Dprom
-	${1:deferred}.promise(${2:target})${3}
+	${1:deferred}.promise(${2:target})
 snippet Drej
-	${1:deferred}.reject(${2:args})${3}
+	${1:deferred}.reject(${2:args})
 snippet Drejw
-	${1:deferred}.rejectWith(${2:this}, ${3:args})${4}
+	${1:deferred}.rejectWith(${2:this}, ${3:args})
 snippet Dres
-	${1:deferred}.resolve(${2:args})${3}
+	${1:deferred}.resolve(${2:args})
 snippet Dresw
-	${1:deferred}.resolveWith(${2:this}, ${3:args})${4}
+	${1:deferred}.resolveWith(${2:this}, ${3:args})
 snippet Dstate
-	${1:deferred}.state()${2}
+	${1:deferred}.state()
 snippet Dthen
-	${1:deferred}.then(${2:doneCallbacks}, ${3:failCallbacks}, ${4:progressCallbacks})${5}
+	${1:deferred}.then(${2:doneCallbacks}, ${3:failCallbacks}, ${4:progressCallbacks})
 snippet Dwhen
-	$.when(${1:deferreds})${2}
+	$.when(${1:deferreds})
 snippet data
-	${1:obj}.data(${2:obj})${3}
+	${1:obj}.data(${2:obj})
 snippet dataa
-	$.data('${1:selector expression}', '${2:key}'${3:, 'value'})${4}
+	$.data('${1:selector expression}', '${2:key}'${3:, 'value'})
 snippet dblclick
 	${1:obj}.dblclick(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet delay
-	${1:obj}.delay('${2:slow/400/fast}'${3:, 'queue name'})${4}
+	${1:obj}.delay('${2:slow/400/fast}'${3:, 'queue name'})
 snippet dele
 	${1:obj}.delegate('${2:selector expression}', '${3:event name}', function (${4:e}) {
-		${5:// event handler}
+		${0:// event handler}
 	});
 snippet deq
-	${1:obj}.dequeue(${2:'queue name'})${3}
+	${1:obj}.dequeue(${2:'queue name'})
 snippet deqq
-	$.dequeue('${1:selector expression}'${2:, 'queue name'})${3}
+	$.dequeue('${1:selector expression}'${2:, 'queue name'})
 snippet detach
-	${1:obj}.detach('${2:selector expression}')${3}
+	${1:obj}.detach('${2:selector expression}')
 snippet die
-	${1:obj}.die(${2:event}, ${3:handler})${4}
+	${1:obj}.die(${2:event}, ${3:handler})
 snippet each
 	${1:obj}.each(function (index) {
-		${2:this.innerHTML = this + " is the element, " + index + " is the position";}
+		${0:this.innerHTML = this + " is the element, " + index + " is the position";}
 	});
 snippet el
-	$('<${1}/>'${2:, {}})${3}
+	$('<${1}/>'${2:, {}})
 snippet eltrim
-	$.trim('${1:string}')${2}
+	$.trim('${1:string}')
 snippet empty
-	${1:obj}.empty()${2}
+	${1:obj}.empty()
 snippet end
-	${1:obj}.end()${2}
+	${1:obj}.end()
 snippet eq
-	${1:obj}.eq(${2:element index})${3}
+	${1:obj}.eq(${2:element index})
 snippet error
 	${1:obj}.error(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet eventsmap
 	{
-		:f${1}
+		:f${0}
 	}
 snippet extend
-	$.extend(${1:true, }${2:target}, ${3:obj})${4}
+	$.extend(${1:true, }${2:target}, ${3:obj})
 snippet fadein
-	${1:obj}.fadeIn('${2:slow/400/fast}')${3}
+	${1:obj}.fadeIn('${2:slow/400/fast}')
 snippet fadeinc
 	${1:obj}.fadeIn('slow/400/fast', function () {
-		${2:// callback};
+		${0:// callback};
 	});
 snippet fadeout
-	${1:obj}.fadeOut('${2:slow/400/fast}')${3}
+	${1:obj}.fadeOut('${2:slow/400/fast}')
 snippet fadeoutc
 	${1:obj}.fadeOut('slow/400/fast', function () {
-		${2:// callback};
+		${0:// callback};
 	});
 snippet fadeto
-	${1:obj}.fadeTo('${2:slow/400/fast}', ${3:0.5})${4}
+	${1:obj}.fadeTo('${2:slow/400/fast}', ${3:0.5})
 snippet fadetoc
 	${1:obj}.fadeTo('slow/400/fast', ${2:0.5}, function () {
-		${3:// callback};
+		${0:// callback};
 	});
 snippet filter
-	${1:obj}.filter('${2:selector expression}')${3}
+	${1:obj}.filter('${2:selector expression}')
 snippet filtert
 	${1:obj}.filter(function (${2:index}) {
 		${3}
-	})${4}
+	})
 snippet find
-	${1:obj}.find('${2:selector expression}')${3}
+	${1:obj}.find('${2:selector expression}')
 snippet focus
 	${1:obj}.focus(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet focusin
 	${1:obj}.focusIn(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet focusout
 	${1:obj}.focusOut(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet get
-	${1:obj}.get(${2:element index})${3}
+	${1:obj}.get(${2:element index})
 snippet getjson
 	$.getJSON('${1:mydomain.com/url}',
 		${2:{ param1: value1 },}
 		function (data, textStatus, jqXHR) {
-			${3:// success callback}
+			${0:// success callback}
 		}
 	);
 snippet getscript
 	$.getScript('${1:mydomain.com/url}', function (script, textStatus, jqXHR) {
-		${2:// callback}
+		${0:// callback}
 	});
 snippet grep
 	$.grep(${1:array}, function (item, index) {
 		${2}
-	}${3:, true});
+	}${0:, true});
 snippet hasc
-	${1:obj}.hasClass('${2:className}')${3}
+	${1:obj}.hasClass('${2:className}')
 snippet hasd
-	$.hasData('${1:selector expression}');
+	$.hasData('${0:selector expression}');
 snippet height
-	${1:obj}.height(${2:integer})${3}
+	${1:obj}.height(${2:integer})
 snippet hide
-	${1:obj}.hide('${2:slow/400/fast}')${3}
+	${1:obj}.hide('${2:slow/400/fast}')
 snippet hidec
 	${1:obj}.hide('${2:slow/400/fast}', function () {
-		${3:// callback}
+		${0:// callback}
 	});
 snippet hover
 	${1:obj}.hover(function (${2:e}) {
 		${3:// event handler}
 	}, function ($2) {
 		${4:// event handler}
-	});${5}
+	});
 snippet html
-	${1:obj}.html('${2:Some text <b>and bold!</b>}')${3}
+	${1:obj}.html('${2:Some text <b>and bold!</b>}')
 snippet inarr
-	$.inArray(${1:value}, ${2:array});
+	$.inArray(${1:value}, ${0:array});
 snippet insa
-	${1:obj}.insertAfter('${2:selector expression}')${3}
+	${1:obj}.insertAfter('${2:selector expression}')
 snippet insb
-	${1:obj}.insertBefore('${2:selector expression}')${3}
+	${1:obj}.insertBefore('${2:selector expression}')
 snippet is
-	${1:obj}.is('${2:selector expression}')${3}
+	${1:obj}.is('${2:selector expression}')
 snippet isarr
-	$.isArray(${1:obj})${2}
+	$.isArray(${1:obj})
 snippet isempty
-	$.isEmptyObject(${1:obj})${2}
+	$.isEmptyObject(${1:obj})
 snippet isfunc
-	$.isFunction(${1:obj})${2}
+	$.isFunction(${1:obj})
 snippet isnum
-	$.isNumeric(${1:value})${2}
+	$.isNumeric(${1:value})
 snippet isobj
-	$.isPlainObject(${1:obj})${2}
+	$.isPlainObject(${1:obj})
 snippet iswin
-	$.isWindow(${1:obj})${2}
+	$.isWindow(${1:obj})
 snippet isxml
-	$.isXMLDoc(${1:node})${2}
+	$.isXMLDoc(${1:node})
 snippet jj
-	$('${1:selector}')${2}
+	$('${1:selector}')
 snippet kdown
 	${1:obj}.keydown(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet kpress
 	${1:obj}.keypress(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet kup
 	${1:obj}.keyup(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet last
-	${1:obj}.last('${1:selector expression}')${3}
+	${1:obj}.last('${1:selector expression}')
 snippet live
 	${1:obj}.live('${2:events}', function (${3:e}) {
-		${4:// event handler}
+		${0:// event handler}
 	});
 snippet load
 	${1:obj}.load(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet loadf
 	${1:obj}.load('${2:mydomain.com/url}',
 		${2:{ param1: value1 },}
 		function (responseText, textStatus, xhr) {
-			${3:// success callback}
+			${0:// success callback}
 		}
 	});
 snippet makearray
-	$.makeArray(${1:obj});
+	$.makeArray(${0:obj});
 snippet map
 	${1:obj}.map(function (${2:index}, ${3:element}) {
-		${4:// callback}
+		${0:// callback}
 	});
 snippet mapp
 	$.map(${1:arrayOrObject}, function (${2:value}, ${3:indexOrKey}) {
-		${4:// callback}
+		${0:// callback}
 	});
 snippet merge
-	$.merge(${1:target}, ${2:original});
+	$.merge(${1:target}, ${0:original});
 snippet mdown
 	${1:obj}.mousedown(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet menter
 	${1:obj}.mouseenter(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet mleave
 	${1:obj}.mouseleave(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet mmove
 	${1:obj}.mousemove(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet mout
 	${1:obj}.mouseout(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet mover
 	${1:obj}.mouseover(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet mup
 	${1:obj}.mouseup(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet next
-	${1:obj}.next('${2:selector expression}')${3}
+	${1:obj}.next('${2:selector expression}')
 snippet nexta
-	${1:obj}.nextAll('${2:selector expression}')${3}
+	${1:obj}.nextAll('${2:selector expression}')
 snippet nextu
-	${1:obj}.nextUntil('${2:selector expression}'${3:, 'filter expression'})${4}
+	${1:obj}.nextUntil('${2:selector expression}'${3:, 'filter expression'})
 snippet not
-	${1:obj}.not('${2:selector expression}')${3}
+	${1:obj}.not('${2:selector expression}')
 snippet off
-	${1:obj}.off('${2:events}', '${3:selector expression}'${4:, handler})${5}
+	${1:obj}.off('${2:events}', '${3:selector expression}'${4:, handler})
 snippet offset
-	${1:obj}.offset()${2}
+	${1:obj}.offset()
 snippet offsetp
-	${1:obj}.offsetParent()${2}
+	${1:obj}.offsetParent()
 snippet on
 	${1:obj}.on('${2:events}', '${3:selector expression}', function (${4:e}) {
-		${5:// event handler}
+		${0:// event handler}
 	});
 snippet one
 	${1:obj}.one('${2:event name}', function (${3:e}) {
-		${4:// event handler}
+		${0:// event handler}
 	});
 snippet outerh
-	${1:obj}.outerHeight()${2}
+	${1:obj}.outerHeight()
 snippet outerw
-	${1:obj}.outerWidth()${2}
+	${1:obj}.outerWidth()
 snippet param
-	$.param(${1:obj})${2}
+	$.param(${1:obj})
 snippet parent
-	${1:obj}.parent('${2:selector expression}')${3}
+	${1:obj}.parent('${2:selector expression}')
 snippet parents
-	${1:obj}.parents('${2:selector expression}')${3}
+	${1:obj}.parents('${2:selector expression}')
 snippet parentsu
-	${1:obj}.parentsUntil('${2:selector expression}'${3:, 'filter expression'})${4}
+	${1:obj}.parentsUntil('${2:selector expression}'${3:, 'filter expression'})
 snippet parsejson
-	$.parseJSON(${1:data})${2}
+	$.parseJSON(${1:data})
 snippet parsexml
-	$.parseXML(${1:data})${2}
+	$.parseXML(${1:data})
 snippet pos
-	${1:obj}.position()${2}
+	${1:obj}.position()
 snippet prepend
-	${1:obj}.prepend('${2:Some text <b>and bold!</b>}')${3}
+	${1:obj}.prepend('${2:Some text <b>and bold!</b>}')
 snippet prependto
-	${1:obj}.prependTo('${2:selector expression}')${3}
+	${1:obj}.prependTo('${2:selector expression}')
 snippet prev
-	${1:obj}.prev('${2:selector expression}')${3}
+	${1:obj}.prev('${2:selector expression}')
 snippet preva
-	${1:obj}.prevAll('${2:selector expression}')${3}
+	${1:obj}.prevAll('${2:selector expression}')
 snippet prevu
-	${1:obj}.prevUntil('${2:selector expression}'${3:, 'filter expression'})${4}
+	${1:obj}.prevUntil('${2:selector expression}'${3:, 'filter expression'})
 snippet promise
-	${1:obj}.promise(${2:'fx'}, ${3:target})${4}
+	${1:obj}.promise(${2:'fx'}, ${3:target})
 snippet prop
-	${1:obj}.prop('${2:property name}')${3}
+	${1:obj}.prop('${2:property name}')
 snippet proxy
-	$.proxy(${1:function}, ${2:this})${3}
+	$.proxy(${1:function}, ${2:this})
 snippet pushstack
-	${1:obj}.pushStack(${2:elements})${3}
+	${1:obj}.pushStack(${2:elements})
 snippet queue
-	${1:obj}.queue(${2:name}${3:, newQueue})${4}
+	${1:obj}.queue(${2:name}${3:, newQueue})
 snippet queuee
-	$.queue(${1:element}${2:, name}${3:, newQueue})${4}
+	$.queue(${1:element}${2:, name}${3:, newQueue})
 snippet ready
 	$(function () {
-		${1}
+		${0}
 	});
 snippet rem
-	${1:obj}.remove()${2}
+	${1:obj}.remove()
 snippet rema
-	${1:obj}.removeAttr('${2:attribute name}')${3}
+	${1:obj}.removeAttr('${2:attribute name}')
 snippet remc
-	${1:obj}.removeClass('${2:class name}')${3}
+	${1:obj}.removeClass('${2:class name}')
 snippet remd
-	${1:obj}.removeData('${2:key name}')${3}
+	${1:obj}.removeData('${2:key name}')
 snippet remdd
-	$.removeData(${1:element}${2:, 'key name}')${3}
+	$.removeData(${1:element}${2:, 'key name}')
 snippet remp
-	${1:obj}.removeProp('${2:property name}')${3}
+	${1:obj}.removeProp('${2:property name}')
 snippet repa
-	${1:obj}.replaceAll(${2:target})${3}
+	${1:obj}.replaceAll(${2:target})
 snippet repw
-	${1:obj}.replaceWith(${2:content})${3}
+	${1:obj}.replaceWith(${2:content})
 snippet reset
 	${1:obj}.reset(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet resize
 	${1:obj}.resize(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet scroll
 	${1:obj}.scroll(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet scrolll
-	${1:obj}.scrollLeft(${2:value})${3}
+	${1:obj}.scrollLeft(${2:value})
 snippet scrollt
-	${1:obj}.scrollTop(${2:value})${3}
+	${1:obj}.scrollTop(${2:value})
 snippet sdown
-	${1:obj}.slideDown('${2:slow/400/fast}')${3}
+	${1:obj}.slideDown('${2:slow/400/fast}')
 snippet sdownc
 	${1:obj}.slideDown('${2:slow/400/fast}', function () {
-		${3:// callback};
+		${0:// callback};
 	});
 snippet select
 	${1:obj}.select(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet serialize
-	${1:obj}.serialize()${2}
+	${1:obj}.serialize()
 snippet serializea
-	${1:obj}.serializeArray()${2}
+	${1:obj}.serializeArray()
 snippet show
-	${1:obj}.show('${2:slow/400/fast}')${3}
+	${1:obj}.show('${2:slow/400/fast}')
 snippet showc
 	${1:obj}.show('${2:slow/400/fast}', function () {
-		${3:// callback}
+		${0:// callback}
 	});
 snippet sib
-	${1:obj}.siblings('${2:selector expression}')${3}
+	${1:obj}.siblings('${2:selector expression}')
 snippet size
-	${1:obj}.size()${2}
+	${1:obj}.size()
 snippet slice
-	${1:obj}.slice(${2:start}${3:, end})${4}
+	${1:obj}.slice(${2:start}${3:, end})
 snippet stoggle
-	${1:obj}.slideToggle('${2:slow/400/fast}')${3}
+	${1:obj}.slideToggle('${2:slow/400/fast}')
 snippet stop
-	${1:obj}.stop('${2:queue}', ${3:false}, ${4:false})${5}
+	${1:obj}.stop('${2:queue}', ${3:false}, ${4:false})
 snippet submit
 	${1:obj}.submit(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet sup
-	${1:obj}.slideUp('${2:slow/400/fast}')${3}
+	${1:obj}.slideUp('${2:slow/400/fast}')
 snippet supc
 	${1:obj}.slideUp('${2:slow/400/fast}', function () {
-		${3:// callback};
+		${0:// callback};
 	});
 snippet text
-	${1:obj}.text(${2:'some text'})${3}
+	${1:obj}.text(${2:'some text'})
 snippet this
-	$(this)${1}
+	$(this)
 snippet toarr
-	${1:obj}.toArray()
+	${0:obj}.toArray()
 snippet tog
 	${1:obj}.toggle(function (${2:e}) {
 		${3:// event handler}
 	}, function ($2) {
 		${4:// event handler}
 	});
-	${4}
+	${0}
 snippet togclass
-	${1:obj}.toggleClass('${2:class name}')${3}
+	${1:obj}.toggleClass('${2:class name}')
 snippet togsh
-	${1:obj}.toggle('${2:slow/400/fast}')${3}
+	${1:obj}.toggle('${2:slow/400/fast}')
 snippet trig
-	${1:obj}.trigger('${2:event name}')${3}
+	${1:obj}.trigger('${2:event name}')
 snippet trigh
-	${1:obj}.triggerHandler('${2:event name}')${3}
+	${1:obj}.triggerHandler('${2:event name}')
 snippet $trim
-	$.trim(${1:str})${2}
+	$.trim(${1:str})
 snippet $type
-	$.type(${1:obj})${2}
+	$.type(${1:obj})
 snippet unbind
-	${1:obj}.unbind('${2:event name}')${3}
+	${1:obj}.unbind('${2:event name}')
 snippet undele
-	${1:obj}.undelegate(${2:selector expression}, ${3:event}, ${4:handler})${5}
+	${1:obj}.undelegate(${2:selector expression}, ${3:event}, ${4:handler})
 snippet uniq
-	$.unique(${1:array})${2}
+	$.unique(${1:array})
 snippet unload
 	${1:obj}.unload(function (${2:e}) {
-		${3:// event handler}
+		${0:// event handler}
 	});
 snippet unwrap
-	${1:obj}.unwrap()${2}
+	${1:obj}.unwrap()
 snippet val
-	${1:obj}.val('${2:text}')${3}
+	${1:obj}.val('${2:text}')
 snippet width
-	${1:obj}.width(${2:integer})${3}
+	${1:obj}.width(${2:integer})
 snippet wrap
-	${1:obj}.wrap('${2:&lt;div class="extra-wrapper"&gt;&lt;/div&gt;}')${3}
+	${1:obj}.wrap('${2:&lt;div class="extra-wrapper"&gt;&lt;/div&gt;}')
diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index fedb943df..0a046dbf6 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -2,45 +2,45 @@
 snippet proto
 	${1:class_name}.prototype.${2:method_name} =
 	function(${3:first_argument}) {
-		${4:// body...}
+		${0:// body...}
 	};
 # Function
 snippet fun
 	function ${1:function_name}(${2:argument}) {
-		${3:// body...}
+		${0:// body...}
 	}
 # Anonymous Function
 snippet f
 	function (${1}) {
-		${3}
+		${0}
 	}${2:;}
 # Immediate function
 snippet (f
 	(function (${1}) {
-		${3}
+		${0}
 	}(${2}));
 # if
 snippet if
 	if (${1:true}) {
-		${2}
+		${0}
 	}
 # if ... else
 snippet ife
 	if (${1:true}) {
 		${2}
 	} else {
-		${3}
+		${0}
 	}
 # tertiary conditional
 snippet ter
-	${1:/* condition */} ? ${2:a} : ${3:b}
+	${1:/* condition */} ? ${2:a} : ${0:b}
 # switch
 snippet switch
 	switch (${1:expression}) {
 		case '${3:case}':
 			${4}
 			break;
-		${5}
+		${0}
 		default:
 			${2}
 	}
@@ -49,85 +49,85 @@ snippet case
 	case '${1:case}':
 		${2}
 		break;
-	${3}
+	${0}
 # for (...) {...}
 snippet for
 	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
-		var ${3:v} = $1[$2];${4:}
+		var ${3:v} = $1[$2];${0:}
 	}
 # for (...) {...} (Improved Native For-Loop)
 snippet forr
 	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2 --) {
-		var ${3:v} = $1[$2];${4:}
+		var ${3:v} = $1[$2];${0:}
 	}
 # while (...) {...}
 snippet wh
 	while (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 # try
 snippet try
 	try {
 		${1}
 	} catch (${2:e}) {
-		${3:/* handle error */}
+		${0:/* handle error */}
 	}
 # do...while
 snippet do
 	do {
-		${2}
+		${0}
 	} while (${1:/* condition */});
 # Object Method
 snippet :f
 	${1:method_name}: function (${2:attribute}) {
-		${4}
+		${0}
 	}${3:,}
 # setTimeout function
 snippet timeout
-	setTimeout(function () {${3}}${2}, ${1:10});
+	setTimeout(function () {${0}}${2}, ${1:10});
 # Get Elements
 snippet get
-	getElementsBy${1:TagName}('${2}')${3}
+	getElementsBy${1:TagName}('${2}')
 # Get Element
 snippet gett
-	getElementBy${1:Id}('${2}')${3}
+	getElementBy${1:Id}('${2}')
 # console.log (Firebug)
 snippet cl
-	console.log(${1});
+	console.log(${0});
 # return
 snippet ret
-	return ${1:result}
+	return ${0:result}
 # for (property in object ) { ... }
 snippet fori
 	for (var ${1:prop} in ${2:Things}) {
-		${3:$2[$1]}
+		${0:$2[$1]}
 	}
 # hasOwnProperty
 snippet has
-	hasOwnProperty(${1})
+	hasOwnProperty(${0})
 # docstring
 snippet /**
 	/**
-	 * ${1:description}
+	 * ${0:description}
 	 *
 	 */
 snippet @par
-	@param {${1:type}} ${2:name} ${3:description}
+	@param {${1:type}} ${2:name} ${0:description}
 snippet @ret
-	@return {${1:type}} ${2:description}
+	@return {${1:type}} ${0:description}
 # JSON.parse
 snippet jsonp
-	JSON.parse(${1:jstr});
+	JSON.parse(${0:jstr});
 # JSON.stringify
 snippet jsons
-	JSON.stringify(${1:object});
+	JSON.stringify(${0:object});
 # self-defining function
 snippet sdf
 	var ${1:function_name} = function (${2:argument}) {
 		${3}
 
 		$1 = function ($2) {
-			${4}
+			${0}
 		};
 	};
 # singleton
@@ -150,7 +150,7 @@ snippet sing
 		// reset the constructor pointer
 		instance.constructor = $1;
 
-		${3}
+		${0}
 
 		return instance;
 	}
@@ -176,7 +176,7 @@ snippet props
 				value        : ${4:value},
 				writeable    : ${5:boolean},
 				enumerable   : ${6:boolean},
-				configurable : ${7:boolean}
+				configurable : ${0:boolean}
 			}
 		}
 	);
@@ -195,6 +195,6 @@ snippet prop
 			value        : ${3:value},
 			writeable    : ${4:boolean},
 			enumerable   : ${5:boolean},
-			configurable : ${6:boolean}
+			configurable : ${0:boolean}
 		}
 	);
diff --git a/snippets/jsp.snippets b/snippets/jsp.snippets
index a5239f5eb..db185b2ad 100644
--- a/snippets/jsp.snippets
+++ b/snippets/jsp.snippets
@@ -10,90 +10,90 @@ snippet jstl:fn
 snippet cpath
 	${pageContext.request.contextPath}
 snippet cout
-	<c:out value="${1}" default="${2}" />
+	<c:out value="${1}" default="${0}" />
 snippet cset
-	<c:set var="${1}" value="${2}" />
+	<c:set var="${1}" value="${0}" />
 snippet cremove
-	<c:remove var="${1}" scope="${2:page}" />
+	<c:remove var="${1}" scope="${0:page}" />
 snippet ccatch
-	<c:catch var="${1}" />
+	<c:catch var="${0}" />
 snippet cif
 	<c:if test="${${1}}">
-		${2}
+		${0}
 	</c:if>
 snippet cchoose
 	<c:choose>
-		${1}
+		${0}
 	</c:choose>
 snippet cwhen
 	<c:when test="${${1}}">
-		${2}
+		${0}
 	</c:when>
 snippet cother
 	<c:otherwise>
-		${1}
+		${0}
 	</c:otherwise>
 snippet cfore
 	<c:forEach items="${${1}}" var="${2}" varStatus="${3}">
-		${4:<c:out value="$2" />}
+		${0:<c:out value="$2" />}
 	</c:forEach>
 snippet cfort
 	<c:set var="${1}">${2:item1,item2,item3}</c:set>
 	<c:forTokens var="${3}" items="${$1}" delims="${4:,}">
-		${5:<c:out value="$3" />}
+		${0:<c:out value="$3" />}
 	</c:forTokens>
 snippet cparam
-	<c:param name="${1}" value="${2}" />
+	<c:param name="${1}" value="${0}" />
 snippet cparam+
 	<c:param name="${1}" value="${2}" />
-	cparam+${3}
+	cparam+${0}
 snippet cimport
 	<c:import url="${1}" />
 snippet cimport+
 	<c:import url="${1}">
 		<c:param name="${2}" value="${3}" />
-		cparam+${4}
+		cparam+${0}
 	</c:import>
 snippet curl
 	<c:url value="${1}" var="${2}" />
-	<a href="${$2}">${3}</a>
+	<a href="${$2}">${0}</a>
 snippet curl+
 	<c:url value="${1}" var="${2}">
 		<c:param name="${4}" value="${5}" />
-		cparam+${6}
+		cparam+${0}
 	</c:url>
 	<a href="${$2}">${3}</a>
 snippet credirect
-	<c:redirect url="${1}" />
+	<c:redirect url="${0}" />
 snippet contains
-	${fn:contains(${1:string}, ${2:substr})}
+	${fn:contains(${1:string}, ${0:substr})}
 snippet contains:i
-	${fn:containsIgnoreCase(${1:string}, ${2:substr})}
+	${fn:containsIgnoreCase(${1:string}, ${0:substr})}
 snippet endswith
-	${fn:endsWith(${1:string}, ${2:suffix})}
+	${fn:endsWith(${1:string}, ${0:suffix})}
 snippet escape
-	${fn:escapeXml(${1:string})}
+	${fn:escapeXml(${0:string})}
 snippet indexof
-	${fn:indexOf(${1:string}, ${2:substr})}
+	${fn:indexOf(${1:string}, ${0:substr})}
 snippet join
-	${fn:join(${1:collection}, ${2:delims})}
+	${fn:join(${1:collection}, ${0:delims})}
 snippet length
-	${fn:length(${1:collection_or_string})}
+	${fn:length(${0:collection_or_string})}
 snippet replace
-	${fn:replace(${1:string}, ${2:substr}, ${3:replace})}
+	${fn:replace(${1:string}, ${2:substr}, ${0:replace})}
 snippet split
-	${fn:split(${1:string}, ${2:delims})}
+	${fn:split(${1:string}, ${0:delims})}
 snippet startswith
-	${fn:startsWith(${1:string}, ${2:prefix})}
+	${fn:startsWith(${1:string}, ${0:prefix})}
 snippet substr
-	${fn:substring(${1:string}, ${2:begin}, ${3:end})}
+	${fn:substring(${1:string}, ${2:begin}, ${0:end})}
 snippet substr:a
-	${fn:substringAfter(${1:string}, ${2:substr})}
+	${fn:substringAfter(${1:string}, ${0:substr})}
 snippet substr:b
-	${fn:substringBefore(${1:string}, ${2:substr})}
+	${fn:substringBefore(${1:string}, ${0:substr})}
 snippet lc
-	${fn:toLowerCase(${1:string})}
+	${fn:toLowerCase(${0:string})}
 snippet uc
-	${fn:toUpperCase(${1:string})}
+	${fn:toUpperCase(${0:string})}
 snippet trim
-	${fn:trim(${1:string})}
+	${fn:trim(${0:string})}
diff --git a/snippets/ledger.snippets b/snippets/ledger.snippets
index 293d4b65c..b401f6166 100644
--- a/snippets/ledger.snippets
+++ b/snippets/ledger.snippets
@@ -2,4 +2,4 @@
 snippet ent
 	`strftime("%Y/%m/%d")` ${1:transaction}
 	    ${2:account}    ${3:value}
-	    ${4:account}
+	    ${0:account}
diff --git a/snippets/lua.snippets b/snippets/lua.snippets
index 34ae25eb6..b7de2deb3 100644
--- a/snippets/lua.snippets
+++ b/snippets/lua.snippets
@@ -2,20 +2,20 @@ snippet #!
 	#!/usr/bin/env lua
 	$1
 snippet local
-	local ${1:x} = ${2:1}
+	local ${1:x} = ${0:1}
 snippet fun
 	function ${1:fname}(${2:...})
-		${3:-- body}
+		${0:-- body}
 	end
 snippet for
 	for ${1:i}=${2:1},${3:10} do
-		${4:print(i)}
+		${0:print(i)}
 	end
 snippet forp
 	for ${1:i},${2:v} in pairs(${3:table_name}) do
-	   ${4:-- body}
+	   ${0:-- body}
 	end
 snippet fori
 	for ${1:i},${2:v} in ipairs(${3:table_name}) do
-	   ${4:-- body}
+	   ${0:-- body}
 	end
diff --git a/snippets/make.snippets b/snippets/make.snippets
index ba8e2b292..121e6238c 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -1,4 +1,4 @@
 snippet ifeq
 	ifeq (${1:cond0},${2:cond1})
-		${3}
+		${0}
 	endif
diff --git a/snippets/mako.snippets b/snippets/mako.snippets
index 0f64187fc..2264eac62 100644
--- a/snippets/mako.snippets
+++ b/snippets/mako.snippets
@@ -1,54 +1,54 @@
 snippet def
 	<%def name="${1:name}">
-		${2:}
+		${0:}
 	</%def>
 snippet call
 	<%call expr="${1:name}">
-		${2:}
+		${0:}
 	</%call>
 snippet doc
 	<%doc>
-		${1:}
+		${0:}
 	</%doc>
 snippet text
 	<%text>
-		${1:}
+		${0:}
 	</%text>
 snippet for
 	% for ${1:i} in ${2:iter}:
-		${3:}
+		${0:}
 	% endfor
 snippet if if
 	% if ${1:condition}:
-		${2:}
+		${0:}
 	% endif
 snippet ife if/else
 	% if ${1:condition}:
 		${2:}
 	% else:
-		${3:}
+		${0:}
 	% endif
 snippet try
 	% try:
 		${1:}
 	% except${2:}:
-		${3:pass}
+		${0:pass}
 	% endtry
 snippet wh
 	% while ${1:}:
-		${2:}
+		${0:}
 	% endwhile
 snippet $
-	${ ${1:} }
+	${ ${0:} }
 snippet <%
-	<% ${1:} %>
+	<% ${0:} %>
 snippet <!%
-	<!% ${1:} %>
+	<!% ${0:} %>
 snippet inherit
-	<%inherit file="${1:filename}" />
+	<%inherit file="${0:filename}" />
 snippet include
-	<%include file="${1:filename}" />
+	<%include file="${0:filename}" />
 snippet namespace
-	<%namespace file="${1:name}" />
+	<%namespace file="${0:name}" />
 snippet page
-	<%page args="${1:}" />
+	<%page args="${0:}" />
diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index bfbff2553..fd2f29718 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -3,85 +3,85 @@
 # Includes octopress (http://octopress.org/) snippets
 
 snippet [
-	[${1:text}](http://${2:address} "${3:title}")
+	[${1:text}](http://${2:address} "${0:title}")
 snippet [*
-	[${1:link}](${2:`@*`} "${3:title}")${4}
+	[${1:link}](${2:`@*`} "${3:title}")
 
 snippet [:
-	[${1:id}]: http://${2:url} "${3:title}"
+	[${1:id}]: http://${2:url} "${0:title}"
 snippet [:*
-	[${1:id}]: ${2:`@*`} "${3:title}"
+	[${1:id}]: ${2:`@*`} "${0:title}"
 
 snippet ![
-	![${1:alttext}](${2:/images/image.jpg} "${3:title}")
+	![${1:alttext}](${2:/images/image.jpg} "${0:title}")
 snippet ![*
-	![${1:alt}](${2:`@*`} "${3:title}")${4}
+	![${1:alt}](${2:`@*`} "${3:title}")
 
 snippet ![:
-	![${1:id}]: ${2:url} "${3:title}"
+	![${1:id}]: ${2:url} "${0:title}"
 snippet ![:*
-	![${1:id}]: ${2:`@*`} "${3:title}"
+	![${1:id}]: ${2:`@*`} "${0:title}"
 
 snippet ===
 	`repeat('=', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
-	${1}
+	${0}
 snippet ---
 	`repeat('-', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
-	${1}
+	${0}
 
 snippet blockquote
 	{% blockquote %}
-	${1:quote}
+	${0:quote}
 	{% endblockquote %}
 
 snippet blockquote-author
 	{% blockquote ${1:author}, ${2:title} %}
-	${3:quote}
+	${0:quote}
 	{% endblockquote %}
 
 snippet blockquote-link
 	{% blockquote ${1:author} ${2:URL} ${3:link_text} %}
-	${4:quote}
+	${0:quote}
 	{% endblockquote %}
 
 snippet bt-codeblock-short
 	```
-	${1:code_snippet}
+	${0:code_snippet}
 	```
 
 snippet bt-codeblock-full
 	``` ${1:language} ${2:title} ${3:URL} ${4:link_text}
-	${5:code_snippet}
+	${0:code_snippet}
 	```
 
 snippet codeblock-short
 	{% codeblock %}
-	${1:code_snippet}
+	${0:code_snippet}
 	{% endcodeblock %}
 
 snippet codeblock-full
 	{% codeblock ${1:title} lang:${2:language} ${3:URL} ${4:link_text} %}
-	${5:code_snippet}
+	${0:code_snippet}
 	{% endcodeblock %}
 
 snippet gist-full
-	{% gist ${1:gist_id} ${2:filename} %}
+	{% gist ${1:gist_id} ${0:filename} %}
 
 snippet gist-short
-	{% gist ${1:gist_id} %}
+	{% gist ${0:gist_id} %}
 
 snippet img
-	{% img ${1:class} ${2:URL} ${3:width} ${4:height} ${5:title_text} ${6:alt_text} %}
+	{% img ${1:class} ${2:URL} ${3:width} ${4:height} ${5:title_text} ${0:alt_text} %}
 
 snippet youtube
-	{% youtube ${1:video_id} %}
+	{% youtube ${0:video_id} %}
 
 # The quote should appear only once in the text. It is inherently part of it.
 # See http://octopress.org/docs/plugins/pullquote/ for more info.
 
 snippet pullquote
 	{% pullquote %}
-	${1:text} {" ${2:quote} "} ${3:text}
+	${1:text} {" ${2:quote} "} ${0:text}
 	{% endpullquote %}
diff --git a/snippets/objc.snippets b/snippets/objc.snippets
index c819c776a..24cfb972c 100644
--- a/snippets/objc.snippets
+++ b/snippets/objc.snippets
@@ -1,21 +1,21 @@
 # #import <...>
 snippet Imp
-	#import <${1:Cocoa/Cocoa.h}>${2}
+	#import <${1:Cocoa/Cocoa.h}>
 # #import "..."
 snippet imp
-	#import "${1:`vim_snippets#Filename()`.h}"${2}
+	#import "${1:`vim_snippets#Filename()`.h}"
 # @selector(...)
 snippet sel
-	@selector(${1:method}:)${3}
+	@selector(${1:method}:)
 # @"..." string
 snippet s
-	@"${1}"${2}
+	@"${1}"
 # Object
 snippet o
-	${1:NSObject} *${2:foo} = [${3:$1 alloc}]${4};${5}
+	${1:NSObject} *${2:foo} = [${3:$1 alloc}]${4};
 # NSLog(...)
 snippet log
-	NSLog(@"${1:%@}"${2});${3}
+	NSLog(@"${1:%@}"${2});
 # Class
 snippet objc
 	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
@@ -24,45 +24,45 @@ snippet objc
 	@end
 
 	@implementation $1
-	${3}
+	${0}
 	@end
 # Class Interface
 snippet int
 	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
 	{${3}
 	}
-	${4}
+	${0}
 	@end
 snippet @interface
 	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
 	{${3}
 	}
-	${4}
+	${0}
 	@end
 # Class Implementation
 snippet impl
 	@implementation ${1:`vim_snippets#Filename('', 'someClass')`}
-	${2}
+	${0}
 	@end
 snippet @implementation
 	@implementation ${1:`vim_snippets#Filename('', 'someClass')`}
-	${2}
+	${0}
 	@end
 # Protocol
 snippet pro
 	@protocol ${1:`vim_snippets#Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
-	${3}
+	${0}
 	@end
 snippet @protocol
 	@protocol ${1:`vim_snippets#Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
-	${3}
+	${0}
 	@end
 # init Definition
 snippet init
 	- (id)init
 	{
 		if (self = [super init]) {
-			${1}
+			${0}
 		}
 		return self;
 	}
@@ -70,61 +70,61 @@ snippet init
 snippet dealloc
 	- (void) dealloc
 	{
-		${1:deallocations}
+		${0:deallocations}
 		[super dealloc];
 	}
 snippet su
-	[super ${1:init}]${2}
+	[super ${1:init}]
 snippet ibo
-	IBOutlet ${1:NSSomeClass} *${2:$1};${3}
+	IBOutlet ${1:NSSomeClass} *${2:$1};
 # Category
 snippet cat
 	@interface ${1:NSObject} (${2:MyCategory})
 	@end
 
 	@implementation $1 ($2)
-	${3}
+	${0}
 	@end
 # Category Interface
 snippet cath
 	@interface ${1:`vim_snippets#Filename('$1', 'NSObject')`} (${2:MyCategory})
-	${3}
+	${0}
 	@end
 # Method
 snippet m
 	- (${1:id})${2:method}
 	{
-		${3}
+		${0}
 	}
 # Method declaration
 snippet md
-	- (${1:id})${2:method};${3}
+	- (${1:id})${2:method};
 # IBAction declaration
 snippet ibad
-	- (IBAction)${1:method}:(${2:id})sender;${3}
+	- (IBAction)${1:method}:(${2:id})sender;
 # IBAction method
 snippet iba
 	- (IBAction)${1:method}:(${2:id})sender
 	{
-		${3}
+		${0}
 	}
 # awakeFromNib method
 snippet wake
 	- (void)awakeFromNib
 	{
-		${1}
+		${0}
 	}
 # Class Method
 snippet M
 	+ (${1:id})${2:method}
 	{
-		${3:return nil;}
+		${0:return nil;}
 	}
 # Sub-method (Call super)
 snippet sm
 	- (${1:id})${2:method}
 	{
-		[super $2];${3}
+		[super $2];${0}
 		return self;
 	}
 # Accessor Methods For:
@@ -140,29 +140,29 @@ snippet objacc
 		[$3 retain];
 		[$2 release];
 		$2 = $3;
-	}${4}
+	}
 # for (object in array)
 snippet forin
 	for (${1:Class} *${2:some$1} in ${3:array}) {
-		${4}
+		${0}
 	}
 snippet fore
 	for (${1:object} in ${2:array}) {
-		${3:statements}
+		${0:statements}
 	}
 snippet forarray
 	unsigned int ${1:object}Count = [${2:array} count];
 
 	for (unsigned int index = 0; index < $1Count; index++) {
 		${3:id} $1 = [$2 $1AtIndex:index];
-		${4}
+		${0}
 	}
 snippet fora
 	unsigned int ${1:object}Count = [${2:array} count];
 
 	for (unsigned int index = 0; index < $1Count; index++) {
 		${3:id} $1 = [$2 $1AtIndex:index];
-		${4}
+		${0}
 	}
 # Try / Catch Block
 snippet	@try
@@ -173,75 +173,75 @@ snippet	@try
 		${2:handler}
 	}
 	@finally {
-		${3:statements}
+		${0:statements}
 	}
 snippet @catch
 	@catch (${1:exception}) {
-		${2:handler}
+		${0:handler}
 	}
 snippet @finally
 	@finally {
-		${1:statements}
+		${0:statements}
 	}
 # IBOutlet
 # @property (Objective-C 2.0)
 snippet prop
-	@property (${1:retain}) ${2:NSSomeClass} ${3:*$2};${4}
+	@property (${1:retain}) ${2:NSSomeClass} ${3:*$2};
 # @synthesize (Objective-C 2.0)
 snippet syn
-	@synthesize ${1:property};${2}
+	@synthesize ${1:property};
 # [[ alloc] init]
 snippet alloc
-	[[${1:foo} alloc] init${2}];${3}
+	[[${1:foo} alloc] init${2}];
 snippet a
-	[[${1:foo} alloc] init${2}];${3}
+	[[${1:foo} alloc] init${2}];
 # retain
 snippet ret
-	[${1:foo} retain];${2}
+	[${1:foo} retain];
 # release
 snippet rel
-	[${1:foo} release];
+	[${0:foo} release];
 # autorelease
 snippet arel
-	[${1:foo} autorelease];
+	[${0:foo} autorelease];
 # autorelease pool
 snippet pool
 	NSAutoreleasePool *${1:pool} = [[NSAutoreleasePool alloc] init];
-	${2}
+	${0}
 	[$1 drain];
 # Throw an exception
 snippet except
 	NSException *${1:badness};
 	$1 = [NSException exceptionWithName:@"${2:$1Name}"
-	                             reason:@"${3}"
+	                             reason:@"${0}"
 	                           userInfo:nil];
 	[$1 raise];
 snippet prag
-	#pragma mark ${1:-}
+	#pragma mark ${0:-}
 snippet cl
-	@class ${1:Foo};${2}
+	@class ${1:Foo};
 snippet color
-	[[NSColor ${1:blackColor}] set];
+	[[NSColor ${0:blackColor}] set];
 # NSArray
 snippet array
-	NSMutableArray *${1:array} = [NSMutable array];${2}
+	NSMutableArray *${1:array} = [NSMutable array];
 snippet nsa
-	NSArray ${1}
+	NSArray ${0}
 snippet nsma
-	NSMutableArray ${1}
+	NSMutableArray ${0}
 snippet aa
-	NSArray * array;${1}
+	NSArray * array;
 snippet ma
-	NSMutableArray * array;${1}
+	NSMutableArray * array;
 # NSDictionary
 snippet dict
-	NSMutableDictionary *${1:dict} = [NSMutableDictionary dictionary];${2}
+	NSMutableDictionary *${1:dict} = [NSMutableDictionary dictionary];
 snippet nsd
-	NSDictionary ${1}
+	NSDictionary ${0}
 snippet nsmd
-	NSMutableDictionary ${1}
+	NSMutableDictionary ${0}
 # NSString
 snippet nss
-	NSString ${1}
+	NSString ${0}
 snippet nsms
-	NSMutableString ${1}
+	NSMutableString ${0}
diff --git a/snippets/openfoam.snippets b/snippets/openfoam.snippets
index ff690cca2..950cbda2a 100644
--- a/snippets/openfoam.snippets
+++ b/snippets/openfoam.snippets
@@ -1,7 +1,7 @@
 # 0/*
 snippet fv
 	type		fixedValue;
-	value		uniform ${1};
+	value		uniform ${0};
 snippet zg
 	type		zeroGradient;
 snippet sym
@@ -17,7 +17,7 @@ snippet forces
 		outputInterval		${2:1};
 		patches				(${3});
 		log					${4:true};
-		CofR				(${5:0 0 0});
+		CofR				(${0:0 0 0});
 	}
 # system/fvSolution
 # solvers
@@ -26,7 +26,7 @@ snippet gamg
 	{
 		solver          GAMG;
 		tolerance       1e-${2:6};
-		relTol          ${3:0.0};
+		relTol          ${0:0.0};
 		smoother        GaussSeidel;
 		cacheAgglomeration true;
 		nCellsInCoarsestLevel 10;
@@ -39,7 +39,7 @@ snippet pbicg
 		solver          PBiCG;
 		preconditioner  DILU;
 		tolerance       1e-${2:6};
-		relTol          ${3:0.0};
+		relTol          ${0:0.0};
 	}
 # PIMPLE
 snippet pimple
@@ -49,5 +49,5 @@ snippet pimple
 		nCorrectors     	${2:inner};
 		nNonOrthogonalCorrectors ${3:nonOrtho};
 		pRefCell        	${4:cell};
-		pRefValue       	${5:value for $4};
+		pRefValue       	${0:value for $4};
 	}
diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index 48d3f2266..ea4142712 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -8,12 +8,12 @@ snippet .
 # Function
 snippet sub
 	sub ${1:function_name} {
-		${2}
+		${0}
 	}
 # Conditional
 snippet if
 	if (${1}) {
-		${2}
+		${0}
 	}
 # Conditional if..else
 snippet ife
@@ -21,7 +21,7 @@ snippet ife
 		${2}
 	}
 	else {
-		${3}
+		${0}
 	}
 # Conditional if..elsif..else
 snippet ifee
@@ -32,23 +32,23 @@ snippet ifee
 		${4:# elsif...}
 	}
 	else {
-		${5}
+		${0}
 	}
 snippet eif
 	elsif (${1}) {
-		${2}
+		${0}
 	}
 # Conditional One-line
 snippet xif
-	${1:expression} if ${2:condition};${3}
+	${1:expression} if ${2:condition};
 # Unless conditional
 snippet unless
 	unless (${1}) {
-		${2}
+		${0}
 	}
 # Unless conditional One-line
 snippet xunless
-	${1:expression} unless ${2:condition};${3}
+	${1:expression} unless ${2:condition};
 # Try/Except
 snippet eval
 	local $@;
@@ -56,37 +56,37 @@ snippet eval
 		${1:# do something risky...}
 	};
 	if (my $e = $@) {
-		${2:# handle failure...}
+		${0:# handle failure...}
 	}
 # While Loop
 snippet wh
 	while (${1}) {
-		${2}
+		${0}
 	}
 # While Loop One-line
 snippet xwh
-	${1:expression} while ${2:condition};${3}
+	${1:expression} while ${2:condition};
 # C-style For Loop
 snippet cfor
 	for (my $${2:var} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4}
+		${0}
 	}
 # For loop one-line
 snippet xfor
-	${1:expression} for @${2:array};${3}
+	${1:expression} for @${2:array};
 # Foreach Loop
 snippet for
 	foreach my $${1:x} (@${2:array}) {
-		${3}
+		${0}
 	}
 # Foreach Loop One-line
 snippet fore
-	${1:expression} foreach @${2:array};${3}
+	${1:expression} foreach @${2:array};
 # Package
 snippet package
 	package ${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`};
 
-	${2}
+	${0}
 
 	1;
 
@@ -95,7 +95,7 @@ snippet package
 snippet packagev514
 	package ${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`} ${2:0.99};
 
-	${3}
+	${0}
 
 	1;
 
@@ -106,14 +106,14 @@ snippet moose
 	use namespace::autoclean;
 	${1:#}BEGIN {extends '${2:ParentClass}'};
 
-	${3}
+	${0}
 # parent
 snippet parent
-	use parent qw(${1:Parent Class});
+	use parent qw(${0:Parent Class});
 # Read File
 snippet slurp
 	my $${1:var} = do { local $/; open my $file, '<', "${2:file}"; <$file> };
-	${3}
+	${0}
 # strict warnings
 snippet strwar
 	use strict;
@@ -121,7 +121,7 @@ snippet strwar
 # older versioning with perlcritic bypass
 snippet vers
 	## no critic
-	our $VERSION = '${1:version}';
+	our $VERSION = '${0:version}';
 	eval $VERSION;
 	## use critic
 # new 'switch' like feature
@@ -131,7 +131,7 @@ snippet switch
 # Anonymous subroutine
 snippet asub
 	sub {
-		${1}
+		${0}
 	}
 
 
@@ -139,56 +139,56 @@ snippet asub
 # Begin block
 snippet begin
 	BEGIN {
-		${1}
+		${0}
 	}
 
 # call package function with some parameter
 snippet pkgmv
-	__PACKAGE__->${1:package_method}(${2:var})
+	__PACKAGE__->${1:package_method}(${0:var})
 
 # call package function without a parameter
 snippet pkgm
-	__PACKAGE__->${1:package_method}()
+	__PACKAGE__->${0:package_method}()
 
 # call package "get_" function without a parameter
 snippet pkget
-	__PACKAGE__->get_${1:package_method}()
+	__PACKAGE__->get_${0:package_method}()
 
 # call package function with a parameter
 snippet pkgetv
-	__PACKAGE__->get_${1:package_method}(${2:var})
+	__PACKAGE__->get_${1:package_method}(${0:var})
 
 # complex regex
 snippet qrx
 	qr/
-	     ${1:regex}
+	     ${0:regex}
 	/xms
 
 #simpler regex
 snippet qr/
-	qr/${1:regex}/x
+	qr/${0:regex}/x
 
 #given
 snippet given
 	given ($${1:var}) {
 		${2:# cases}
-		${3:# default}
+		${0:# default}
 	}
 
 # switch-like case
 snippet when
 	when (${1:case}) {
-		${2}
+		${0}
 	}
 
 # hash slice
 snippet hslice
-	@{ ${1:hash}  }{ ${2:array} }
+	@{ ${1:hash}  }{ ${0:array} }
 
 
 # map
 snippet map
-	map {  ${2: body }    }  ${1: @array } ;
+	map {  ${0: body }    }  ${1: @array } ;
 
 
 
@@ -206,7 +206,7 @@ snippet ppod
 
 	=head1 DESCRIPTION
 
-	${4:# longer description...}
+	${0:# longer description...}
 
 
 	=head1 INTERFACE
@@ -222,13 +222,13 @@ snippet ppod
 snippet psub
 	=head2 ${1:MethodName}
 
-	${2:Summary....}
+	${0:Summary....}
 
 # Heading for inline subroutine pod
 snippet psubi
 	=head2 ${1:MethodName}
 
-	${2:Summary...}
+	${0:Summary...}
 
 
 	=cut
@@ -241,7 +241,7 @@ snippet subpod
 	=cut
 
 	sub ${1:subroutine_name} {
-		${2}
+		${0}
 	}
 # Subroutine signature
 snippet parg
@@ -269,7 +269,7 @@ snippet parg
 
 
 	=item
-	C<${3:...return data}>
+	C<${0:...return data}>
 
 
 	=back
@@ -287,7 +287,7 @@ snippet has
 		default => sub {
 			${4:defaultvalue}
 		},
-		${5:# other attributes}
+		${0:# other attributes}
 	);
 
 
@@ -295,7 +295,7 @@ snippet has
 snippet override
 	override ${1:attribute} => sub {
 		${2:# my $self = shift;};
-		${3:# my ($self, $args) = @_;};
+		${0:# my ($self, $args) = @_;};
 	};
 
 
@@ -311,18 +311,18 @@ snippet tlib
 
 #test methods
 snippet tmeths
-	$ENV{TEST_METHOD} = '${1:regex}';
+	$ENV{TEST_METHOD} = '${0:regex}';
 
 # runtestclass
 snippet trunner
-	use ${1:test_class};
+	use ${0:test_class};
 	$1->runtests();
 
 # Test::Class-style test
 snippet tsub
 	sub t${1:number}_${2:test_case} :Test(${3:num_of_tests}) {
 		my $self = shift;
-		${4}
+		${0}
 
 	}
 
@@ -330,14 +330,14 @@ snippet tsub
 snippet trsub
 	test ${1:test_name} => { description => '${2:Description of test.}'} => sub {
 		my ($self) = @_;
-		${3}
+		${0}
 	};
 
 #prep test method
 snippet tprep
 	sub prep${1:number}_${2:test_case} :Test(startup) {
 		my $self = shift;
-		${4}
+		${0}
 	}
 
 # cause failures to print stack trace
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 29b1b45f1..5af980112 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -1,54 +1,54 @@
 snippet <?
 	<?php
 
-	${1}
+	${0}
 snippet ec
-	echo ${1};
+	echo ${0};
 snippet <?e
-	<?php echo ${1} ?>
+	<?php echo ${0} ?>
 # this one is for php5.4
 snippet <?=
-	<?=${1}?>
+	<?=${0}?>
 snippet ?=
-	<?= ${1} ?>
+	<?= ${0} ?>
 snippet ?
-	<?php ${1} ?>
+	<?php ${0} ?>
 snippet ?f
 	<?php foreach ($${1:vars} as $${2:$var}): ?>
-		${3}
+		${0}
 	<?php endforeach ?>
 snippet ?i
 	<?php if ($${1:var}): ?>
-		${2}
+		${0}
 	<?php endif ?>
 snippet ns
 	namespace ${1:Foo\Bar\Baz};
-	${2}
+	${0}
 snippet use
 	use ${1:Foo\Bar\Baz};
-	${2}
+	${0}
 snippet	c
 	class ${1:`vim_snippets#Filename()`}
 	{
-		${2}
+		${0}
 	}
 snippet i
 	interface ${1:`vim_snippets#Filename()`}
 	{
-		${2}
+		${0}
 	}
 snippet t.
-	$this->${1}
+	$this->
 snippet f
 	function ${1:foo}(${2:array }${3:$bar})
 	{
-		${4}
+		${0}
 	}
 # method
 snippet m
 	${1:protected} function ${2:foo}()
 	{
-		${3}
+		${0}
 	}
 # setter method
 snippet sm
@@ -63,7 +63,7 @@ snippet sm
 	{
 		$this->${8:$1} = $$1;
 		return $this;
-	}${9}
+	}
 # getter method
 snippet gm
 	/**
@@ -74,50 +74,50 @@ snippet gm
 	${3:public} function get${4:$2}()
 	{
 		return $this->${5:$1};
-	}${6}
+	}
 #setter
 snippet $s
-	${1:$foo}->set${2:Bar}(${3});
+	${1:$foo}->set${2:Bar}(${0});
 #getter
 snippet $g
-	${1:$foo}->get${2:Bar}();
+	${1:$foo}->get${0:Bar}();
 
 # Tertiary conditional
 snippet =?:
-	$${1:foo} = ${2:true} ? ${3:a} : ${4};
+	$${1:foo} = ${2:true} ? ${3:a} : ${0};
 snippet ?:
-	${1:true} ? ${2:a} : ${3}
+	${1:true} ? ${2:a} : ${0}
 
 snippet C
-	$_COOKIE['${1:variable}']${2}
+	$_COOKIE['${1:variable}']
 snippet E
-	$_ENV['${1:variable}']${2}
+	$_ENV['${1:variable}']
 snippet F
-	$_FILES['${1:variable}']${2}
+	$_FILES['${1:variable}']
 snippet G
-	$_GET['${1:variable}']${2}
+	$_GET['${1:variable}']
 snippet P
-	$_POST['${1:variable}']${2}
+	$_POST['${1:variable}']
 snippet R
-	$_REQUEST['${1:variable}']${2}
+	$_REQUEST['${1:variable}']
 snippet S
-	$_SERVER['${1:variable}']${2}
+	$_SERVER['${1:variable}']
 snippet SS
-	$_SESSION['${1:variable}']${2}
+	$_SESSION['${1:variable}']
 
 # the following are old ones
 snippet inc
-	include '${1:file}';${2}
+	include '${1:file}';
 snippet inc1
-	include_once '${1:file}';${2}
+	include_once '${1:file}';
 snippet req
-	require '${1:file}';${2}
+	require '${1:file}';
 snippet req1
-	require_once '${1:file}';${2}
+	require_once '${1:file}';
 # Start Docblock
 snippet /*
 	/**
-	 * ${1}
+	 * ${0}
 	 */
 # Class - post doc
 snippet doc_cp
@@ -127,14 +127,14 @@ snippet doc_cp
 	 * @package ${2:default}
 	 * @subpackage ${3:default}
 	 * @author ${4:`g:snips_author`}
-	 */${5}
+	 */
 # Class Variable - post doc
 snippet doc_vp
 	/**
 	 * ${1:undocumented class variable}
 	 *
 	 * @var ${2:string}
-	 */${3}
+	 */
 # Class Variable
 snippet doc_v
 	/**
@@ -142,7 +142,7 @@ snippet doc_v
 	 *
 	 * @var ${4:string}
 	 */
-	${1:var} $${2};${5}
+	${1:var} $${2};
 # Class
 snippet doc_c
 	/**
@@ -154,19 +154,19 @@ snippet doc_c
 	 */
 	${1:}class ${2:}
 	{
-		${7}
+		${0}
 	} // END $1class $2
 # Constant Definition - post doc
 snippet doc_dp
 	/**
 	 * ${1:undocumented constant}
-	 */${2}
+	 */
 # Constant Definition
 snippet doc_d
 	/**
 	 * ${3:undocumented constant}
 	 */
-	define(${1}, ${2});${4}
+	define(${1}, ${2});
 # Function - post doc
 snippet doc_fp
 	/**
@@ -174,7 +174,7 @@ snippet doc_fp
 	 *
 	 * @return ${2:void}
 	 * @author ${3:`g:snips_author`}
-	 */${4}
+	 */
 # Function signature
 snippet doc_s
 	/**
@@ -183,7 +183,7 @@ snippet doc_s
 	 * @return ${5:void}
 	 * @author ${6:`g:snips_author`}
 	 */
-	${1}function ${2}(${3});${7}
+	${1}function ${2}(${3});
 # Function
 snippet doc_f
 	/**
@@ -193,7 +193,7 @@ snippet doc_f
 	 * @author ${6:`g:snips_author`}
 	 */
 	${1}function ${2}(${3})
-	{${7}
+	{${0}
 	}
 # Header
 snippet doc_h
@@ -203,7 +203,7 @@ snippet doc_h
 	 * @author ${2:`g:snips_author`}
 	 * @version ${3:$Id$}
 	 * @copyright ${4:$2}, `strftime('%d %B, %Y')`
-	 * @package ${5:default}
+	 * @package ${0:default}
 	 */
 
 # Interface
@@ -216,7 +216,7 @@ snippet interface
 	 */
 	interface ${1:`vim_snippets#Filename()`}
 	{
-		${5}
+		${0}
 	}
 # class ...
 snippet class
@@ -231,7 +231,7 @@ snippet class
 		 */
 		${5:public} function ${6:__construct}(${7:argument})
 		{
-			${8}
+			${0}
 		}
 	}
 snippet nc
@@ -239,30 +239,30 @@ snippet nc
 
 	${2:abstract }class ${3:`vim_snippets#Filename()`}
 	{
-		${4}
+		${0}
 	}
 # define(...)
 snippet def
-	define('${1}'${2});${3}
+	define('${1}'${2});
 # defined(...)
 snippet def?
-	${1}defined('${2}')${3}
+	${1}defined('${2}')
 snippet wh
 	while (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 # do ... while
 snippet do
 	do {
-		${2}
+		${0}
 	} while (${1:/* condition */});
 snippet if
 	if (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 snippet ifil
 	<?php if (${1:/* condition */}): ?>
-		${2}
+		${0}
 	<?php endif; ?>
 snippet ife
 	if (${1:/* condition */}) {
@@ -270,28 +270,28 @@ snippet ife
 	} else {
 		${3}
 	}
-	${4}
+	${0}
 snippet ifeil
 	<?php if (${1:/* condition */}): ?>
 		${2:<!-- html... -->}
 	<?php else: ?>
 		${3:<!-- html... -->}
 	<?php endif; ?>
-	${4}
+	${0}
 snippet el
 	else {
-		${1}
+		${0}
 	}
 snippet eif
 	elseif (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 snippet switch
 	switch ($${1:variable}) {
 		case '${2:value}':
 			${3}
 			break;
-		${5}
+		${0}
 		default:
 			${4}
 			break;
@@ -299,52 +299,52 @@ snippet switch
 snippet case
 	case '${1:value}':
 		${2}
-		break;${3}
+		break;
 snippet for
 	for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4}
+		${0}
 	}
 snippet foreach
 	foreach ($${1:variable} as $${2:value}) {
-		${3}
+		${0}
 	}
 snippet foreachil
 	<?php foreach ($${1:variable} as $${2:value}): ?>
-		${3:<!-- html... -->}
+		${0:<!-- html... -->}
 	<?php endforeach; ?>
 snippet foreachk
 	foreach ($${1:variable} as $${2:key} => $${3:value}) {
-		${4}
+		${0}
 	}
 snippet foreachkil
 	<?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
-		${4:<!-- html... -->}
+		${0:<!-- html... -->}
 	<?php endforeach; ?>
 # $... = array (...)
 snippet array
-	$${1:arrayName} = array('${2}' => ${3});${4}
+	$${1:arrayName} = array('${2}' => ${3});
 snippet try
 	try {
-		${2}
+		${0}
 	} catch (${1:Exception} $e) {
 	}
 # lambda with closure
 snippet lambda
 	${1:static }function (${2:args}) use (${3:&$x, $y /*put vars in scope (closure) */}) {
-		${4}
+		${0}
 	};
 # pre_dump();
 snippet pd
-	echo '<pre>'; var_dump(${1}); echo '</pre>';
+	echo '<pre>'; var_dump(${0}); echo '</pre>';
 # pre_dump(); die();
 snippet pdd
-	echo '<pre>'; var_dump(${1}); echo '</pre>'; die(${2:});
+	echo '<pre>'; var_dump(${1}); echo '</pre>'; die(${0:});
 snippet vd
-	var_dump(${1});
+	var_dump(${0});
 snippet vdd
-	var_dump(${1}); die(${2:});
+	var_dump(${1}); die(${0:});
 snippet vdf
-	error_log(print_r($${1:foo}, true), 3, '${2:/tmp/debug.log}');${3}
+	error_log(print_r($${1:foo}, true), 3, '${2:/tmp/debug.log}');
 snippet http_redirect
 	header ("HTTP/1.1 301 Moved Permanently");
 	header ("Location: ".URL);
@@ -372,13 +372,13 @@ snippet gs
 	{
 		$this->$4 = $$1;
 		return $this;
-	}${8}
+	}
 # anotation, get, and set, useful for doctrine
 snippet ags
 	/**
 	 * ${1:description}
 	 *
-	 * @${7}
+	 * @${0}
 	 */
 	${2:protected} $${3:foo};
 
@@ -398,12 +398,12 @@ snippet retf
 	return false;
 snippet am
 	$${1:foo} = array_map(function($${2:v}) {
-		${3}
+		${0}
 		return $$2;
 	}, $$1);
 snippet aw
 	array_walk($${1:foo}, function(&$${2:v}, $${3:k}) {
-		$$2 = ${4};
+		$$2 = ${0};
 	});
 
 # static var assign once
diff --git a/snippets/plsql.snippets b/snippets/plsql.snippets
index dba25eeea..2920758ad 100644
--- a/snippets/plsql.snippets
+++ b/snippets/plsql.snippets
@@ -2,28 +2,28 @@
 snippet ps
 	create or replace package ${1:name}
 	as
-		${2:-- spec}
+		${0:-- spec}
 	end; -- end of package spec $1
 # create package body
 snippet pb
 	create or replace package body ${1:name}
 	as
-		${2:-- body}
+		${0:-- body}
 	end; -- end of package body $1;
 # package procedure spec
 snippet pps
-	procedure ${1:name}(${2:args});
+	procedure ${1:name}(${0:args});
 # package procedure body
 snippet ppb
 	procedure ${1:name}(${2:args})
 	as
 	begin
-		${3:-- body}
+		${0:-- body}
 	end $2;
 # package function spec
 snippet pfs
 	function ${1:name}(${2:args})
-	  return ${3:type};
+	  return ${0:type};
 # package function body
 snippet pfb
 	function ${1:name}(${2:args})
@@ -31,7 +31,7 @@ snippet pfb
 	as
 		l_res	$3;
 	begin
-		${4:-- body};
+		${0:-- body};
 		return l_res;
 	end $1;
 # snow errors
@@ -39,71 +39,71 @@ snippet err
 	show errors;
 # proc/func in parameter
 snippet p
-	${1:name} ${2:in} ${3:type} ${4: := null}
+	${1:name} ${2:in} ${3:type} ${0: := null}
 # package type: record
 snippet tr
-	type tr_${1:name} is record (${2:/* columns */});
+	type tr_${1:name} is record (${0:/* columns */});
 # package type: nested table
 snippet tt
-	type tt_${1:name} is table of tr_${2:name};
+	type tt_${1:name} is table of tr_${0:name};
 # package type: indexed table
 snippet tti
-	type tt_${1:name} is table of tr_${2:name} index by binary_integer;
+	type tt_${1:name} is table of tr_${0:name} index by binary_integer;
 # proc/func comment
 snippet doc
 	/*
-	 *	${1: comment ...}
+	 *	${0: comment ...}
 	 */
 # plsql block
 snippet beg
 	begin
-		${1}
+		${0}
 	end;
 # plsql block with declare part
 snippet dec
 	declare
 		${1}
 	begin
-		${2}
+		${0}
 	end;
 # return pipe row
 snippet rpipe
-	for ${1:i} in 1 .. ${2:l_res}.count loop
+	for ${1:i} in 1 .. ${0:l_res}.count loop
 		pipe row( $2($1) );
 	end loop;
 	return;
 # bulk collect
 snippet bc
-	bulk collect into ${1}
+	bulk collect into ${0}
 # local variable
 snippet l
-	l_${1}		${2:number};
+	l_${1}		${0:number};
 # output
 snippet log
-	dbms_output.put_line('${1}');
+	dbms_output.put_line('${0}');
 # for loop
 snippet for
 	for ${1:i} in ${2:1}..${3:42} loop
-		${3}
+		${0}
 	end loop;
 # for loop with select
 snippet fors
 	for ${1:rec} in (${2: select}) loop
-		${3}
+		${0}
 	end loop;
 # for loop with collection
 snippet forc
 	for ${1:i} in ${2:l_var}.first .. $2.last loop
-		${3: -- dbms_output.put_line($2($1)); }
+		${0: -- dbms_output.put_line($2($1)); }
 	end loop;
 # if
 snippet if
 	if ${1} then
-		${2}
+		${0}
 	end if;
 snippet ife
 	if ${1} then
 		${2}
 	else
-		${3}
+		${0}
 	end if;
diff --git a/snippets/po.snippets b/snippets/po.snippets
index e693a60e0..84916fa44 100644
--- a/snippets/po.snippets
+++ b/snippets/po.snippets
@@ -2,4 +2,4 @@ snippet msg
 	msgid "${1}"
 	msgstr "${2}"
 
-	${3}
+	${0}
diff --git a/snippets/processing.snippets b/snippets/processing.snippets
index 2aec1b122..dcaed54aa 100755
--- a/snippets/processing.snippets
+++ b/snippets/processing.snippets
@@ -7,13 +7,13 @@ snippet doc
 	 *	@author ${2:name}
 	 *	@since  ${3:`strftime("%d/%m/%y %H:%M:%S")`}
 	 */
-	${4}
+	${0}
 # doc comment
 snippet docc
 	/**
 	 *	${1:@private}$0
 	 */
-	${2}
+	${0}
 # class
 snippet class
 	${1:public }class ${2:`fnamemodify(bufname("%"),":t:r")`} ${3:extends}
@@ -36,36 +36,36 @@ snippet package
 	 *	@since  ${3:`strftime("%d/%m/%y %H:%M:%S")`}
 	 */
 
-	package ${4:package};
+	package ${0:package};
 # function
 snippet fun
 	${1:void/private/protected/public}${2: static} ${3:name}(${4}) {
 		${5://if not void return null;}
 	}
-	${6}
+	${0}
 snippet fn
 	${1:void }${2:name}(${3}) {
 		${4://if not void return null;}
 	}
-	${5}
+	${0}
 #	constant
 snippet const
-	static final ${1:Object} ${2:VAR_NAM} = ${3};
+	static final ${1:Object} ${2:VAR_NAM} = ${0};
 # var
 snippet var
-	${1:private/public }${2:static }${3:String} ${4:str}${5: =}${6:value};
+	${1:private/public }${2:static }${3:String} ${4:str}${5: =}${0:value};
 # var objects
 snippet obj
-	${1:private/public }${2:Object} ${3:o}${4: = new }$2(${5});
+	${1:private/public }${2:Object} ${3:o}${4: = new }$2(${0});
 #loop for
 snippet for
 	for (int ${2:i} = 0; $2 < ${1:Things}.length; $2${3:++}) {
-		${4:$1[$2]}
+		${0:$1[$2]}
 	};
 #loop while
 snippet wh
 	while (${1:/* condition */}) {
-		${2}
+		${0}
 	}
 #break
 snippet break
@@ -73,7 +73,7 @@ snippet break
 #case
 snippet case
 	case ${1:expression} :
-		${2}
+		${0}
 	break;
 #default
 snippet default
@@ -86,20 +86,20 @@ snippet switch
 		case '${3:case}':
 			${4}
 			break;
-		${5}
+		${0}
 		default:
 			${2}
 	}
 #try
 snippet try
 	try {
-		${3}
+		${0}
 	} catch(${1:Exception} ${2:e}) {
 	}
 #try catch finally
 snippet tryf
 	try {
-		${3}
+		${0}
 	} catch(${1:Exception} ${2:e}) {
 	} finally {
 	}
@@ -109,29 +109,29 @@ snippet throw
 #ternary
 snippet ?
 	? ${1:trueExpression} : ${2:falseExpression}
-	${3}
+	${0}
 snippet if
-	if (${1:true}) {${2}}
+	if (${1:true}) {${0}}
 # if ... else
 snippet ife
 	if (${1:true}) {${2}}
-	else{${3}}
+	else{${0}}
 #get
 snippet get
 	public ${1:String} get${2}() {
-		return ${2:fieldName};
+		return ${0:fieldName};
 	}
 #set
 snippet set
-	public void set${1}(${2:String} new${1}) {
+	public void set${1}(${0:String} new${1}) {
 		${1:fieldName} = new${1};
 	}
 #printIn
 snippet println
-	println("${1:`fnamemodify(bufname("%"),":t:r")`}::${2:method}() "${3: +} ${4});
+	println("${1:`fnamemodify(bufname("%"),":t:r")`}::${2:method}() "${3: +} ${0});
 #println string
 snippet pr
-	println("${1}");
+	println("${0}");
 #setup draw
 snippet setup
 	void setup(){
@@ -139,7 +139,7 @@ snippet setup
 	}
 
 	void draw(){
-		${2}
+		${0}
 	}
 #setup OPENGL
 snippet opengl
@@ -168,7 +168,7 @@ snippet opengl
 	}
 
 	void initGL(){
-		${5}
+		${0}
 	}
 
 	void getOpenGLErrors(){
@@ -201,14 +201,14 @@ snippet opengl
 #GL Functions
 snippet gl begin gl
 	pgl.beginGL();
-		${1}
+		${0}
 	pgl.endGL();
 snippet gl gl swap interval
 	// specify the minimum swap interval for buffer swaps.
-	gl.setSwapInterval(${1:interval});
+	gl.setSwapInterval(${0:interval});
 snippet gl gl call list
 	// execute a display list
-	gl.glCallList(${1:list});
+	gl.glCallList(${0:list});
 snippet gl gl gen buffers
 	// import java.nio.IntBuffer;
 	// import java.nio.FloatBuffer;
@@ -219,7 +219,7 @@ snippet gl gl gen buffers
 	gl.glGenBuffers($1, bufferObjects);
 
 	int vertexCount = ${2:3};
-	int numCoordinates = ${3:3};
+	int numCoordinates = ${0:3};
 	// vertexCount * numCoordinates
 	FloatBuffer vertices = BufferUtil.newFloatBuffer(vertexCount * numCoordinates);
 	float[] v = {0.0f, 0.0f, 0.0f,
@@ -231,144 +231,144 @@ snippet gl gl gen buffers
 	gl.glBindBuffer(GL.GL_ARRAY_BUFFER, bufferObjects.get(0));
 	gl.glBufferData(GL.GL_ARRAY_BUFFER, vertexCount * numCoordinates * BufferUtil.SIZEOF_FLOAT, vertices, GL.GL_STATIC_DRAW);
 snippet gl gl bind buffer
-	${2:// A buffer ID of zero unbinds a buffer object}
+	${0:// A buffer ID of zero unbinds a buffer object}
 	gl.glBindBuffer(GL.GL_ARRAY_BUFFER, ${1:0});
 snippet gl gl delete buffers
-	${3:// Parameters are the same for glGenBuffers}
+	${0:// Parameters are the same for glGenBuffers}
 	gl.glDeleteBuffers(${1:4}, ${2:bufferObjects});
 snippet gl gl depth mask
 	// enable or disable writing into the depth buffer
-	gl.glDepthMask(${1:flag});
+	gl.glDepthMask(${0:flag});
 snippet gl gl load identity
 	// replaces the top of the active matrix stack with the identity matrix
 	gl.glLoadIdentity();
 snippet gl gl tex coord 2f
 	// set the current texture coordinates - 2 floats
-	gl.glTexCoord2f(${1:0.0f}, ${2:0.0f});
+	gl.glTexCoord2f(${1:0.0f}, ${0:0.0f});
 snippet gl gl vertex 2f
-	gl.glVertex2f(${1:0.0f}, ${2:0.0f});
+	gl.glVertex2f(${1:0.0f}, ${0:0.0f});
 snippet gl gl vertex 3f
-	gl.glVertex3f(${1:0.0f}, ${2:0.0f}, ${3:0.0f});
+	gl.glVertex3f(${1:0.0f}, ${2:0.0f}, ${0:0.0f});
 snippet gl gl translate f
 	// multiply the current matrix by a translation matrix
-	gl.glTranslatef(${1:x}, ${2:y}, ${3:z});
+	gl.glTranslatef(${1:x}, ${2:y}, ${0:z});
 snippet gl gl rotate f
 	// rotate, x-axis, y-axis, z-axiz
-	gl.glRotatef(${1:angle}, ${2:x}, ${3:y}, ${4:z});
+	gl.glRotatef(${1:angle}, ${2:x}, ${3:y}, ${0:z});
 snippet gl gl scale f
 	// multiply the current matrix by a general scaling matrix
-	gl.glScalef(${1:x}, ${2:y}, ${3:z});
+	gl.glScalef(${1:x}, ${2:y}, ${0:z});
 snippet gl gl color 4f
-	gl.glColor4f(${1:red}, ${2:green}, ${3:blue}, ${4:alpha});
+	gl.glColor4f(${1:red}, ${2:green}, ${3:blue}, ${0:alpha});
 snippet gl gl clear color
-	gl.glClearColor(${1:red}, ${2:green}, ${3:blue}, ${4:alpha});
+	gl.glClearColor(${1:red}, ${2:green}, ${3:blue}, ${0:alpha});
 snippet gl gl color 3f
-	gl.glColor3f(${1:red}, ${2:green}, ${3:blue});
+	gl.glColor3f(${1:red}, ${2:green}, ${0:blue});
 snippet gl gl push matrix
 	// spush and pop the current matrix stack
 	gl.glPushMatrix();
-	${1}
+	${0}
 	gl.glPopMatrix();
 snippet gl gl gen lists
-	gl.glGenLists(${1:1})
+	gl.glGenLists(${0:1})
 snippet gl gl flush
 	// Empties buffers. Call this when all previous issues commands completed
 	gl.glFlush();
-	${1}
+	${0}
 snippet gl gl get error
 	println(gl.glGetError());
 snippet gl gl clear
-	gl.glClear(${1:GL.GL_COLOR_BUFFER_BIT}${2: | }${3:GL.GL_DEPTH_BUFFER_BIT});
+	gl.glClear(${1:GL.GL_COLOR_BUFFER_BIT}${2: | }${0:GL.GL_DEPTH_BUFFER_BIT});
 
 #frame operations
 snippet fr framerate
 	frameRate(${1:30});
-	${2}
+	${0}
 snippet fr frameRate
 	frameRate
 snippet fr frameCount
 	frameCount
 snippet fr saveFrame
-	saveFrame("${1:filename-####}${2:.ext}");
+	saveFrame("${1:filename-####}${0:.ext}");
 
 #size
 snippet size normal size
-	size(${1:200}, ${2:200}${3:, P3D});
+	size(${1:200}, ${2:200}${0:, P3D});
 snippet size opengl size
-	size(${1:200}, ${2:200}${3:, OPENGL});
+	size(${1:200}, ${2:200}${0:, OPENGL});
 
 #PRIMITIVES
 #color
 snippet color
-	color ${1:c}${2: = color(}${3:value1, }${4:value2, }${5:value3)};
+	color ${1:c}${2: = color(}${3:value1, }${4:value2, }${0:value3)};
 #char
 snippet char
-	char ${1:m}${2: = "}${3:char"};
+	char ${1:m}${2: = "}${0:char"};
 #float
 snippet float
-	float ${1:f}${2: = }${3:0.0f};
+	float ${1:f}${2: = }${0:0.0f};
 #int
 snippet int
-	int ${1:f}${2: = }${3:0};
+	int ${1:f}${2: = }${0:0};
 #boolean
 snippet boolean
-	boolean ${1:b}${2: = }${3:true};
+	boolean ${1:b}${2: = }${0:true};
 #byte
 snippet byte
-	byte ${1:b}${2: = }${3:127};
+	byte ${1:b}${2: = }${0:127};
 #string
 snippet string
-	String ${1:str}${2: = "}${3:CCCP"};
+	String ${1:str}${2: = "}${0:CCCP"};
 #array
 snippet array
-	${1:int}[] ${2:numbers}${3: = new $1}[${4:length}];
+	${1:int}[] ${2:numbers}${3: = new $1}[${0:length}];
 #object
 snippet object
-	${1:Object} ${2:o}${3: = new $1}(${4});
+	${1:Object} ${2:o}${3: = new $1}(${0});
 
 #curve
 snippet curve curve
-	curve(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3}, ${7:x4}, ${8:y4});
+	curve(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3}, ${7:x4}, ${0:y4});
 snippet curve curve 3D
-	curve(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${6:z2}, ${7:x3}, ${8:y3}, ${9:z3}, ${10:x4}, ${11:y4}, ${12:z4});
+	curve(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${6:z2}, ${7:x3}, ${8:y3}, ${9:z3}, ${10:x4}, ${11:y4}, ${0:z4});
 snippet curve curve Detail
-	curveDetail(${1:detail});
+	curveDetail(${0:detail});
 snippet curve curve point
-	curvePoint(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${5:t});
+	curvePoint(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${0:t});
 snippet curve curve tightness
-	curveTightness(${1:squishy});
+	curveTightness(${0:squishy});
 
 #bezier
 snippet bezier bezier
-	bezier(${1:x1}, ${2:y1}, ${3:cx1}, ${4:cy1}, ${5:cx2}, ${6:cy2}, ${7:x2}, ${8:y2});
+	bezier(${1:x1}, ${2:y1}, ${3:cx1}, ${4:cy1}, ${5:cx2}, ${6:cy2}, ${7:x2}, ${0:y2});
 snippet bezier bezier 3D
-	bezier(${1:x1}, ${2:y1}, ${3:z1}, ${4:cx1}, ${5:cy1}, ${6:cz1}, ${7:cx2}, ${8:cy2}, ${9:cz2}, ${10:x2}, ${11:y2}, ${12:z2});
+	bezier(${1:x1}, ${2:y1}, ${3:z1}, ${4:cx1}, ${5:cy1}, ${6:cz1}, ${7:cx2}, ${8:cy2}, ${9:cz2}, ${10:x2}, ${11:y2}, ${0:z2});
 snippet bezier bezier detail
-	bezierDetail(${1:detail});
+	bezierDetail(${0:detail});
 snippet bezier bezier tangent
-	bezierTangent(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${5:t});
+	bezierTangent(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${0:t});
 snippet bezier bezier point
-	bezierPoint(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${5:t});
+	bezierPoint(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${0:t});
 
 #vertex
 snippet vertex vertex
-	vertex(${1:x}, ${2:y}${3:, }${4:u}${5:, }${6:v});
+	vertex(${1:x}, ${2:y}${3:, }${4:u}${5:, }${0:v});
 snippet vertex vertex 3D
-	vertex(${1:x}, ${2:y}, ${3:z}${4:, }${5:u}${6:, }${7:v});
+	vertex(${1:x}, ${2:y}, ${3:z}${4:, }${5:u}${6:, }${0:v});
 snippet vertex vertex bezier
-	bezierVertex(${1:cx1}, ${2:cy1}, ${3:cx2}, ${4:cy2}, ${5:x}, ${6:y});
+	bezierVertex(${1:cx1}, ${2:cy1}, ${3:cx2}, ${4:cy2}, ${5:x}, ${0:y});
 snippet vertex vertex bezier 3D
-	bezierVertex(${1:cx1}, ${2:cy1}, ${3:cz1}, ${4:cx2}, ${5:cy2}, ${6:cz2}, ${7:x}, ${8:y}, ${9:z});
+	bezierVertex(${1:cx1}, ${2:cy1}, ${3:cz1}, ${4:cx2}, ${5:cy2}, ${6:cz2}, ${7:x}, ${8:y}, ${0:z});
 snippet vertex vertex curve
-	curveVertex(${1:x}, ${2:y});
+	curveVertex(${1:x}, ${0:y});
 snippet vertex vertex curve 3D
-	curveVertex(${1:x}, ${2:y}, ${3:z});
+	curveVertex(${1:x}, ${2:y}, ${0:z});
 
 #stroke
 snippet stroke stroke
-	stroke(${1:value1}, ${2:value2}, ${3:value3}${4:, }${5:alpha});
+	stroke(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
 snippet stroke stroke weight
-	strokeWeight(${1:1});
+	strokeWeight(${0:1});
 snippet stroke no stroke
 	noStroke();
 
@@ -379,19 +379,19 @@ snippet mouse mouse y
 	mouseY
 snippet mouse mouse drag
 	void mouseDragged(){
-		${1}
+		${0}
 	}
 snippet mouse mouse move
 	void mouseMoved(){
-		${1}
+		${0}
 	}
 snippet mouse mouse release
 	void mouseReleased(){
-		${1}
+		${0}
 	}
 snippet mouse mouse pressed
 	void mousePressed(){
-		${1}
+		${0}
 	}
 snippet mouse mouse pressed?
 	mousePressed
@@ -409,36 +409,36 @@ snippet key key
 	key
 snippet key key released
 	void keyReleased(){
-		${1}
+		${0}
 	}
 snippet key key typed
 	void keyTyped(){
-		${1}
+		${0}
 	}
 snippet key key pressed
 	void keyPressed(){
-		${1}
+		${0}
 	}
 snippet key key pressed?
 	keyPressed
 
 #file
 snippet file load string
-	loadStrings("${1:filename}");
+	loadStrings("${0:filename}");
 snippet file save string
-	saveStrings(${1:filename}, ${2:strings});
+	saveStrings(${1:filename}, ${0:strings});
 snippet file load bytes
-	loadBytes("${1:filename}");
+	loadBytes("${0:filename}");
 snippet file begin record
-	beginRecord(${1:renderer}, ${2:filename});
+	beginRecord(${1:renderer}, ${0:filename});
 snippet file end record
 	endRecord();
 snippet file save bytes
-	saveBytes(${1:filename}, ${2:bytes});
+	saveBytes(${1:filename}, ${0:bytes});
 snippet file create writer
-	createWriter(${1:filename});
+	createWriter(${0:filename});
 snippet file create reader
-	createReader(${1:filename});
+	createReader(${0:filename});
 
 #time
 snippet time hour
@@ -456,62 +456,62 @@ snippet time second
 
 #matrix
 snippet matrix reset matrix
-	translate(${1:x}, ${2:y}, ${3:z});
+	translate(${1:x}, ${2:y}, ${0:z});
 snippet matrix print matrix
 	printMatrix();
 snippet matrix push matrix
 	pushMatrix();
-	${1:};
+	${0:};
 	popMatrix();
 
 
 #text
 snippet txt text data
-	text(${1:data}, ${2:x}, ${3:y}${4:, }${5:z});
+	text(${1:data}, ${2:x}, ${3:y}${4:, }${0:z});
 snippet txt text string data
-	text(${1:stringdata}, ${2:x}, ${3:y}, ${4:width}, ${5:height}${6:, }${7:z});
+	text(${1:stringdata}, ${2:x}, ${3:y}, ${4:width}, ${5:height}${6:, }${0:z});
 snippet txt text size
-	textSize(${1:size});
+	textSize(${0:size});
 snippet txt text leading
-	textLeading(${1:size});
+	textLeading(${0:size});
 snippet txt text width
-	textWidth(${1:data});
+	textWidth(${0:data});
 snippet txt text descent
 	textDescent();
 snippet txt text ascent
 	textAscent();
 snippet txt font
 	PFont ${1:font};
-	$1 = loadFont("${2:FFScala-32.vlw}");
+	$1 = loadFont("${0:FFScala-32.vlw}");
 #load font
 snippet txt load font
-	${1:font} = loadFont("${2:FFScala-32.vlw}");
+	${1:font} = loadFont("${0:FFScala-32.vlw}");
 snippet txt text font
-	textFont(${1:font}${2:, }${3:size});
+	textFont(${1:font}${2:, }${0:size});
 
 #math
 snippet math tangent
-	tan(${1:rad});
+	tan(${0:rad});
 snippet math atan
-	atan(${1:rad});
+	atan(${0:rad});
 snippet math atan2
-	atan2(${1:rad});
+	atan2(${0:rad});
 snippet math sin
-	sin(${1:rad});
+	sin(${0:rad});
 snippet math asin
-	asin(${1:rad});
+	asin(${0:rad});
 snippet math cos
-	cos(${1:rad});
+	cos(${0:rad});
 snippet math acos
-	acos(${1:rad});
+	acos(${0:rad});
 snippet math degrees
-	degrees(${1:rad});
+	degrees(${0:rad});
 snippet math radians
-	radians(${1:deg});
+	radians(${0:deg});
 snippet math random seed
-	randomSeed(${1:value});
+	randomSeed(${0:value});
 snippet math random
-	random(${1:value1}${2:, }${3:value2});
+	random(${1:value1}${2:, }${0:value2});
 snippet math half PI
 	HALF_PI
 snippet math 2 PI
@@ -519,61 +519,61 @@ snippet math 2 PI
 snippet math PI
 	PI
 snippet math pow
-	pow(${1:num}, ${2:exponent});
+	pow(${1:num}, ${0:exponent});
 snippet math floor
-	floor(${1:value});
+	floor(${0:value});
 snippet math sqrt
-	sqrt(${1:value});
+	sqrt(${0:value});
 snippet math abs
-	abs(${1:value});
+	abs(${0:value});
 snippet math sq
-	sq(${1:value});
+	sq(${0:value});
 snippet math ceil
-	ceil(${1:value});
+	ceil(${0:value});
 snippet math exp
-	exp(${1:value});
+	exp(${0:value});
 snippet math round
-	round(${1:value}};
+	round(${0:value}};
 snippet math min
-	min(${1:value1}, ${2:value2}${3:, }${4:value3});
+	min(${1:value1}, ${2:value2}${3:, }${0:value3});
 snippet math max
-	max(${1:value1}, ${2:value2}${3:, }${4:value3});
+	max(${1:value1}, ${2:value2}${3:, }${0:value3});
 snippet math array max
-	max(${1:array});
+	max(${0:array});
 snippet math array min
-	min(${1:array});
+	min(${0:array});
 snippet math logarithm
-	log(${1:value});
+	log(${0:value});
 snippet math map
-	map(${1:value}, ${2:low1}, ${4:high1}, ${5:low2}, ${6:high2});
+	map(${1:value}, ${2:low1}, ${4:high1}, ${5:low2}, ${0:high2});
 snippet math normalize
-	norm(${1:value}, ${2:low}, ${3:high});
+	norm(${1:value}, ${2:low}, ${0:high});
 snippet math constrain
-	constrain(${1:value}, ${2:min}, ${3:max});
+	constrain(${1:value}, ${2:min}, ${0:max});
 snippet math magnitude of a vector
-	mag(${1:a}, ${2:b}${3:, }${4:c});
+	mag(${1:a}, ${2:b}${3:, }${0:c});
 snippet math distance
-	dist(${1:x1}, ${2:y1}, ${4:x2}, ${5:y2});
+	dist(${1:x1}, ${2:y1}, ${4:x2}, ${0:y2});
 snippet math distance 3D
-	dist(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${6:z2});
+	dist(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${0:z2});
 
 #noise math
 snippet noise set noise
-	noise(${1:x}${2:, }${3:y}${4:, }${5:z});
+	noise(${1:x}${2:, }${3:y}${4:, }${0:z});
 snippet noise noise detail
-	noiseDetail(${1:octaves}${2:, }${3:falloff});
+	noiseDetail(${1:octaves}${2:, }${0:falloff});
 snippet noise noise seed
-	noiseSeed(${1:x});
+	noiseSeed(${0:x});
 
 #material
 snippet material shininess
-	shininess(${1:shine});
+	shininess(${0:shine});
 snippet material specular
-	specular(${1:value1}, ${2:value2}, ${3:value3}${4:, }${5:alpha});
+	specular(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
 snippet material ambient
-	ambient(${1:value1}, ${2:value2}, ${3:value3});
+	ambient(${1:value1}, ${2:value2}, ${0:value3});
 snippet material emissive
-	emissive(${1:value1}, ${2:value2}, ${3:value3});
+	emissive(${1:value1}, ${2:value2}, ${0:value3});
 
 #light
 snippet light no light
@@ -581,25 +581,25 @@ snippet light no light
 snippet light light
 	lights();
 snippet light diretional light
-	directionalLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:nx}, ${5:ny}, ${6:nz});
+	directionalLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:nx}, ${5:ny}, ${0:nz});
 snippet light point light
-	pointLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:nx}, ${5:ny}, ${6:nz});
+	pointLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:nx}, ${5:ny}, ${0:nz});
 snippet light falloff light
-	lightFalloff(${1:constant}, ${2:linear}, ${3:quadratic});
+	lightFalloff(${1:constant}, ${2:linear}, ${0:quadratic});
 snippet light normal light
-	normal(${1:nx}, ${2:ny}, ${3:nz});
+	normal(${1:nx}, ${2:ny}, ${0:nz});
 snippet light specular light
-	lightFalloff(${1:v1}, ${2:v2}, ${3:v3});
+	lightFalloff(${1:v1}, ${2:v2}, ${0:v3});
 snippet light ambient light
-	ambientLight(${1:v1}, ${2:v2}, ${3:v3}${7:, ${4:x}, ${5:y}, ${6:z}});
+	ambientLight(${1:v1}, ${2:v2}, ${3:v3}${7:, ${4:x}, ${5:y}, ${0:z}});
 snippet light spot light
-	spotLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:x}, ${5:y}, ${6:z}, ${7:nx}, ${8:ny}, ${9:nz}, ${10:angle}, ${11:concentration});
+	spotLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:x}, ${5:y}, ${6:z}, ${7:nx}, ${8:ny}, ${9:nz}, ${10:angle}, ${0:concentration});
 
 #camera
 snippet cam camera
-	camera(${1:eyeX}, ${2:eyeY}, ${3:eyeZ}, ${4:centerX}, ${5:centerY}, ${6:centerZ}, ${7:upX}, ${8:upY}, ${9:upZ});
+	camera(${1:eyeX}, ${2:eyeY}, ${3:eyeZ}, ${4:centerX}, ${5:centerY}, ${6:centerZ}, ${7:upX}, ${8:upY}, ${0:upZ});
 snippet cam ortho
-	ortho(${1:left}, ${2:right}, ${3:bottom}, ${4:top}, ${5:near}, ${6:far});
+	ortho(${1:left}, ${2:right}, ${3:bottom}, ${4:top}, ${5:near}, ${0:far});
 snippet cam begin camera
 	beginCamera();
 snippet cam end camera
@@ -609,75 +609,75 @@ snippet cam print camera
 snippet cam print camera projection
 	printProjection();
 snippet cam perspective camera
-	perspective(${1:fov}, ${2:aspect}, ${3:zNear}, ${4:zFar});
+	perspective(${1:fov}, ${2:aspect}, ${3:zNear}, ${0:zFar});
 snippet cam frustrum
-	frustrum(${1:left}, ${2:right}, ${3:bottom}, ${4:top}, ${5:near}, ${6:far});
+	frustrum(${1:left}, ${2:right}, ${3:bottom}, ${4:top}, ${5:near}, ${0:far});
 
 #transformations
 snippet trans rotate
-	rotate${1:X}(${1:angle});
+	rotate${1:X}(${0:angle});
 snippet trans translate
-	translate(${1:x}, ${2:y}${3:, }${4:z});
+	translate(${1:x}, ${2:y}${3:, }${0:z});
 snippet trans scale size
-	scale(${1:size});
+	scale(${0:size});
 snippet trans scale
-	scale(${1:x}, ${2:y}${3:, }${4:z});
+	scale(${1:x}, ${2:y}${3:, }${0:z});
 
 #coordinates
 snippet coord
-	${1:model/screen}${2:X}(${3:x}, ${4:y}, ${5:z});
+	${1:model/screen}${2:X}(${3:x}, ${4:y}, ${0:z});
 
 #effects
 snippet fx brightness
-	brightness(${1:color});
+	brightness(${0:color});
 snippet fx lerp color
-	lerpColor(${1:c1}, ${2:c2}, ${3:amt});
+	lerpColor(${1:c1}, ${2:c2}, ${0:amt});
 snippet fx saturation
-	saturation(${1:color});
+	saturation(${0:color});
 snippet fx hue
-	hue(${1:color});
+	hue(${0:color});
 snippet fx alpha
-	alpha(${1:color});
+	alpha(${0:color});
 snippet fx tint
-	tint(${1:value1}, ${2:value2}, ${3:value3}${4:, }${5:alpha});
+	tint(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
 snippet fx notint
 	noTint();
 
 #pixel
 snippet px set pixel
-	set(${1:x}, ${2:y}, ${3:color/image});
+	set(${1:x}, ${2:y}, ${0:color/image});
 snippet px update pixel
 	updatePixels();
 snippet px load pixel
 	loadPixels();
 snippet px pixels
-	pixels[${1:index}]
+	pixels[${0:index}]
 snippet px get pixel
-	get(${1:x}, ${2:y}${3:, }${4:width}${5:, }${6:height});
+	get(${1:x}, ${2:y}${3:, }${4:width}${5:, }${0:height});
 
 #geometric figures
 snippet geof triangle
-	triangle(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3});
+	triangle(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${0:y3});
 snippet geof line
-	line(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2});
+	line(${1:x1}, ${2:y1}, ${3:x2}, ${0:y2});
 snippet geof line 3D
-	line(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${6:z2});
+	line(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${0:z2});
 snippet geof arc
-	arc(${1:x}, ${2:y}, ${3:width}, ${4:height}, ${5:start}, ${6:stop});
+	arc(${1:x}, ${2:y}, ${3:width}, ${4:height}, ${5:start}, ${0:stop});
 snippet geof point
-	point(${1:x}, ${2:y}${3:, }${4:z});
+	point(${1:x}, ${2:y}${3:, }${0:z});
 snippet geof quad
-	quad(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3}, ${7:x4}, ${8:y4});
+	quad(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3}, ${7:x4}, ${0:y4});
 snippet geof ellipse
-	ellipse(${1:x}, ${2:y}, ${3:width}, ${4:height});
+	ellipse(${1:x}, ${2:y}, ${3:width}, ${0:height});
 snippet geof rect
-	rect(${1:x}, ${2:y}, ${3:width}, ${4:height});
+	rect(${1:x}, ${2:y}, ${3:width}, ${0:height});
 snippet geof box
-	box(${1:width}, ${2:height}, ${3:depth});
+	box(${1:width}, ${2:height}, ${0:depth});
 snippet geof sphere
-	sphere(${1:radius});
+	sphere(${0:radius});
 snippet geof sphere details
-	sphereDetail(${1:n});
+	sphereDetail(${0:n});
 snippet geof set smooth
 	smooth();
 snippet geof set no smooth
@@ -685,74 +685,74 @@ snippet geof set no smooth
 
 #array operations
 snippet arrop normal split
-	split("${1:str}"${2: , }${3:delimiter});
+	split("${1:str}"${2: , }${0:delimiter});
 snippet arrop split Tokens
-	splitTokens(${1:str}${2:, }${3:tokens});
+	splitTokens(${1:str}${2:, }${0:tokens});
 snippet arrop join
-	join(${1:strgArray}${2: , }${3:seperator});
+	join(${1:strgArray}${2: , }${0:seperator});
 snippet arrop shorten
-	shorten(${1:array});
+	shorten(${0:array});
 snippet arrop concat
-	concat(${1:array1}, ${2:array2});
+	concat(${1:array1}, ${0:array2});
 snippet arrop subset
-	subset(${1:array}, ${2:offset});
+	subset(${1:array}, ${0:offset});
 snippet arrop append
-	append(${1:array}, ${2:element});
+	append(${1:array}, ${0:element});
 snippet arrop reverse
-	reverse(${1:array});
+	reverse(${0:array});
 snippet arrop splice
-	splice(${1:array}, ${2:value/array2}, ${3:index});
+	splice(${1:array}, ${2:value/array2}, ${0:index});
 snippet arrop sort
-	sort(${1:dataArray}${2:, }${3:count});
+	sort(${1:dataArray}${2:, }${0:count});
 snippet arrop expand
-	expand(${1:array}${2:, }${3:newSize});
+	expand(${1:array}${2:, }${0:newSize});
 snippet arrop array copy
-	arrayCopy(${1:src}, ${2:dest}, ${3:, }${3:length});
+	arrayCopy(${1:src}, ${2:dest}, ${3:, }${0:length});
 
 #string operations
 snippet strop str
-	str("${1:str}");
+	str("${0:str}");
 snippet strop match
-	match(${1:str}, ${2:regexp});
+	match(${1:str}, ${0:regexp});
 snippet strop trim
-	trim(${1:str});
+	trim(${0:str});
 snippet strop nf
-	nf(${2:value}, ${3:left}${4:, }${5:right});
+	nf(${2:value}, ${3:left}${4:, }${0:right});
 snippet strop nfs
-	nfs(${2:value}, ${3:left}${4:, }${5:right});
+	nfs(${2:value}, ${3:left}${4:, }${0:right});
 snippet strop nfp
-	nfp(${2:value}, ${3:left}${4:, }${5:right});
+	nfp(${2:value}, ${3:left}${4:, }${0:right});
 snippet strop nfc
-	nfc(${1:value}${2:, }${3:right});
+	nfc(${1:value}${2:, }${0:right});
 
 #convert
 snippet convert unbinary
-	unbinary("${1:str}"});
+	unbinary("${0:str}"});
 snippet convert hexadecimal
-	hex(${1:c});
+	hex(${0:c});
 snippet convert unhex
-	unhex(${1:c});
+	unhex(${0:c});
 snippet convert binary
-	binary(${1:value}${2:, }${3:digits});
+	binary(${1:value}${2:, }${0:digits});
 
 #image operations
 snippet image load image
-	loadImage(${1:filename});
+	loadImage(${0:filename});
 snippet image image
-	image(${1:img}, ${2:x}, ${3:y}${4:, }${5:width}${6:, }${7:height});
+	image(${1:img}, ${2:x}, ${3:y}${4:, }${5:width}${6:, }${0:height});
 snippet copy copy
-	copy(${1:srcImg}${2:, }${3:x}, ${4:y}, ${5:width}, ${6:height}, ${7:dx}, ${8:dy}, ${9:dwidth}, ${10:dheight});
+	copy(${1:srcImg}${2:, }${3:x}, ${4:y}, ${5:width}, ${6:height}, ${7:dx}, ${8:dy}, ${9:dwidth}, ${0:dheight});
 
 
 
 #containers
 snippet bg
-	background(${1:value1}, ${2:value2}, ${3:value3}${4:, }${5:alpha});
+	background(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
 snippet pg
 	PGraphics pg;
-	pg = createGraphics(${1:width}, ${2:height}${3:, }${4:applet});
+	pg = createGraphics(${1:width}, ${2:height}${3:, }${0:applet});
 snippet pimage
-	PImage(${1:width}, ${2:height});
+	PImage(${1:width}, ${0:height});
 
 #UTILS
 #nofill
@@ -760,25 +760,25 @@ snippet nofill
 	noFill();
 #fill
 snippet fill
-	fill(${1:value1}, ${2:value2}, ${3:value3}${4:, }${5:alpha});
+	fill(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
 #red
 snippet red
-	red(${1:color});
+	red(${0:color});
 #green
 snippet green
-	green(${1:color});
+	green(${0:color});
 #blue
 snippet blue
-	blue(${1:color});
+	blue(${0:color});
 #status
 snippet status
-	status(${1:text});
+	status(${0:text});
 #param
 snippet param
-	param(${1:s});
+	param(${0:s});
 #link
 snippet link
-	link(${1:url}${2:, }${3:target});
+	link(${1:url}${2:, }${0:target});
 #@param
 snippet @
-	@${1:param/return/private/public}  ${1:parameter}  ${2:description}
+	@${1:param/return/private/public}  ${1:parameter}  ${0:description}
diff --git a/snippets/progress.snippets b/snippets/progress.snippets
index 0f1f436d3..dee07a8b2 100644
--- a/snippets/progress.snippets
+++ b/snippets/progress.snippets
@@ -1,9 +1,9 @@
 # Progress/OpenEdge ABL snippets
 # define
 snippet defbuf
-	DEFINE BUFFER b_${1:TableName} FOR $1 ${2}.
+	DEFINE BUFFER b_${1:TableName} FOR $1 ${0}.
 snippet defvar
-	DEFINE VARIABLE ${1:VariableName} AS ${2}.
+	DEFINE VARIABLE ${1:VariableName} AS ${0}.
 snippet nl
 	NO-LOCK
 snippet ne
@@ -11,25 +11,25 @@ snippet ne
 snippet nle
 	NO-LOCK NO-ERROR
 snippet ini
-	INITIAL ${1:?}
+	INITIAL ${0:?}
 snippet nu
 	NO-UNDO
 snippet err
 	ERROR
 snippet ff
 	FIND FIRST ${1:BufferName}
-	${2:WHERE $1.${3}} ${4}
+	${2:WHERE $1.${3}} ${0}
 snippet input
-	DEFINE INPUT PARAMETER ${1:ParamName} AS ${2}.
+	DEFINE INPUT PARAMETER ${1:ParamName} AS ${0}.
 snippet output
-	DEFINE OUTPUT PARAMETER ${1:ParamName} AS ${2:ParamType}.
+	DEFINE OUTPUT PARAMETER ${1:ParamName} AS ${0:ParamType}.
 snippet proc
 
 	/******************************************************************************/
 
 	PROCEDURE ${1:ProcName}:
 
-		${2}
+		${0}
 
 	END PROCEDURE. /* $1 */
 
@@ -43,7 +43,7 @@ snippet if
 	${3:ELSE ${4:OtherWise}}
 snippet do
 	DO${1: Clauses}:
-		${2}
+		${0}
 	END.
 # datatypes
 snippet int
diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index e95b9c7ae..cfe7f42c7 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -6,94 +6,94 @@
 # Language Constructs
 snippet class
 	class ${1:`vim_snippets#Filename('', 'name')`} {
-		${2}
+		${0}
 	}
 snippet node
 	node "${1:`vim_snippets#Filename('', 'fqdn')`}" {
-		${2}
+		${0}
 	}
 snippet case
 	case $${1:variable} {
-		default: { ${2} }
+		default: { ${0} }
 	}
 snippet ife
 	if $${1:variable} {
 		${2}
 	} else {
-		${3}
+		${0}
 	}
 snippet if
 	if $${1:variable} {
-		${2}
+		${0}
 	}
 snippet el
 	else {
-		${1}
+		${0}
 	}
 snippet ?
 	? {
-		'${1}'	=> ${2}
+		'${1}'	=> ${0}
 	  }
 #
 # blocks etc and general syntax sugar
 snippet [
-	[ ${1} ]${2}
+	[ ${1} ]
 snippet >
-	${1}	=> ${2}
+	${1}	=> ${0}
 snippet p:
-	"puppet://puppet/${1:module name}/${2:file name}"
+	"puppet://puppet/${1:module name}/${0:file name}"
 #
 # Functions
 snippet alert
-	alert("${1:message}")${2}
+	alert("${1:message}")
 snippet crit
-	crit("${1:message}")${2}
+	crit("${1:message}")
 snippet debug
-	debug("${1:message}")${2}
+	debug("${1:message}")
 snippet defined
-	defined(${1:Resource}["${2:name}"])${3}
+	defined(${1:Resource}["${2:name}"])
 snippet emerg
-	emerg("${1:message}")${2}
+	emerg("${1:message}")
 snippet extlookup Simple extlookup
-	extlookup("${1:variable}")${2}
+	extlookup("${1:variable}")
 snippet extlookup Extlookup with defaults
-	extlookup("${1:variable}", "${2:default}")${3}
+	extlookup("${1:variable}", "${2:default}")
 snippet extlookup Extlookup with defaults and custom data file
-	extlookup("${1:variable}", "${2:default}", "${3:data source}")${4}
+	extlookup("${1:variable}", "${2:default}", "${3:data source}")
 snippet fail
-	fail("${1:message}")${2}
+	fail("${1:message}")
 snippet info
-	info("${1:message}")${2}
+	info("${1:message}")
 snippet inline_template
-	inline_template("<%= ${1} %>")${2}
+	inline_template("<%= ${1} %>")
 snippet notice
-	notice("${1:message}")${2}
+	notice("${1:message}")
 snippet realize
-	realize(${1:Resource}[${2:name}])${3}
+	realize(${1:Resource}[${2:name}])
 snippet regsubst
-	regsubst(${1:hay stack}, ${2:needle}, "${3:replacement}")${4}
+	regsubst(${1:hay stack}, ${2:needle}, "${3:replacement}")
 snippet inc
-	include ${1:classname}${2}
+	include ${1:classname}
 snippet split
-	split(${1:hay stack}, "${2:patten}")${3}
+	split(${1:hay stack}, "${2:patten}")
 snippet versioncmp
-	versioncmp("${1:version}", "${2:version}")${3}
+	versioncmp("${1:version}", "${2:version}")
 snippet warning
-	warning("${1:message}")${2}
+	warning("${1:message}")
 #
 # Types
 snippet cron
 	cron{ "${1:name}":
 		command	=> "${2}",
 		user	=> "${3:root}",
-		${4}	=> ${5}
+		${4}	=> ${0}
 	}
 
 snippet exec
 	exec{ "${1:name}":
 		command	=> "${2:$1}",
 		user	=> "${3:root}",
-		${4}	=> ${5}
+		${4}	=> ${0}
 	}
 
 snippet user
@@ -101,55 +101,55 @@ snippet user
 		comment		=> "${2:$1}",
 		ensure		=> present,
 		managehome	=> true,
-		home		=> "${3:/home/$1}"
+		home		=> "${0:/home/$1}"
 	}
 
 snippet group
 	group{ "${1:group}":
-		ensure	=> ${2:present}
+		ensure	=> ${0:present}
 	}
 
 snippet host
 	host{ "${1:hostname}":
-		ip	=> ${2:127.0.0.1}
+		ip	=> ${0:127.0.0.1}
 	}
 
 snippet mailalias
 	mailalias{ "${1:localpart}":
-		recipient	=> "${2:recipient}"
+		recipient	=> "${0:recipient}"
 	}
 
 snippet mount
 	mount{ "${1:destination path}":
 		ensure	=> ${2:mounted},
-		device	=> "${3:device name or path}"
+		device	=> "${0:device name or path}"
 	}
 
 snippet package
 	package{ "${1:package name}":
-		ensure	=> ${2:present}
+		ensure	=> ${0:present}
 	}
 
 snippet yumrepo
 	yumrepo{ "${1:repo name}":
 		descr	=> "${2:$1}",
-		enabled	=> ${3:1}
+		enabled	=> ${0:1}
 	}
 
 snippet define
 	define ${1} (${2}) {
-		${3}
+		${0}
 	}
 
 snippet service
 	service{ "${1:service}":
 		enable		=> ${2:true},
-		ensure		=> ${3:running},
+		ensure		=> ${0:running},
 		hasstatus	=> true,
 	}
 
 snippet file
 	file{ "${1:path}":
-		${2}	=> ${3}
+		${2}	=> ${0}
 	}
 
diff --git a/snippets/python.snippets b/snippets/python.snippets
index a20086820..638a9c4b8 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -1,12 +1,12 @@
 snippet #!
 	#!/usr/bin/env python
 snippet imp
-	import ${1:module}
+	import ${0:module}
 snippet uni
 	def __unicode__(self):
-		${1:representation}
+		${0:representation}
 snippet from
-	from ${1:package} import ${2:module}
+	from ${1:package} import ${0:module}
 # Module Docstring
 snippet docs
 	"""
@@ -14,21 +14,21 @@ snippet docs
 	Author: `g:snips_author`
 	Email: `g:snips_email`
 	Github: `g:snips_github`
-	Description: ${2}
+	Description: ${0}
 	"""
 
 snippet wh
 	while ${1:condition}:
-		${2}
+		${0}
 # dowh - does the same as do...while in other languages
 snippet dowh
 	while True:
 		${1}
-		if ${2:condition}:
+		if ${0:condition}:
 			break
 snippet with
 	with ${1:expr} as ${2:var}:
-		${3}
+		${0}
 # New Class
 snippet cl
 	class ${1:ClassName}(${2:object}):
@@ -36,19 +36,19 @@ snippet cl
 		def __init__(self, ${4:arg}):
 			${5:super($1, self).__init__()}
 			self.$4 = $4
-			${6}
+			${0}
 # New Function
 snippet def
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
 		"""${3:docstring for $1}"""
-		${4}
+		${0}
 snippet deff
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
-		${3}
+		${0}
 # New Method
 snippet defs
 	def ${1:mname}(self, ${2:arg}):
-		${3}
+		${0}
 # New Property
 snippet property
 	def ${1:foo}():
@@ -58,23 +58,23 @@ snippet property
 		def fset(self, value):
 			${4:self._$1 = value}
 		def fdel(self):
-			${5:del self._$1}
+			${0:del self._$1}
 		return locals()
 	$1 = property(**$1())
 # Ifs
 snippet if
 	if ${1:condition}:
-		${2}
+		${0}
 snippet el
 	else:
-		${1}
+		${0}
 snippet ei
 	elif ${1:condition}:
-		${2}
+		${0}
 # For
 snippet for
 	for ${1:item} in ${2:items}:
-		${3}
+		${0}
 # Encodes
 snippet cutf8
 	# -*- coding: utf-8 -*-
@@ -84,28 +84,28 @@ snippet cascii
 	# -*- coding: ascii -*-
 # Lambda
 snippet ld
-	${1:var} = lambda ${2:vars} : ${3:action}
+	${1:var} = lambda ${2:vars} : ${0:action}
 snippet .
 	self.
 snippet try Try/Except
 	try:
 		${1}
 	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
+		${0:raise $3}
 snippet try Try/Except/Else
 	try:
 		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	else:
-		${5}
+		${0}
 snippet try Try/Except/Finally
 	try:
 		${1}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	finally:
-		${5}
+		${0}
 snippet try Try/Except/Else/Finally
 	try:
 		${1}
@@ -114,14 +114,14 @@ snippet try Try/Except/Else/Finally
 	else:
 		${5}
 	finally:
-		${6}
+		${0}
 # if __name__ == '__main__':
 snippet ifmain
 	if __name__ == '__main__':
-		${1:main()}
+		${0:main()}
 # __magic__
 snippet _
-	__${1:init}__${2}
+	__${1:init}__
 # python debugger (pdb)
 snippet pdb
 	import pdb; pdb.set_trace()
@@ -135,23 +135,23 @@ snippet pdbbb
 snippet pudb
 	import pudb; pudb.set_trace()
 snippet pprint
-	import pprint; pprint.pprint(${1})${2}
+	import pprint; pprint.pprint(${1})
 snippet "
 	"""
-	${1:doc}
+	${0:doc}
 	"""
 # test function/method
 snippet test
 	def test_${1:description}(${2:`indent('.') ? 'self' : ''`}):
-		${3}
+		${0}
 # test case
 snippet testcase
 	class ${1:ExampleCase}(unittest.TestCase):
 
 		def test_${2:description}(self):
-			${3}
+			${0}
 snippet fut
-	from __future__ import ${1}
+	from __future__ import ${0}
 #getopt
 snippet getopt
 	try:
@@ -166,25 +166,25 @@ snippet getopt
 
 	for option, argument in opts:
 		if option in ("-h", "--help"):
-			${4}
+			${0}
 		elif option in ("-v", "--verbose"):
 			verbose = argument
 # logging
 # glog = get log
 snippet glog
 	import logging
-	logger = logging.getLogger(${1:__name__})
+	logger = logging.getLogger(${0:__name__})
 snippet le
-	logger.error(${1:msg})
+	logger.error(${0:msg})
 # conflict with lambda=ld, therefor we change into Logger.debuG
 snippet lg
-	logger.debug(${1:msg})
+	logger.debug(${0:msg})
 snippet lw
-	logger.warning(${1:msg})
+	logger.warning(${0:msg})
 snippet lc
-	logger.critical(${1:msg})
+	logger.critical(${0:msg})
 snippet li
-	logger.info(${1:msg})
+	logger.info(${0:msg})
 snippet epydoc
 	"""
 	${1:Description}
@@ -195,5 +195,5 @@ snippet epydoc
 	@return: ${5: Description}
 	@rtype : ${6: Type}
 
-	@raise e: ${7: Description}
+	@raise e: ${0: Description}
 	"""
diff --git a/snippets/r.snippets b/snippets/r.snippets
index 2436f56ed..c7ca5acae 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -3,119 +3,119 @@ snippet #!
 
 # includes
 snippet lib
-	library(${1:package})
+	library(${0:package})
 snippet req
-	require(${1:package})
+	require(${0:package})
 snippet source
-	source('${1:file}')
+	source('${0:file}')
 
 # conditionals
 snippet if
 	if (${1:condition}) {
-		${2}
+		${0}
 	}
 snippet el
 	else {
-		${1}
+		${0}
 	}
 snippet ei
 	else if (${1:condition}) {
-		${2}
+		${0}
 	}
 
 # functions
 snippet fun
 	${1:name} = function (${2:variables}) {
-		${3}
+		${0}
 	}
 snippet ret
-	return(${1})
+	return(${0})
 
 # dataframes, lists, etc
 snippet df
-	${1:name}[${2:rows}, ${3:cols}]
+	${1:name}[${2:rows}, ${0:cols}]
 snippet c
-	c(${1:items})
+	c(${0:items})
 snippet li
-	list(${1:items})
+	list(${0:items})
 snippet mat
-	matrix(${1:data}, nrow=${2:rows}, ncol=${3:cols})
+	matrix(${1:data}, nrow=${2:rows}, ncol=${0:cols})
 
 # apply functions
 snippet apply
-	apply(${1:array}, ${2:margin}, ${3:function})
+	apply(${1:array}, ${2:margin}, ${0:function})
 snippet lapply
-	lapply(${1:list}, ${2:function})
+	lapply(${1:list}, ${0:function})
 snippet sapply
-	lapply(${1:list}, ${2:function})
+	lapply(${1:list}, ${0:function})
 snippet vapply
-	vapply(${1:list}, ${2:function}, ${3:type})
+	vapply(${1:list}, ${2:function}, ${0:type})
 snippet mapply
-	mapply(${1:function}, ${2:...})
+	mapply(${1:function}, ${0:...})
 snippet tapply
-	tapply(${1:vector}, ${2:index}, ${3:function})
+	tapply(${1:vector}, ${2:index}, ${0:function})
 snippet rapply
-	rapply(${1:list}, ${2:function})
+	rapply(${1:list}, ${0:function})
 
 # plyr functions
 snippet dd
-	ddply(${1:frame}, ${2:variables}, ${3:function})
+	ddply(${1:frame}, ${2:variables}, ${0:function})
 snippet dl
-	dlply(${1:frame}, ${2:variables}, ${3:function})
+	dlply(${1:frame}, ${2:variables}, ${0:function})
 snippet da
-	daply(${1:frame}, ${2:variables}, ${3:function})
+	daply(${1:frame}, ${2:variables}, ${0:function})
 snippet d_
-	d_ply(${1:frame}, ${2:variables}, ${3:function})
+	d_ply(${1:frame}, ${2:variables}, ${0:function})
 
 snippet ad
-	adply(${1:array}, ${2:margin}, ${3:function})
+	adply(${1:array}, ${2:margin}, ${0:function})
 snippet al
-	alply(${1:array}, ${2:margin}, ${3:function})
+	alply(${1:array}, ${2:margin}, ${0:function})
 snippet aa
-	aaply(${1:array}, ${2:margin}, ${3:function})
+	aaply(${1:array}, ${2:margin}, ${0:function})
 snippet a_
-	a_ply(${1:array}, ${2:margin}, ${3:function})
+	a_ply(${1:array}, ${2:margin}, ${0:function})
 
 snippet ld
-	ldply(${1:list}, ${2:function})
+	ldply(${1:list}, ${0:function})
 snippet ll
-	llply(${1:list}, ${2:function})
+	llply(${1:list}, ${0:function})
 snippet la
-	laply(${1:list}, ${2:function})
+	laply(${1:list}, ${0:function})
 snippet l_
-	l_ply(${1:list}, ${2:function})
+	l_ply(${1:list}, ${0:function})
 
 snippet	md
-	mdply(${1:matrix}, ${2:function})
+	mdply(${1:matrix}, ${0:function})
 snippet	ml
-	mlply(${1:matrix}, ${2:function})
+	mlply(${1:matrix}, ${0:function})
 snippet	ma
-	maply(${1:matrix}, ${2:function})
+	maply(${1:matrix}, ${0:function})
 snippet	m_
-	m_ply(${1:matrix}, ${2:function})
+	m_ply(${1:matrix}, ${0:function})
 
 # plot functions
 snippet pl
-	plot(${1:x}, ${2:y})
+	plot(${1:x}, ${0:y})
 snippet ggp
-	ggplot(${1:data}, aes(${2:aesthetics}))
+	ggplot(${1:data}, aes(${0:aesthetics}))
 snippet img
 	${1:(jpeg,bmp,png,tiff)}(filename="${2:filename}", width=${3}, height=${4}, unit="${5}")
-	${6:plot}
+	${0:plot}
 	dev.off()
 
 # statistical test functions
 snippet fis
-	fisher.test(${1:x}, ${2:y})
+	fisher.test(${1:x}, ${0:y})
 snippet chi
-	chisq.test(${1:x}, ${2:y})
+	chisq.test(${1:x}, ${0:y})
 snippet tt
-	t.test(${1:x}, ${2:y})
+	t.test(${1:x}, ${0:y})
 snippet wil
-	wilcox.test(${1:x}, ${2:y})
+	wilcox.test(${1:x}, ${0:y})
 snippet cor
-	cor.test(${1:x}, ${2:y})
+	cor.test(${1:x}, ${0:y})
 snippet fte
-	var.test(${1:x}, ${2:y})
+	var.test(${1:x}, ${0:y})
 snippet kvt
-	kv.test(${1:x}, ${2:y})
+	kv.test(${1:x}, ${0:y})
diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index 6cb799228..f4d99d7ad 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -1,69 +1,69 @@
 # rst
 
 snippet :
-	:${1:field name}: ${2:field body}
+	:${1:field name}: ${0:field body}
 snippet *
-	*${1:Emphasis}* ${2}
+	*${1:Emphasis}* ${0}
 snippet **
-	**${1:Strong emphasis}** ${2}
+	**${1:Strong emphasis}** ${0}
 snippet _
 	\`${1:hyperlink-name}\`_
-	.. _\`$1\`: ${2:link-block}
+	.. _\`$1\`: ${0:link-block}
 snippet =
 	${1:Title}
 	=====${2:=}
-	${3}
+	${0}
 snippet -
 	${1:Title}
 	-----${2:-}
-	${3}
+	${0}
 #some directive
 snippet img:
-	.. |${2:alias}| image:: ${1:img}
+	.. |${0:alias}| image:: ${1:img}
 snippet fig:
 	.. figure:: ${1:img}
-		:alt: ${2:alter text}
+		:alt: ${0:alter text}
 
 		$2
 snippet cont:
 	.. contents::
-		${1:content}
+		${0:content}
 snippet code:
 	.. code:: ${1:type}
 
-		${2:write some code}
+		${0:write some code}
 snippet tip:
 	.. tip::
-		${1:my tips}
+		${0:my tips}
 snippet not:
 	.. note::
-		${1:my notes}
+		${0:my notes}
 snippet	war:
 	.. warning::
-		${1:attention!}
+		${0:attention!}
 snippet imp:
 	.. important::
-		${1:this is importatnt}
+		${0:this is importatnt}
 snippet att:
 	.. attention::
-		${1:hey!}
+		${0:hey!}
 snippet dan:
 	.. danger::
-		${1:ah!}
+		${0:ah!}
 snippet err:
 	.. error::
-		${1:Error occur}
+		${0:Error occur}
 snippet cau:
 	.. caution::
-		${1:Watch out!}
+		${0:Watch out!}
 #Spinx only
 snippet sid:
 	.. sidebar:: ${1:Title}
 
-		${2}
+		${0}
 # CJK optimize, CJK has no space between charaters
 snippet *c
-	\ *${1:Emphasis}*\ ${2}
+	\ *${1:Emphasis}*\ ${0}
 snippet **c
-	\ **${1:Strong emphasis}**\ ${2}
+	\ **${1:Strong emphasis}**\ ${0}
 
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 1da6f3b47..e9d7ba339 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -14,30 +14,30 @@ snippet #!
 # New Block
 snippet =b
 	=begin rdoc
-		${1}
+		${0}
 	=end
 snippet prot
 	protected
 
-	${1}
+	${0}
 snippet priv
 	private
 
-	${1}
+	${0}
 snippet y
-	:yields: ${1:arguments}
+	:yields: ${0:arguments}
 snippet rb
 	#!/usr/bin/env ruby -wKU
 snippet beg
 	begin
-		${3}
+		${0}
 	rescue ${1:Exception} => ${2:e}
 	end
 
 snippet req require
-	require "${1}"${2}
+	require "${1}"
 snippet reqr
-	require_relative "${1}"${2}
+	require_relative "${1}"
 snippet #
 	# =>
 snippet end
@@ -45,77 +45,77 @@ snippet end
 snippet case
 	case ${1:object}
 	when ${2:condition}
-		${3}
+		${0}
 	end
 snippet when
 	when ${1:condition}
-		${2}
+		${0}
 snippet def
 	def ${1:method_name}
-		${2}
+		${0}
 	end
 snippet deft
 	def test_${1:case_name}
-		${2}
+		${0}
 	end
 snippet if
 	if ${1:condition}
-		${2}
+		${0}
 	end
 snippet ife
 	if ${1:condition}
 		${2}
 	else
-		${3}
+		${0}
 	end
 snippet eif
 	elsif ${1:condition}
-		${2}
+		${0}
 snippet unless
 	unless ${1:condition}
-		${2}
+		${0}
 	end
 snippet wh
 	while ${1:condition}
-		${2}
+		${0}
 	end
 snippet for
 	for ${1:e} in ${2:c}
-		${3}
+		${0}
 	end
 snippet until
 	until ${1:condition}
-		${2}
+		${0}
 	end
 snippet cla class .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		${2}
+		${0}
 	end
 snippet cla class .. initialize .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		def initialize(${2:args})
-			${3}
+			${0}
 		end
 	end
 snippet cla class .. < ParentClass .. initialize .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < ${2:ParentClass}
 		def initialize(${3:args})
-			${4}
+			${0}
 		end
 	end
 snippet cla ClassName = Struct .. do .. end
 	${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} = Struct.new(:${2:attr_names}) do
 		def ${3:method_name}
-			${4}
+			${0}
 		end
 	end
 snippet cla class BlankSlate .. initialize .. end
-	class ${1:BlankSlate}
+	class ${0:BlankSlate}
 		instance_methods.each { |meth| undef_method(meth) unless meth =~ /\A__/ }
 	end
 snippet cla class << self .. end
 	class << ${1:self}
-		${2}
+		${0}
 	end
 # class .. < DelegateClass .. initialize .. end
 snippet cla-
@@ -123,23 +123,23 @@ snippet cla-
 		def initialize(${3:args})
 			super(${4:del_obj})
 
-			${5}
+			${0}
 		end
 	end
 snippet mod module .. end
 	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		${2}
+		${0}
 	end
 snippet mod module .. module_function .. end
 	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		module_function
 
-		${2}
+		${0}
 	end
 snippet mod module .. ClassMethods .. end
 	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		module ClassMethods
-			${2}
+			${0}
 		end
 
 		module InstanceMethods
@@ -153,35 +153,35 @@ snippet mod module .. ClassMethods .. end
 	end
 # attr_reader
 snippet r
-	attr_reader :${1:attr_names}
+	attr_reader :${0:attr_names}
 # attr_writer
 snippet w
-	attr_writer :${1:attr_names}
+	attr_writer :${0:attr_names}
 # attr_accessor
 snippet rw
-	attr_accessor :${1:attr_names}
+	attr_accessor :${0:attr_names}
 snippet atp
-	attr_protected :${1:attr_names}
+	attr_protected :${0:attr_names}
 snippet ata
-	attr_accessible :${1:attr_names}
+	attr_accessible :${0:attr_names}
 snippet ana
-	accepts_nested_attributes_for :${1:association}
+	accepts_nested_attributes_for :${0:association}
 # ivc == instance variable cache
 snippet ivc
-	@${1:variable_name} ||= ${2:chached_value}
+	@${1:variable_name} ||= ${0:chached_value}
 # include Enumerable
 snippet Enum
 	include Enumerable
 
 	def each(&block)
-		${1}
+		${0}
 	end
 # include Comparable
 snippet Comp
 	include Comparable
 
 	def <=>(other)
-		${1}
+		${0}
 	end
 # extend Forwardable
 snippet Forw-
@@ -189,234 +189,234 @@ snippet Forw-
 # def self
 snippet defs
 	def self.${1:class_method_name}
-		${2}
+		${0}
 	end
 # def initialize
 snippet definit
 	def initialize(${1:args})
-		${2}
+		${0}
 	end
 # def method_missing
 snippet defmm
 	def method_missing(meth, *args, &blk)
-		${1}
+		${0}
 	end
 snippet defd
-	def_delegator :${1:@del_obj}, :${2:del_meth}, :${3:new_name}
+	def_delegator :${1:@del_obj}, :${2:del_meth}, :${0:new_name}
 snippet defds
-	def_delegators :${1:@del_obj}, :${2:del_methods}
+	def_delegators :${1:@del_obj}, :${0:del_methods}
 snippet am
-	alias_method :${1:new_name}, :${2:old_name}
+	alias_method :${1:new_name}, :${0:old_name}
 snippet app
 	if __FILE__ == $PROGRAM_NAME
-		${1}
+		${0}
 	end
 # usage_if()
 snippet usai
 	if ARGV.${1}
-		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${3}
+		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${0}
 	end
 # usage_unless()
 snippet usau
 	unless ARGV.${1}
-		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${3}
+		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${0}
 	end
 snippet array
-	Array.new(${1:10}) { |${2:i}| ${3} }
+	Array.new(${1:10}) { |${2:i}| ${0} }
 snippet hash
-	Hash.new { |${1:hash}, ${2:key}| $1[$2] = ${3} }
+	Hash.new { |${1:hash}, ${2:key}| $1[$2] = ${0} }
 snippet file File.foreach() { |line| .. }
-	File.foreach(${1:"path/to/file"}) { |${2:line}| ${3} }
+	File.foreach(${1:"path/to/file"}) { |${2:line}| ${0} }
 snippet file File.read()
-	File.read(${1:"path/to/file"})${2}
+	File.read(${1:"path/to/file"})
 snippet Dir Dir.global() { |file| .. }
-	Dir.glob(${1:"dir/glob/*"}) { |${2:file}| ${3} }
+	Dir.glob(${1:"dir/glob/*"}) { |${2:file}| ${0} }
 snippet Dir Dir[".."]
-	Dir[${1:"glob/**/*.rb"}]${2}
+	Dir[${1:"glob/**/*.rb"}]
 snippet dir
 	Filename.dirname(__FILE__)
 snippet deli
-	delete_if { |${1:e}| ${2} }
+	delete_if { |${1:e}| ${0} }
 snippet fil
-	fill(${1:range}) { |${2:i}| ${3} }
+	fill(${1:range}) { |${2:i}| ${0} }
 # flatten_once()
 snippet flao
-	inject(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2)}${3}
+	inject(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2)}
 snippet zip
-	zip(${1:enums}) { |${2:row}| ${3} }
+	zip(${1:enums}) { |${2:row}| ${0} }
 # downto(0) { |n| .. }
 snippet dow
-	downto(${1:0}) { |${2:n}| ${3} }
+	downto(${1:0}) { |${2:n}| ${0} }
 snippet ste
-	step(${1:2}) { |${2:n}| ${3} }
+	step(${1:2}) { |${2:n}| ${0} }
 snippet tim
-	times { |${1:n}| ${2} }
+	times { |${1:n}| ${0} }
 snippet upt
-	upto(${1:1.0/0.0}) { |${2:n}| ${3} }
+	upto(${1:1.0/0.0}) { |${2:n}| ${0} }
 snippet loo
-	loop { ${1} }
+	loop { ${0} }
 snippet ea
-	each { |${1:e}| ${2} }
+	each { |${1:e}| ${0} }
 snippet ead
 	each do |${1:e}|
-		${2}
+		${0}
 	end
 snippet eab
-	each_byte { |${1:byte}| ${2} }
+	each_byte { |${1:byte}| ${0} }
 snippet eac- each_char { |chr| .. }
-	each_char { |${1:chr}| ${2} }
+	each_char { |${1:chr}| ${0} }
 snippet eac- each_cons(..) { |group| .. }
-	each_cons(${1:2}) { |${2:group}| ${3} }
+	each_cons(${1:2}) { |${2:group}| ${0} }
 snippet eai
-	each_index { |${1:i}| ${2} }
+	each_index { |${1:i}| ${0} }
 snippet eaid
 	each_index do |${1:i}|
-		${2}
+		${0}
 	end
 snippet eak
-	each_key { |${1:key}| ${2} }
+	each_key { |${1:key}| ${0} }
 snippet eakd
 	each_key do |${1:key}|
-		${2}
+		${0}
 	end
 snippet eal
-	each_line { |${1:line}| ${2} }
+	each_line { |${1:line}| ${0} }
 snippet eald
 	each_line do |${1:line}|
-		${2}
+		${0}
 	end
 snippet eap
-	each_pair { |${1:name}, ${2:val}| ${3} }
+	each_pair { |${1:name}, ${2:val}| ${0} }
 snippet eapd
 	each_pair do |${1:name}, ${2:val}|
-		${3}
+		${0}
 	end
 snippet eas-
-	each_slice(${1:2}) { |${2:group}| ${3} }
+	each_slice(${1:2}) { |${2:group}| ${0} }
 snippet easd-
 	each_slice(${1:2}) do |${2:group}|
-		${3}
+		${0}
 	end
 snippet eav
-	each_value { |${1:val}| ${2} }
+	each_value { |${1:val}| ${0} }
 snippet eavd
 	each_value do |${1:val}|
-		${2}
+		${0}
 	end
 snippet eawi
-	each_with_index { |${1:e}, ${2:i}| ${3} }
+	each_with_index { |${1:e}, ${2:i}| ${0} }
 snippet eawid
 	each_with_index do |${1:e}, ${2:i}|
-		${3}
+		${0}
 	end
 snippet eawo
-	each_with_object(${1:init}) { |${2:e}, ${3:var}| ${4} }
+	each_with_object(${1:init}) { |${2:e}, ${3:var}| ${0} }
 snippet eawod
 	each_with_object(${1:init}) do |${2:e}, ${3:var}|
-		${4}
+		${0}
 	end
 snippet reve
-	reverse_each { |${1:e}| ${2} }
+	reverse_each { |${1:e}| ${0} }
 snippet reved
 	reverse_each do |${1:e}|
-		${2}
+		${0}
 	end
 snippet inj
-	inject(${1:init}) { |${2:mem}, ${3:var}| ${4} }
+	inject(${1:init}) { |${2:mem}, ${3:var}| ${0} }
 snippet injd
 	inject(${1:init}) do |${2:mem}, ${3:var}|
-		${4}
+		${0}
 	end
 snippet red
-	reduce(${1:init}) { |${2:mem}, ${3:var}| ${4} }
+	reduce(${1:init}) { |${2:mem}, ${3:var}| ${0} }
 snippet redd
 	reduce(${1:init}) do |${2:mem}, ${3:var}|
-		${4}
+		${0}
 	end
 snippet map
-	map { |${1:e}| ${2} }
+	map { |${1:e}| ${0} }
 snippet mapd
 	map do |${1:e}|
-		${2}
+		${0}
 	end
 snippet mapwi-
-	enum_with_index.map { |${1:e}, ${2:i}| ${3} }
+	enum_with_index.map { |${1:e}, ${2:i}| ${0} }
 snippet sor
-	sort { |a, b| ${1} }
+	sort { |a, b| ${0} }
 snippet sorb
-	sort_by { |${1:e}| ${2} }
+	sort_by { |${1:e}| ${0} }
 snippet ran
 	sort_by { rand }
 snippet all
-	all? { |${1:e}| ${2} }
+	all? { |${1:e}| ${0} }
 snippet any
-	any? { |${1:e}| ${2} }
+	any? { |${1:e}| ${0} }
 snippet cl
-	classify { |${1:e}| ${2} }
+	classify { |${1:e}| ${0} }
 snippet col
-	collect { |${1:e}| ${2} }
+	collect { |${1:e}| ${0} }
 snippet cold
 	collect do |${1:e}|
-		${2}
+		${0}
 	end
 snippet det
-	detect { |${1:e}| ${2} }
+	detect { |${1:e}| ${0} }
 snippet detd
 	detect do |${1:e}|
-		${2}
+		${0}
 	end
 snippet fet
-	fetch(${1:name}) { |${2:key}| ${3} }
+	fetch(${1:name}) { |${2:key}| ${0} }
 snippet fin
-	find { |${1:e}| ${2} }
+	find { |${1:e}| ${0} }
 snippet find
 	find do |${1:e}|
-		${2}
+		${0}
 	end
 snippet fina
-	find_all { |${1:e}| ${2} }
+	find_all { |${1:e}| ${0} }
 snippet finad
 	find_all do |${1:e}|
-		${2}
+		${0}
 	end
 snippet gre
-	grep(${1:/pattern/}) { |${2:match}| ${3} }
+	grep(${1:/pattern/}) { |${2:match}| ${0} }
 snippet sub
-	${1:g}sub(${2:/pattern/}) { |${3:match}| ${4} }
+	${1:g}sub(${2:/pattern/}) { |${3:match}| ${0} }
 snippet sca
-	scan(${1:/pattern/}) { |${2:match}| ${3} }
+	scan(${1:/pattern/}) { |${2:match}| ${0} }
 snippet scad
 	scan(${1:/pattern/}) do |${2:match}|
-		${3}
+		${0}
 	end
 snippet max
-	max { |a, b| ${1} }
+	max { |a, b| ${0} }
 snippet min
-	min { |a, b| ${1} }
+	min { |a, b| ${0} }
 snippet par
-	partition { |${1:e}| ${2} }
+	partition { |${1:e}| ${0} }
 snippet pard
 	partition do |${1:e}|
-		${2}
+		${0}
 	end
 snippet rej
-	reject { |${1:e}| ${2} }
+	reject { |${1:e}| ${0} }
 snippet rejd
 	reject do |${1:e}|
-		${2}
+		${0}
 	end
 snippet sel
-	select { |${1:e}| ${2} }
+	select { |${1:e}| ${0} }
 snippet seld
 	select do |${1:e}|
-		${2}
+		${0}
 	end
 snippet lam
-	lambda { |${1:args}| ${2} }
+	lambda { |${1:args}| ${0} }
 # I'm pretty sure that ruby users expect do to expand to do .. end
 snippet do
 	do
-		${1}
+		${0}
 	end
 # this is for one or more variables. typing a ", " is that cheap that it may
 # not be worth adding another snippet. should 0/1 placeholders change order?
@@ -426,29 +426,29 @@ snippet dov
 		${2}
 	end
 snippet :
-	:${1:key} => ${2:"value"}${3}
+	:${1:key} => ${2:"value"}
 snippet ope
-	open(${1:"path/or/url/or/pipe"}, "${2:w}") { |${3:io}| ${4} }
+	open(${1:"path/or/url/or/pipe"}, "${2:w}") { |${3:io}| ${0} }
 # path_from_here()
 snippet fpath
-	File.join(File.dirname(__FILE__), *%2[${1:rel path here}])${2}
+	File.join(File.dirname(__FILE__), *%2[${1:rel path here}])
 # unix_filter {}
 snippet unif
 	ARGF.each_line${1} do |${2:line}|
-		${3}
+		${0}
 	end
 # option_parse {}
 snippet optp
 	require "optparse"
 
-	options = {${1:default => "args"}}
+	options = {${0:default => "args"}}
 
 	ARGV.options do |opts|
 		opts.banner = "Usage: #{File.basename($PROGRAM_NAME)}
 snippet opt
 	opts.on( "-${1:o}", "--${2:long-option-name}", ${3:String},
 	         "${4:Option description.}") do |${5:opt}|
-		${6}
+		${0}
 	end
 snippet tc
 	require "test/unit"
@@ -457,98 +457,98 @@ snippet tc
 
 	class Test${2:$1} < Test::Unit::TestCase
 		def test_${3:case_name}
-			${4}
+			${0}
 		end
 	end
 snippet ts
 	require "test/unit"
 
 	require "tc_${1:test_case_file}"
-	require "tc_${2:test_case_file}"${3}
+	require "tc_${2:test_case_file}"
 snippet as
-	assert ${1:test}, "${2:Failure message.}"${3}
+	assert ${1:test}, "${2:Failure message.}"
 snippet ase
-	assert_equal ${1:expected}, ${2:actual}${3}
+	assert_equal ${1:expected}, ${2:actual}
 snippet asne
-	assert_not_equal ${1:unexpected}, ${2:actual}${3}
+	assert_not_equal ${1:unexpected}, ${2:actual}
 snippet asid
-	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2 ** -20}${4}
+	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2 ** -20}
 snippet asio
-	assert_instance_of ${1:ExpectedClass}, ${2:actual_instance}${3}
+	assert_instance_of ${1:ExpectedClass}, ${2:actual_instance}
 snippet asko
-	assert_kind_of ${1:ExpectedKind}, ${2:actual_instance}${3}
+	assert_kind_of ${1:ExpectedKind}, ${2:actual_instance}
 snippet asn
-	assert_nil ${1:instance}${2}
+	assert_nil ${1:instance}
 snippet asnn
-	assert_not_nil ${1:instance}${2}
+	assert_not_nil ${1:instance}
 snippet asm
-	assert_match /${1:expected_pattern}/, ${2:actual_string}${3}
+	assert_match /${1:expected_pattern}/, ${2:actual_string}
 snippet asnm
-	assert_no_match /${1:unexpected_pattern}/, ${2:actual_string}${3}
+	assert_no_match /${1:unexpected_pattern}/, ${2:actual_string}
 snippet aso
-	assert_operator ${1:left}, :${2:operator}, ${3:right}${4}
+	assert_operator ${1:left}, :${2:operator}, ${3:right}
 snippet asr
-	assert_raise ${1:Exception} { ${2} }
+	assert_raise ${1:Exception} { ${0} }
 snippet asrd
 	assert_raise ${1:Exception} do
-		${2}
+		${0}
 	end
 snippet asnr
-	assert_nothing_raised ${1:Exception} { ${2} }
+	assert_nothing_raised ${1:Exception} { ${0} }
 snippet asnrd
 	assert_nothing_raised ${1:Exception} do
-		${2}
+		${0}
 	end
 snippet asrt
-	assert_respond_to ${1:object}, :${2:method}${3}
+	assert_respond_to ${1:object}, :${2:method}
 snippet ass assert_same(..)
-	assert_same ${1:expected}, ${2:actual}${3}
+	assert_same ${1:expected}, ${2:actual}
 snippet ass assert_send(..)
-	assert_send [${1:object}, :${2:message}, ${3:args}]${4}
+	assert_send [${1:object}, :${2:message}, ${3:args}]
 snippet asns
-	assert_not_same ${1:unexpected}, ${2:actual}${3}
+	assert_not_same ${1:unexpected}, ${2:actual}
 snippet ast
-	assert_throws :${1:expected} { ${2} }
+	assert_throws :${1:expected} { ${0} }
 snippet astd
 	assert_throws :${1:expected} do
-		${2}
+		${0}
 	end
 snippet asnt
-	assert_nothing_thrown { ${1} }
+	assert_nothing_thrown { ${0} }
 snippet asntd
 	assert_nothing_thrown do
-		${1}
+		${0}
 	end
 snippet fl
-	flunk "${1:Failure message.}"${2}
+	flunk "${1:Failure message.}"
 # Benchmark.bmbm do .. end
 snippet bm-
 	TESTS = ${1:10_000}
 	Benchmark.bmbm do |results|
-		${2}
+		${0}
 	end
 snippet rep
-	results.report("${1:name}:") { TESTS.times { ${2} }}
+	results.report("${1:name}:") { TESTS.times { ${0} }}
 # Marshal.dump(.., file)
 snippet Md
-	File.open(${1:"path/to/file.dump"}, "wb") { |${2:file}| Marshal.dump(${3:obj}, $2) }${4}
+	File.open(${1:"path/to/file.dump"}, "wb") { |${2:file}| Marshal.dump(${3:obj}, $2) }
 # Mashal.load(obj)
 snippet Ml
-	File.open(${1:"path/to/file.dump"}, "rb") { |${2:file}| Marshal.load($2) }${3}
+	File.open(${1:"path/to/file.dump"}, "rb") { |${2:file}| Marshal.load($2) }
 # deep_copy(..)
 snippet deec
-	Marshal.load(Marshal.dump(${1:obj_to_copy}))${2}
+	Marshal.load(Marshal.dump(${1:obj_to_copy}))
 snippet Pn-
-	PStore.new(${1:"file_name.pstore"})${2}
+	PStore.new(${1:"file_name.pstore"})
 snippet tra
-	transaction(${1:true}) { ${2} }
+	transaction(${1:true}) { ${0} }
 # xmlread(..)
 snippet xml-
-	REXML::Document.new(File.read(${1:"path/to/file"}))${2}
+	REXML::Document.new(File.read(${1:"path/to/file"}))
 # xpath(..) { .. }
 snippet xpa
 	elements.each(${1:"//Xpath"}) do |${2:node}|
-		${3}
+		${0}
 	end
 # class_from_name()
 snippet clafn
@@ -558,16 +558,16 @@ snippet sinc
 	class << self; self end
 snippet nam
 	namespace :${1:`vim_snippets#Filename()`} do
-		${2}
+		${0}
 	end
 snippet tas
 	desc "${1:Task description}"
 	task :${2:task_name => [:dependent, :tasks]} do
-		${3}
+		${0}
 	end
 # block
 snippet b
-	{ |${1:var}| ${2} }
+	{ |${1:var}| ${0} }
 snippet begin
 	begin
 		raise 'A test exception.'
@@ -591,35 +591,35 @@ snippet pry
 snippet art
 	assert_redirected_to ${1::action => "${2:index}"}
 snippet artnp
-	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1}, ${4:@$2})
+	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1}, ${0:@$2})
 snippet artnpp
-	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1})
+	assert_redirected_to ${1:parent}_${2:child}_path(${0:@$1})
 snippet artp
-	assert_redirected_to ${1:model}_path(${2:@$1})
+	assert_redirected_to ${1:model}_path(${0:@$1})
 snippet artpp
-	assert_redirected_to ${1:model}s_path
+	assert_redirected_to ${0:model}s_path
 snippet asd
 	assert_difference "${1:Model}.${2:count}", ${3:1} do
-		${4}
+		${0}
 	end
 snippet asnd
 	assert_no_difference "${1:Model}.${2:count}" do
-		${3}
+		${0}
 	end
 snippet asre
-	assert_response :${1:success}, @response.body${2}
+	assert_response :${1:success}, @response.body
 snippet asrj
-	assert_rjs :${1:replace}, "${2:dom id}"
+	assert_rjs :${1:replace}, "${0:dom id}"
 snippet ass assert_select(..)
 	assert_select '${1:path}', :${2:text} => '${3:inner_html' ${4:do}
 snippet bf
-	before_filter :${1:method}
+	before_filter :${0:method}
 snippet bt
-	belongs_to :${1:association}
+	belongs_to :${0:association}
 snippet btp
-	belongs_to :${1:association}, :polymorphic => true${2}
+	belongs_to :${1:association}, :polymorphic => true
 snippet crw
-	cattr_accessor :${1:attr_names}
+	cattr_accessor :${0:attr_names}
 snippet defcreate
 	def create
 		@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])
@@ -634,7 +634,7 @@ snippet defcreate
 				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
 			end
 		end
-	end${3}
+	end
 snippet defdestroy
 	def destroy
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
@@ -644,10 +644,10 @@ snippet defdestroy
 			format.html { redirect_to($1s_url) }
 			format.xml  { head :ok }
 		end
-	end${3}
+	end
 snippet defedit
 	def edit
-		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
+		@${1:model_class_name} = ${0:ModelClassName}.find(params[:id])
 	end
 snippet defindex
 	def index
@@ -657,7 +657,7 @@ snippet defindex
 			format.html # index.html.erb
 			format.xml  { render :xml => @$1s }
 		end
-	end${3}
+	end
 snippet defnew
 	def new
 		@${1:model_class_name} = ${2:ModelClassName}.new
@@ -666,7 +666,7 @@ snippet defnew
 			format.html # new.html.erb
 			format.xml  { render :xml => @$1 }
 		end
-	end${3}
+	end
 snippet defshow
 	def show
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
@@ -675,7 +675,7 @@ snippet defshow
 			format.html # show.html.erb
 			format.xml  { render :xml => @$1 }
 		end
-	end${3}
+	end
 snippet defupdate
 	def update
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
@@ -690,134 +690,134 @@ snippet defupdate
 				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
 			end
 		end
-	end${3}
+	end
 snippet dele delegate .. to
-	delegate :${1:methods}, :to => :${2:object}
+	delegate :${1:methods}, :to => :${0:object}
 snippet dele delegate .. to .. prefix .. allow_nil
-	delegate :${1:methods}, :to => :${2:object}, :prefix => :${3:prefix}, :allow_nil => ${4:allow_nil}
+	delegate :${1:methods}, :to => :${2:object}, :prefix => :${3:prefix}, :allow_nil => ${0:allow_nil}
 snippet flash
-	flash[:${1:notice}] = "${2}"
+	flash[:${1:notice}] = "${0}"
 snippet habtm
-	has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"${4}
+	has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"
 snippet hm
-	has_many :${1:object}
+	has_many :${0:object}
 snippet hmd
-	has_many :${1:other}s, :class_name => "${2:$1}", :foreign_key => "${3:$1}_id", :dependent => :destroy${4}
+	has_many :${1:other}s, :class_name => "${2:$1}", :foreign_key => "${3:$1}_id", :dependent => :destroy
 snippet hmt
-	has_many :${1:object}, :through => :${2:object}
+	has_many :${1:object}, :through => :${0:object}
 snippet ho
-	has_one :${1:object}
+	has_one :${0:object}
 snippet hod
-	has_one :${1:object}, dependent: :${2:destroy}
+	has_one :${1:object}, dependent: :${0:destroy}
 snippet i18
-	I18n.t('${1:type.key}')${2}
+	I18n.t('${1:type.key}')
 snippet ist
-	<%= image_submit_tag("${1:agree.png}", :id => "${2:id}"${3} %>
+	<%= image_submit_tag("${1:agree.png}", :id => "${2:id}"${0} %>
 snippet log
-	Rails.logger.${1:debug} ${2}
+	Rails.logger.${1:debug} ${0}
 snippet log2
-	RAILS_DEFAULT_LOGGER.${1:debug} ${2}
+	RAILS_DEFAULT_LOGGER.${1:debug} ${0}
 snippet logd
-	logger.debug { "${1:message}" }${2}
+	logger.debug { "${1:message}" }
 snippet loge
-	logger.error { "${1:message}" }${2}
+	logger.error { "${1:message}" }
 snippet logf
-	logger.fatal { "${1:message}" }${2}
+	logger.fatal { "${1:message}" }
 snippet logi
-	logger.info { "${1:message}" }${2}
+	logger.info { "${1:message}" }
 snippet logw
-	logger.warn { "${1:message}" }${2}
+	logger.warn { "${1:message}" }
 snippet mapc
-	${1:map}.${2:connect} '${3:controller/:action/:id}'
+	${1:map}.${2:connect} '${0:controller/:action/:id}'
 snippet mapca
-	${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"${5}
+	${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"
 snippet mapr
-	${1:map}.resource :${2:resource}
+	${1:map}.resource :${0:resource}
 snippet maprs
-	${1:map}.resources :${2:resource}
+	${1:map}.resources :${0:resource}
 snippet mapwo
 	${1:map}.with_options :${2:controller} => '${3:thing}' do |$3|
-		${4}
+		${0}
 	end
 snippet mbs
-	before_save :${1:method}
+	before_save :${0:method}
 snippet mcht
 	change_table :${1:table_name} do |t|
-		${2}
+		${0}
 	end
 snippet mp
-	map(&:${1:id})
+	map(&:${0:id})
 snippet mrw
-	mattr_accessor :${1:attr_names}
+	mattr_accessor :${0:attr_names}
 snippet oa
-	order("${1:field}")
+	order("${0:field}")
 snippet od
-	order("${1:field} DESC")
+	order("${0:field} DESC")
 snippet pa
-	params[:${1:id}]${2}
+	params[:${1:id}]
 snippet ra
-	render :action => "${1:action}"
+	render :action => "${0:action}"
 snippet ral
-	render :action => "${1:action}", :layout => "${2:layoutname}"
+	render :action => "${1:action}", :layout => "${0:layoutname}"
 snippet rest
 	respond_to do |format|
-		format.${1:html} { ${2} }
+		format.${1:html} { ${0} }
 	end
 snippet rf
-	render :file => "${1:filepath}"
+	render :file => "${0:filepath}"
 snippet rfu
-	render :file => "${1:filepath}", :use_full_path => ${2:false}
+	render :file => "${1:filepath}", :use_full_path => ${0:false}
 snippet ri
-	render :inline => "${1:<%= 'hello' %>}"
+	render :inline => "${0:<%= 'hello' %>}"
 snippet ril
-	render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"${4} }
+	render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"${0} }
 snippet rit
-	render :inline => "${1:<%= 'hello' %>}", :type => ${2::rxml}
+	render :inline => "${1:<%= 'hello' %>}", :type => ${0::rxml}
 snippet rjson
-	render :json => ${1:text to render}
+	render :json => ${0:text to render}
 snippet rl
-	render :layout => "${1:layoutname}"
+	render :layout => "${0:layoutname}"
 snippet rn
-	render :nothing => ${1:true}
+	render :nothing => ${0:true}
 snippet rns
-	render :nothing => ${1:true}, :status => ${2:401}
+	render :nothing => ${1:true}, :status => ${0:401}
 snippet rp
-	render :partial => "${1:item}"
+	render :partial => "${0:item}"
 snippet rpc
-	render :partial => "${1:item}", :collection => ${2:@$1s}
+	render :partial => "${1:item}", :collection => ${0:@$1s}
 snippet rpl
-	render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}
+	render :partial => "${1:item}", :locals => { :${2:$1} => ${0:@$1}
 snippet rpo
-	render :partial => "${1:item}", :object => ${2:@$1}
+	render :partial => "${1:item}", :object => ${0:@$1}
 snippet rps
-	render :partial => "${1:item}", :status => ${2:500}
+	render :partial => "${1:item}", :status => ${0:500}
 snippet rt
-	render :text => "${1:text to render}"
+	render :text => "${0:text to render}"
 snippet rtl
-	render :text => "${1:text to render}", :layout => "${2:layoutname}"
+	render :text => "${1:text to render}", :layout => "${0:layoutname}"
 snippet rtlt
-	render :text => "${1:text to render}", :layout => ${2:true}
+	render :text => "${1:text to render}", :layout => ${0:true}
 snippet rts
-	render :text => "${1:text to render}", :status => ${2:401}
+	render :text => "${1:text to render}", :status => ${0:401}
 snippet ru
 	render :update do |${1:page}|
-		$1.${2}
+		$1.${0}
 	end
 snippet rxml
-	render :xml => ${1:text to render}
+	render :xml => ${0:text to render}
 snippet sc
-	scope :${1:name}, -> { where(${2:field}: ${3:value}) }
+	scope :${1:name}, -> { where(${2:field}: ${0:value}) }
 snippet sl
 	scope :${1:name}, lambda do |${2:value}|
-		where("${3:field = ?}", ${4:bind var})
+		where("${3:field = ?}", ${0:bind var})
 	end
 snippet sha1
-	Digest::SHA1.hexdigest(${1:string})
+	Digest::SHA1.hexdigest(${0:string})
 snippet sweeper
 	class ${1:ModelClassName}Sweeper < ActionController::Caching::Sweeper
 		observe $1
 
-		def after_save(${2:model_class_name})
+		def after_save(${0:model_class_name})
 			expire_cache($2)
 		end
 
@@ -830,66 +830,66 @@ snippet sweeper
 		end
 	end
 snippet va validates_associated
-	validates_associated :${1:attribute}
+	validates_associated :${0:attribute}
 snippet va validates .., :acceptance => true
-	validates :${1:terms}, :acceptance => true
+	validates :${0:terms}, :acceptance => true
 snippet vc
-	validates :${1:attribute}, :confirmation => true
+	validates :${0:attribute}, :confirmation => true
 snippet ve
-	validates :${1:attribute}, :exclusion => { :in => ${2:%w( mov avi )} }
+	validates :${1:attribute}, :exclusion => { :in => ${0:%w( mov avi )} }
 snippet vf
-	validates :${1:attribute}, :format => { :with => /${2:regex}/ }
+	validates :${1:attribute}, :format => { :with => /${0:regex}/ }
 snippet vi
-	validates :${1:attribute}, :inclusion => { :in => %w(${2: mov avi }) }
+	validates :${1:attribute}, :inclusion => { :in => %w(${0: mov avi }) }
 snippet vl
-	validates :${1:attribute}, :length => { :in => ${2:3}..${3:20} }
+	validates :${1:attribute}, :length => { :in => ${2:3}..${0:20} }
 snippet vn
-	validates :${1:attribute}, :numericality => true
+	validates :${0:attribute}, :numericality => true
 snippet vp
-	validates :${1:attribute}, :presence => true
+	validates :${0:attribute}, :presence => true
 snippet vu
-	validates :${1:attribute}, :uniqueness => true
+	validates :${0:attribute}, :uniqueness => true
 snippet format
-	format.${1:js|xml|html} { ${2} }
+	format.${1:js|xml|html} { ${0} }
 snippet wc
-	where(${1:"conditions"}${2:, bind_var})
+	where(${1:"conditions"}${0:, bind_var})
 snippet wf
-	where(${1:field} => ${2:value})
+	where(${1:field} => ${0:value})
 snippet xdelete
-	xhr :delete, :${1:destroy}, :id => ${2:1}${3}
+	xhr :delete, :${1:destroy}, :id => ${2:1}
 snippet xget
-	xhr :get, :${1:show}, :id => ${2:1}${3}
+	xhr :get, :${1:show}, :id => ${2:1}
 snippet xpost
-	xhr :post, :${1:create}, :${2:object} => { ${3} }
+	xhr :post, :${1:create}, :${2:object} => { ${0} }
 snippet xput
-	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }${5}
+	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }
 snippet test
 	test "should ${1:do something}" do
-		${2}
+		${0}
 	end
 ###########################
 #   migrations snippets   #
 ###########################
 snippet mac
-	add_column :${1:table_name}, :${2:column_name}, :${3:data_type}
+	add_column :${1:table_name}, :${2:column_name}, :${0:data_type}
 snippet mai
-	add_index :${1:table_name}, :${2:column_name}
+	add_index :${1:table_name}, :${0:column_name}
 snippet mrc
-	remove_column :${1:table_name}, :${2:column_name}
+	remove_column :${1:table_name}, :${0:column_name}
 snippet mrnc
-	rename_column :${1:table_name}, :${2:old_column_name}, :${3:new_column_name}
+	rename_column :${1:table_name}, :${2:old_column_name}, :${0:new_column_name}
 snippet mcc
-	change_column :${1:table}, :${2:column}, :${3:type}
+	change_column :${1:table}, :${2:column}, :${0:type}
 snippet mnc
-	t.${1:string} :${2:title}${3:, null: false}${4}
+	t.${1:string} :${2:title}${3:, null: false}
 snippet mct
 	create_table :${1:table_name} do |t|
-		${2}
+		${0}
 	end
 snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
 	class ${1:class_name} < ActiveRecord::Migration
 		def up
-			${2}
+			${0}
 		end
 
 		def down
@@ -898,180 +898,180 @@ snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. en
 snippet migration class .. < ActiveRecord::Migration .. def change .. end
 	class ${1:class_name} < ActiveRecord::Migration
 		def change
-			${2}
+			${0}
 		end
 	end
 snippet trc
-	t.remove :${1:column}
+	t.remove :${0:column}
 snippet tre
 	t.rename :${1:old_column_name}, :${2:new_column_name}
-	${3}
+	${0}
 snippet tref
-	t.references :${1:model}
+	t.references :${0:model}
 snippet tcb
 	t.boolean :${1:title}
-	${2}
+	${0}
 snippet tcbi
 	t.binary :${1:title}, :limit => ${2:2}.megabytes
-	${3}
+	${0}
 snippet tcd
 	t.decimal :${1:title}, :precision => ${2:10}, :scale => ${3:2}
-	${4}
+	${0}
 snippet tcda
 	t.date :${1:title}
-	${2}
+	${0}
 snippet tcdt
 	t.datetime :${1:title}
-	${2}
+	${0}
 snippet tcf
 	t.float :${1:title}
-	${2}
+	${0}
 snippet tch
 	t.change :${1:name}, :${2:string}, :${3:limit} => ${4:80}
-	${5}
+	${0}
 snippet tci
 	t.integer :${1:title}
-	${2}
+	${0}
 snippet tcl
 	t.integer :lock_version, :null => false, :default => 0
-	${1}
+	${0}
 snippet tcr
 	t.references :${1:taggable}, :polymorphic => { :default => '${2:Photo}' }
-	${3}
+	${0}
 snippet tcs
 	t.string :${1:title}
-	${2}
+	${0}
 snippet tct
 	t.text :${1:title}
-	${2}
+	${0}
 snippet tcti
 	t.time :${1:title}
-	${2}
+	${0}
 snippet tcts
 	t.timestamp :${1:title}
-	${2}
+	${0}
 snippet tctss
 	t.timestamps
-	${1}
+	${0}
 ##########################
 #     Rspec snippets     #
 ##########################
 snippet desc
 	describe ${1:class_name} do
-		${2}
+		${0}
 	end
 snippet descm
 	describe "${1:#method}" do
-		${2:pending "Not implemented"}
+		${0:pending "Not implemented"}
 	end
 snippet cont
 	context "${1:message}" do
-		${2}
+		${0}
 	end
 snippet bef
 	before :${1:each} do
-		${2}
+		${0}
 	end
 snippet aft
 	after :${1:each} do
-		${2}
+		${0}
 	end
 snippet let
-	let(:${1:object}) ${2}
+	let(:${1:object}) ${0}
 snippet let!
-	let!(:${1:object}) ${2}
+	let!(:${1:object}) ${0}
 snippet subj
-	subject { ${1} }
+	subject { ${0} }
 snippet s.
-	subject.${1:method}
+	subject.${0:method}
 snippet spec
-	specify { subject.${1} }
+	specify { subject.${0} }
 snippet exp
-	expect { ${1:object} }.to ${2}
+	expect { ${1:object} }.to ${0}
 snippet raise
-	expect { ${1:object} }.to raise_error ${2:StandardError}, /${3:message_regex}/
+	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/
 snippet shared
-	shared_examples ${1:"shared examples name"}
+	shared_examples ${0:"shared examples name"}
 snippet ibl
-	it_behaves_like ${1:"shared examples name"}
+	it_behaves_like ${0:"shared examples name"}
 snippet it
 	it "${1:spec_name}" do
-		${2}
+		${0}
 	end
 snippet its
-	its(:${1:method}) { should ${2} }
+	its(:${1:method}) { should ${0} }
 snippet is
-	it { should ${1} }
+	it { should ${0} }
 snippet isn
-	it { should_not ${1} }
+	it { should_not ${0} }
 #ShouldaMatchers#ActionController
 snippet isfp
-	it { should filter_param :${1:key} }
+	it { should filter_param :${0:key} }
 snippet isrt
-	it { should redirect_to ${1:url} }
+	it { should redirect_to ${0:url} }
 snippet isrtp
-	it { should render_template ${1} }
+	it { should render_template ${0} }
 snippet isrwl
-	it { should render_with_layout ${1} }
+	it { should render_with_layout ${0} }
 snippet isrf
-	it { should rescue_from ${1:exception} }
+	it { should rescue_from ${0:exception} }
 snippet isrw
-	it { should respond_with ${1:status} }
+	it { should respond_with ${0:status} }
 snippet isr
-	it { should route(:${1:method}, '${2:path}') }
+	it { should route(:${1:method}, '${0:path}') }
 snippet isss
-	it { should set_session :${1:key} }
+	it { should set_session :${0:key} }
 snippet issf
-	it { should set_the_flash('${1}') }
+	it { should set_the_flash('${0}') }
 #ShouldaMatchers#ActiveModel
 snippet isama
-	it { should allow_mass_assignment_of :${1} }
+	it { should allow_mass_assignment_of :${0} }
 snippet isav
-	it { should allow_value(${1}).for :${2} }
+	it { should allow_value(${1}).for :${0} }
 snippet isee
-	it { should ensure_exclusion_of :${1} }
+	it { should ensure_exclusion_of :${0} }
 snippet isei
-	it { should ensure_inclusion_of :${1} }
+	it { should ensure_inclusion_of :${0} }
 snippet isel
-	it { should ensure_length_of :${1} }
+	it { should ensure_length_of :${0} }
 snippet isva
-	it { should validate_acceptance_of :${1} }
+	it { should validate_acceptance_of :${0} }
 snippet isvc
-	it { should validate_confirmation_of :${1} }
+	it { should validate_confirmation_of :${0} }
 snippet isvn
-	it { should validate_numericality_of :${1} }
+	it { should validate_numericality_of :${0} }
 snippet isvp
-	it { should validate_presence_of :${1} }
+	it { should validate_presence_of :${0} }
 snippet isvu
-	it { should validate_uniqueness_of :${1} }
+	it { should validate_uniqueness_of :${0} }
 #ShouldaMatchers#ActiveRecord
 snippet isana
-	it { should accept_nested_attributes_for :${1} }
+	it { should accept_nested_attributes_for :${0} }
 snippet isbt
-	it { should belong_to :${1} }
+	it { should belong_to :${0} }
 snippet isbtcc
-	it { should belong_to(:${1}).counter_cache ${2:true} }
+	it { should belong_to(:${1}).counter_cache ${0:true} }
 snippet ishbtm
-	it { should have_and_belong_to_many :${1} }
+	it { should have_and_belong_to_many :${0} }
 snippet isbv
-	it { should be_valid }${1}
+	it { should be_valid }
 snippet ishc
-	it { should have_db_column :${1} }
+	it { should have_db_column :${0} }
 snippet ishi
-	it { should have_db_index :${1} }
+	it { should have_db_index :${0} }
 snippet ishm
-	it { should have_many :${1} }
+	it { should have_many :${0} }
 snippet ishmt
-	it { should have_many(:${1}).through :${2} }
+	it { should have_many(:${1}).through :${0} }
 snippet isho
-	it { should have_one :${1} }
+	it { should have_one :${0} }
 snippet ishro
-	it { should have_readonly_attribute :${1} }
+	it { should have_readonly_attribute :${0} }
 snippet iss
-	it { should serialize :${1} }
+	it { should serialize :${0} }
 snippet isres
-	it { should respond_to :${1} }
+	it { should respond_to :${0} }
 snippet isresw
-	it { should respond_to(:${1}).with(${2}).arguments }
+	it { should respond_to(:${1}).with(${0}).arguments }
 snippet super_call
-	${1:super_class}.instance_method(:${2:method}).bind(self).call
+	${1:super_class}.instance_method(:${0:method}).bind(self).call
diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index 1cbd36815..5eddb2c3c 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -7,45 +7,45 @@
 #if
 snippet if
 	if(${1:obj}) {
-		${2}
+		${0}
 	}
 #if not
 snippet ifn
 	if(!${1:obj}) {
-		${2}
+		${0}
 	}
 #if-else
 snippet ife
 	if(${1:obj}) {
 		${2}
 	} else {
-		${3}
+		${0}
 	}
 #if-else-if
 snippet ifelif
 	if(${1:obj}) {
 		${2}
 	} else if(${3:obj}) {
-		${4}
+		${0}
 	}
 snippet eif
 	else if(${3:obj}) {
-		${4}
+		${0}
 	}
 #while loop
 snippet wh
 	while (${1:obj}) {
-		${2}
+		${0}
 	}
 #for loop(classic)
 snippet for
 	for (${1:item} <- ${2:obj}) {
-		${3}
+		${0}
 	}
 #for loop(indexed)
 snippet fori
 	for (${1:i} <- ${2:0} to ${3:obj}.length) {
-		${4}
+		${0}
 	}
 #exceptions
 snippet try
@@ -55,52 +55,52 @@ snippet try
 		case e: FileNotFoundException => ${2}
 		case e: IOException => ${3}
 	} finally {
-		${4}
+		${0}
 	}
 #match
 snippet match
 	${1: obj} match {
 		case ${2:e} => ${3}
-		case _ => ${4}
+		case _ => ${0}
 	}
 #case
 snippet case
-	case ${1:value} => ${2}
+	case ${1:value} => ${0}
 ############################
 # methods and arguments
 #
 #arg
 snippet arg
-	${1:a}: ${2:T}${3:, arg}
+	${1:a}: ${2:T}${0:, arg}
 #args
 snippet args
-	${1:args}: ${2:T}*
+	${1:args}: ${0:T}*
 #def
 snippet def
-	def ${1:name}(${2:arg}) = ${3:}
+	def ${1:name}(${2:arg}) = ${0:}
 #private def
 snippet prdef
-	private def ${1:name}(${2:arg}) = ${3:}
+	private def ${1:name}(${2:arg}) = ${0:}
 #override def
 snippet ovdef
-	override def ${1:name}(${2:arg}) = ${3:}
+	override def ${1:name}(${2:arg}) = ${0:}
 #first class function(see scalabook p 188)
 snippet fcf
-	(${1:a}: ${2:T}) => $1 ${3}
+	(${1:a}: ${2:T}) => $1 ${0}
 snippet =>
-	${1:name} => ${2}
+	${1:name} => ${0}
 #recursion
 snippet rec
-	def ${1:name}(${2:arg}) =
+	def ${1:name}(${0:arg}) =
 		if($2) $2
 		else $1($2)
 #curried method
 snippet crdef
-	def ${1:name}(${2:arg})(${3:arg}) = ${4:}
+	def ${1:name}(${2:arg})(${3:arg}) = ${0:}
 #main method
 #check validity of T
 snippet main
-	def main(args: Array[String]):${1:T} = ${2:}
+	def main(args: Array[String]):${1:T} = ${0:}
 ############################
 # basic types(general purpose)
 # you might want to use basic types snippets
@@ -165,30 +165,30 @@ snippet chr
 snippet lng
 	Long
 snippet arr
-	Array${1:[T]}${2:()}
+	Array${1:[T]}${0:()}
 snippet buf
-	Buffer${1:[T]}${2:()}
+	Buffer${1:[T]}${0:()}
 snippet list
-	List${1:[T]}${2:()}
+	List${1:[T]}${0:()}
 snippet tpl
-	Tuple${1:2}[${2:T},${3:T}]
+	Tuple${1:2}[${2:T},${0:T}]
 snippet set
-	Set${1:[T]}${2:()}
+	Set${1:[T]}${0:()}
 snippet hset
-	HashSet${1:[T]}${2:()}
+	HashSet${1:[T]}${0:()}
 snippet mhset
-	mutable.HashSet${1:[T]}${2:()}
+	mutable.HashSet${1:[T]}${0:()}
 #for maps
 snippet keyval
-	${1:key}->${2:val}${3:, keyval}
+	${1:key}->${2:val}${0:, keyval}
 snippet map
-	Map[${1:T},${2:T}]${3:(keyval)}
+	Map[${1:T},${2:T}]${0:(keyval)}
 snippet hmap
-	HashMap[${1:T},${2:T}]${3:(keyval)}
+	HashMap[${1:T},${2:T}]${0:(keyval)}
 snippet mmap
-	mutable.Map[${1:T},${2:T}]${3:(keyval)}
+	mutable.Map[${1:T},${2:T}]${0:(keyval)}
 snippet mhmap
-	mutable.HashMap[${1:T},${2:T}]${3:(keyval)}
+	mutable.HashMap[${1:T},${2:T}]${0:(keyval)}
 #TODO add TreeMap and TreeSet
 #asInstanceOf[]
 snippet as
@@ -200,61 +200,61 @@ snippet as
 
 #scope() with one arg
 snippet (a
-	(${1:a} => ${2})
+	(${1:a} => ${0})
 #scope() with two args
 snippet {(
 	{(${1:a},${2:b}) =>
-		${3}
+		${0}
 	}
 #filter
 snippet filter
-	${1:name}.filter (a
+	${0:name}.filter (a
 #map function
 snippet mapf
-	${1:name}.map (a
+	${0:name}.map (a
 #flatmap
 snippet flatmap
-	${1:name}.flatMap${2:[T]}(a
+	${1:name}.flatMap${0:[T]}(a
 #fold left
 snippet fldl
-	${1:name}.foldLeft(${2:first}) {(
+	${1:name}.foldLeft(${0:first}) {(
 #fold right
 snippet fldr
-	${1:name}.foldRight(${2:first}) {(
+	${1:name}.foldRight(${0:first}) {(
 #fold left operator(if u wanna reduce readability of ur code)
 #use wildcard symbols
 snippet /:
-	(${1:first}/:${2:name})(${3})
+	(${1:first}/:${2:name})(${0})
 #fold right operator
 snippet :\
-	(${1:first}:\${2:name})(${3})
+	(${1:first}:\${2:name})(${0})
 #reduce left
 snippet redl
-	${1:name}.reduceLeft[${2:T}] {(
+	${1:name}.reduceLeft[${0:T}] {(
 #reduce right
 snippet redr
-	${1:name}.reduceRight[${2:T}] {(
+	${1:name}.reduceRight[${0:T}] {(
 #zipWithIndex(safe way).
 #see http://daily-scala.blogspot.com/2010/05/zipwithindex.html
 snippet zipwi
-	${1:name}.view.zipWithIndex
+	${0:name}.view.zipWithIndex
 #split
 snippet spl
-	${1:name}.split("${2:,}")
+	${1:name}.split("${0:,}")
 #end
 snippet val
-	val ${1:name}${2:: T} = ${3:value}
+	val ${1:name}${2:: T} = ${0:value}
 snippet var
-	var ${1:name}${2:: T} = ${3:value}
+	var ${1:name}${2:: T} = ${0:value}
 ############################
 # classes
 #
 #extends
 snippet extends
-	extends ${1:what}
+	extends ${0:what}
 #with
 snippet with
-	with ${1:what}${2: with}
+	with ${1:what}${0: with}
 #auxiliary constructor(a. this)
 snippet athis
 	def this(arg) = this(arg)
@@ -262,63 +262,63 @@ snippet athis
 snippet abstract
 	abstract class ${1:name}${2:(arg)}${3: extends }${4: with} {
 		${5:override def toString = "$1"}
-		${6}
+		${0}
 	}
 #class
 snippet class
 	class ${1:name}${2:(arg)}${3: extends }${4: with} {
 		${5:override def toString = "$1"}
-		${6}
+		${0}
 	}
 #object
 snippet object
-	object ${1:name}${2:(arg)}${3: extends }${4: with} ${5:}
+	object ${1:name}${2:(arg)}${3: extends }${4: with} ${0:}
 #trait
 snippet trait
 	trait ${1:name}${2: extends }${3: with} {
-		${4:}
+		${0:}
 	}
 #class with trait Ordered(page 265)
 snippet ordered
 	class ${1:name}${2:(arg)} extends Ordered[$1] ${3: with} {
 		${4:override def toString = "$1"}
 		def compare(that: $1) = ${5:this - that}
-		${6}
+		${0}
 	}
 #case class
 snippet casecl
-	case class ${1:name}${2:(arg)}${3: extends }${4: with} ${5:}
+	case class ${1:name}${2:(arg)}${3: extends }${4: with} ${0:}
 ############################
 # testing
 #
 #scalatest imports
 snippet scalatest
 	${1:import org.scalatest.Suite}
-	${2:import org.scalatest.FunSuite}
+	${0:import org.scalatest.FunSuite}
 #assert
 snippet assert
-	assert(${1:a}==${2:b})
+	assert(${1:a}==${0:b})
 #ensuring(p 296)
 snippet ensuring
-	ifel ensuring(${1:a}==${2:b})
+	ifel ensuring(${1:a}==${0:b})
 #expect
 snippet expect
-	expect(${1:what}) {
+	expect(${0:what}) {
 #intercept
 snippet intercept
-	intercept[${1:IllegalArgumentException}] {
+	intercept[${0:IllegalArgumentException}] {
 #test
 snippet test
-	test("${1:description}") {
+	test("${0:description}") {
 #suite
 snippet suite
-	class ${1:name} extends Suite {
+	class ${0:name} extends Suite {
 		def test() {
 	}
 #funsuite
 snippet fsuite
 	class ${1:name} extends FunSuite {
-		test("${2:description}") {
+		test("${0:description}") {
 	}
 ############################
 # SBT
@@ -327,7 +327,7 @@ snippet webproject
 	import sbt._
 
 	class ${1:Name}(info: ProjectInfo) extends DefaultWebProject(info) {
-		val liftVersion = "${2:2.3}"
+		val liftVersion = "${0:2.3}"
 
 		override def libraryDependencies = Set(
 
@@ -337,9 +337,9 @@ snippet webproject
 	}
 #depencies
 snippet liftjar
-	"net.liftweb" %% "${1:lib}" % liftVersion % "compile->default",
+	"net.liftweb" %% "${0:lib}" % liftVersion % "compile->default",
 snippet jettyjar
-	"org.mortbay.jetty" % "jetty" % "${1:version}" % "test->default",
+	"org.mortbay.jetty" % "jetty" % "${0:version}" % "test->default",
 ############################
 # Lift
 #
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index e2853b64a..8b03e0c66 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -4,38 +4,38 @@ snippet #!
 
 snippet if
 	if [[ ${1:condition} ]]; then
-		${2:#statements}
+		${0:#statements}
 	fi
 snippet elif
 	elif [[ ${1:condition} ]]; then
-		${2:#statements}
+		${0:#statements}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
-		${3:#statements}
+		${0:#statements}
 	done
 snippet fori
 	for ${1:needle} in ${2:haystack} ; do
-		${3:#statements}
+		${0:#statements}
 	done
 snippet wh
 	while [[ ${1:condition} ]]; do
-		${2:#statements}
+		${0:#statements}
 	done
 snippet until
 	until [[ ${1:condition} ]]; do
-		${2:#statements}
+		${0:#statements}
 	done
 snippet case
 	case ${1:word} in
 		${2:pattern})
-			${3};;
+			${0};;
 	esac
 snippet go
 	while getopts '${1:o}' ${2:opts}
 	do
 		case $$2 in
 		${3:o0})
-			${4:#staments};;
+			${0:#staments};;
 		esac
 	done
 # Set SCRIPT_DIR variable to directory script is located.
diff --git a/snippets/snippets.snippets b/snippets/snippets.snippets
index 4223fa394..a97c01698 100644
--- a/snippets/snippets.snippets
+++ b/snippets/snippets.snippets
@@ -1,9 +1,9 @@
 # snippets for making snippets :)
 snippet snip
 	snippet ${1:trigger}
-		${2}
+		${0}
 snippet msnip
 	snippet ${1:trigger} ${2:description}
-		${3}
+		${0}
 snippet v
 	{VISUAL}
diff --git a/snippets/sql.snippets b/snippets/sql.snippets
index eb4b37caf..556fae0a8 100644
--- a/snippets/sql.snippets
+++ b/snippets/sql.snippets
@@ -1,26 +1,26 @@
 snippet tbl
 	create table ${1:table} (
-		${2:columns}
+		${0:columns}
 	);
 snippet col
-	${1:name}	${2:type}	${3:default ''}	${4:not null}
+	${1:name}	${2:type}	${3:default ''}	${0:not null}
 snippet ccol
-	${1:name}	varchar2(${2:size})	${3:default ''}	${4:not null}
+	${1:name}	varchar2(${2:size})	${3:default ''}	${0:not null}
 snippet ncol
-	${1:name}	number	${3:default 0}	${4:not null}
+	${1:name}	number	${3:default 0}	${0:not null}
 snippet dcol
-	${1:name}	date	${3:default sysdate}	${4:not null}
+	${1:name}	date	${3:default sysdate}	${0:not null}
 snippet ind
-	create index ${3:$1_$2} on ${1:table}(${2:column});
+	create index ${0:$1_$2} on ${1:table}(${2:column});
 snippet uind
-	create unique index ${1:name} on ${2:table}(${3:column});
+	create unique index ${1:name} on ${2:table}(${0:column});
 snippet tblcom
-	comment on table ${1:table} is '${2:comment}';
+	comment on table ${1:table} is '${0:comment}';
 snippet colcom
-	comment on column ${1:table}.${2:column} is '${3:comment}';
+	comment on column ${1:table}.${2:column} is '${0:comment}';
 snippet addcol
-	alter table ${1:table} add (${2:column} ${3:type});
+	alter table ${1:table} add (${2:column} ${0:type});
 snippet seq
-	create sequence ${1:name} start with ${2:1} increment by ${3:1} minvalue ${4:1};
+	create sequence ${1:name} start with ${2:1} increment by ${3:1} minvalue ${0:1};
 snippet s*
-	select * from ${1:table}
+	select * from ${0:table}
diff --git a/snippets/tcl.snippets b/snippets/tcl.snippets
index 8c0674e4e..9da703ceb 100644
--- a/snippets/tcl.snippets
+++ b/snippets/tcl.snippets
@@ -5,26 +5,26 @@ snippet #!
 # Process
 snippet pro
 	proc ${1:function_name} {${2:args}} {
-		${3}
+		${0}
 	}
 #xif
 snippet xif
-	${1:expr}? ${2:true} : ${3:false}
+	${1:expr}? ${2:true} : ${0:false}
 # Conditional
 snippet if
 	if {${1}} {
-		${2}
+		${0}
 	}
 # Conditional if..else
 snippet ife
 	if {${1}} {
 		${2}
 	} else {
-		${3:# else...}
+		${0:# else...}
 	}
 snippet eif
 	elseif {${1}} {
-		${2}
+		${0}
 	}
 # Conditional if..elsif..else
 snippet ifee
@@ -33,51 +33,51 @@ snippet ifee
 	} elseif {${3}} {
 		${4:# elsif...}
 	} else {
-		${5:# else...}
+		${0:# else...}
 	}
 # If catch then
 snippet ifc
 	if { [catch {${1:#do something...}} ${2:err}] } {
-		${3:# handle failure...}
+		${0:# handle failure...}
 	}
 # Catch
 snippet catch
-	catch {${1}} ${2:err} ${3:options}
+	catch {${1}} ${2:err} ${0:options}
 # While Loop
 snippet wh
 	while {${1}} {
-		${2}
+		${0}
 	}
 # For Loop
 snippet for
 	for {set ${2:var} 0} {$$2 < ${1:count}} {${3:incr} $2} {
-		${4}
+		${0}
 	}
 # Foreach Loop
 snippet fore
 	foreach ${1:x} {${2:#list}} {
-		${3}
+		${0}
 	}
 # after ms script...
 snippet af
-	after ${1:ms} ${2:#do something}
+	after ${1:ms} ${0:#do something}
 # after cancel id
 snippet afc
-	after cancel ${1:id or script}
+	after cancel ${0:id or script}
 # after idle
 snippet afi
-	after idle ${1:script}
+	after idle ${0:script}
 # after info id
 snippet afin
-	after info ${1:id}
+	after info ${0:id}
 # Expr
 snippet exp
-	expr {${1:#expression here}}
+	expr {${0:#expression here}}
 # Switch
 snippet sw
 	switch ${1:var} {
 		${3:pattern 1} {
-			${4:#do something}
+			${0:#do something}
 		}
 		default {
 			${2:#do something}
@@ -87,10 +87,10 @@ snippet sw
 snippet ca
 	${1:pattern} {
 		${2:#do something}
-	}${3}
+	}
 # Namespace eval
 snippet ns
-	namespace eval ${1:path} {${2:#script...}}
+	namespace eval ${1:path} {${0:#script...}}
 # Namespace current
 snippet nsc
 	namespace current
diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 649e06b7f..f3c090e68 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -1,205 +1,205 @@
 #PREAMBLE
 #newcommand
 snippet nc
-	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}} ${4}
+	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
 #usepackage
 snippet up
-	\usepackage[${1:options}]{${2:package}} ${3}
+	\usepackage[${1:options}]{${2:package}} ${0}
 #newunicodechar
 snippet nuc
-	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${4}
+	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${0}
 #DeclareMathOperator
 snippet dmo
-	\DeclareMathOperator{${1}}{${2}} ${3}
+	\DeclareMathOperator{${1}}{${2}} ${0}
 
 #DOCUMENT
 # \begin{}...\end{}
 snippet begin
 	\begin{${1:env}}
-		${2}
+		${0}
 	\end{$1}
 # Tabular
 snippet tab
 	\begin{${1:tabular}}{${2:c}}
-	${3}
+	${0}
 	\end{$1}
 snippet thm
 	\begin[${1:author}]{${2:thm}}
-	${3}
+	${0}
 	\end{$2}
 snippet center
 	\begin{center}
-		${1}
+		${0}
 	\end{center}
 # Align(ed)
 snippet ali
 	\begin{align${1:ed}}
-		${2}
+		${0}
 	\end{align$1}
 # Gather(ed)
 snippet gat
 	\begin{gather${1:ed}}
-		${2}
+		${0}
 	\end{gather$1}
 # Equation
 snippet eq
 	\begin{equation}
-		${1}
+		${0}
 	\end{equation}
 # Equation
 snippet eq*
 	\begin{equation*}
-		${1}
+		${0}
 	\end{equation*}
 # Unnumbered Equation
 snippet \
 	\[
-		${1}
+		${0}
 	\]
 # Equation array
 snippet eqnarray
 	\begin{eqnarray}
-		${1}
+		${0}
 	\end{eqnarray}
 # Enumerate
 snippet enum
 	\begin{enumerate}
-		\item ${1}
+		\item ${0}
 	\end{enumerate}
 # Itemize
 snippet itemize
 	\begin{itemize}
-		\item ${1}
+		\item ${0}
 	\end{itemize}
 snippet item
 	\item ${1}
 # Description
 snippet desc
 	\begin{description}
-		\item[${1}] ${2}
+		\item[${1}] ${0}
 	\end{description}
 # Endless new item
 snippet ]i
 	\item ${1}
-	${2:]i}
+	${0:]i}
 # Matrix
 snippet mat
 	\begin{${1:p/b/v/V/B/small}matrix}
-		${2}
+		${0}
 	\end{$1matrix}
 # Cases
 snippet cas
 	\begin{cases}
 		${1:equation}, &\text{ if }${2:case}\\
-		${3}
+		${0}
 	\end{cases}
 # Split
 snippet spl
 	\begin{split}
-		${1}
+		${0}
 	\end{split}
 # Part
 snippet part
 	\part{${1:part name}} % (fold)
 	\label{prt:${2:$1}}
-	${3}
+	${0}
 	% part $2 (end)
 # Chapter
 snippet cha
 	\chapter{${1:chapter name}}
 	\label{cha:${2:$1}}
-	${3}
+	${0}
 # Section
 snippet sec
 	\section{${1:section name}}
 	\label{sec:${2:$1}}
-	${3}
+	${0}
 # Section without number
 snippet sec*
 	\section*{${1:section name}}
 	\label{sec:${2:$1}}
-	${3}
+	${0}
 # Sub Section
 snippet sub
 	\subsection{${1:subsection name}}
 	\label{sub:${2:$1}}
-	${3}
+	${0}
 # Sub Section without number
 snippet sub*
 	\subsection*{${1:subsection name}}
 	\label{sub:${2:$1}}
-	${3}
+	${0}
 # Sub Sub Section
 snippet subs
 	\subsubsection{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
-	${3}
+	${0}
 # Sub Sub Section without number
 snippet subs*
 	\subsubsection*{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
-	${3}
+	${0}
 # Paragraph
 snippet par
 	\paragraph{${1:paragraph name}}
 	\label{par:${2:$1}}
-	${3}
+	${0}
 # Sub Paragraph
 snippet subp
 	\subparagraph{${1:subparagraph name}}
 	\label{subp:${2:$1}}
-	${3}
+	${0}
 snippet ni
 	\noindent
-	${1}
+	${0}
 #References
 snippet itd
-	\item[${1:description}] ${2:item}
+	\item[${1:description}] ${0:item}
 snippet figure
-	${1:Figure}~\ref{${2:fig:}}${3}
+	${1:Figure}~\ref{${2:fig:}}
 snippet table
-	${1:Table}~\ref{${2:tab:}}${3}
+	${1:Table}~\ref{${2:tab:}}
 snippet listing
-	${1:Listing}~\ref{${2:list}}${3}
+	${1:Listing}~\ref{${2:list}}
 snippet section
-	${1:Section}~\ref{sec:${2}} ${3}
+	${1:Section}~\ref{sec:${2}} ${0}
 snippet page
-	${1:page}~\pageref{${2}} ${3}
+	${1:page}~\pageref{${2}} ${0}
 snippet index
-	\index{${1:index}} ${2}
+	\index{${1:index}} ${0}
 #Citations
 snippet citen
-	\cite{$1} ${2}
+	\cite{$1} ${0}
 # bibtex commands
 snippet citep
-	\citep{$1} ${2}
+	\citep{$1} ${0}
 snippet citet
-	\citet{$1} ${2}
+	\citet{$1} ${0}
 snippet cite
-	\cite[${1}]{${2}} ${3}
+	\cite[${1}]{${2}} ${0}
 snippet fcite
-	\footcite[${1}]{${2}}${3}
+	\footcite[${1}]{${2}}${0}
 #Formating text: italic, bold, underline, small capital, emphase ..
 snippet it
-	\textit{${1:text}}
+	\textit{${0:text}}
 snippet bf
-	\textbf{${1:text}}
+	\textbf{${0:text}}
 snippet under
-	\underline{${1:text}}
+	\underline{${0:text}}
 snippet emp
-	\emph{${1:text}}
+	\emph{${0:text}}
 snippet sc
-	\textsc{${1:text}}
+	\textsc{${0:text}}
 #Choosing font
 snippet sf
-	\textsf{${1:text}}
+	\textsf{${0:text}}
 snippet rm
-	\textrm{${1:text}}
+	\textrm{${0:text}}
 snippet tt
-	\texttt{${1:text}}
+	\texttt{${0:text}}
 #misc
 snippet ft
-	\footnote{${1:text}}
+	\footnote{${0:text}}
 snippet fig
 	\begin{figure}
 	\begin{center}
@@ -208,7 +208,7 @@ snippet fig
 	\caption{${3}}
 	\label{fig:${4}}
 	\end{figure}
-	${5}
+	${0}
 snippet tikz
 	\begin{figure}
 	\begin{center}
@@ -219,33 +219,33 @@ snippet tikz
 	\caption{${3}}
 	\label{fig:${4}}
 	\end{figure}
-	${5}
+	${0}
 #math
 snippet stackrel
-	\stackrel{${1:above}}{${2:below}} ${3}
+	\stackrel{${1:above}}{${2:below}} ${0}
 snippet frac
-	\frac{${1:num}}{${2:denom}} ${3}
+	\frac{${1:num}}{${2:denom}} ${0}
 snippet sum
-	\sum^{${1:n}}_{${2:i=1}} ${3}
+	\sum^{${1:n}}_{${2:i=1}} ${0}
 snippet lim
-	\lim_{${1:x \to +\infty}} ${2}
+	\lim_{${1:x \to +\infty}} ${0}
 snippet frame
 	\begin{frame}[<+->]
 		\frametitle{${1:title}}
 
-		${2}
+		${0}
 	\end{frame}
 snippet block
 	\begin{block}{${1:title}}
-	${2}
+	${0}
 	\end{block}
 snippet alert
 	\begin{alertblock}{${1:title}}
-	${2}
+	${0}
 	\end{alertblock}
 snippet example
 	\begin{exampleblock}{${1:title}}
-	${2}
+	${0}
 	\end{exampleblock}
 snippet col2
 	\begin{columns}
@@ -253,6 +253,6 @@ snippet col2
 			${1}
 		\end{column}
 		\begin{column}{0.5\textwidth}
-			${2}
+			${0}
 		\end{column}
 	\end{columns}
diff --git a/snippets/textile.snippets b/snippets/textile.snippets
index 9ad97be5b..1522bad47 100644
--- a/snippets/textile.snippets
+++ b/snippets/textile.snippets
@@ -3,28 +3,28 @@ snippet header
 	---
 	title: ${1:title}
 	layout: post
-	date: ${2:date} ${3:hour:minute:second} -05:00
+	date: ${2:date} ${0:hour:minute:second} -05:00
 	---
 
 # Image
 snippet img
-	!${1:url}(${2:title}):${3:link}!
+	!${1:url}(${2:title}):${0:link}!
 
 # Table
 snippet |
-	|${1}|${2}
+	|${1}|
 
 # Link
 snippet link
-	"${1:link text}":${2:url}
+	"${1:link text}":${0:url}
 
 # Acronym
 snippet (
-	(${1:Expand acronym})${2}
+	(${1:Expand acronym})
 
 # Footnote
 snippet fn
-	[${1:ref number}] ${3}
+	[${1:ref number}] ${0}
 
 	fn$1. ${2:footnote}
 
diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index 6dd502ff8..dd1e65e80 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -2,50 +2,50 @@ snippet header
 	" File: ${1:`expand('%:t')`}
 	" Author: ${2:`g:snips_author`}
 	" Description: ${3}
-	${4:" Last Modified: `strftime("%B %d, %Y")`}
+	${0:" Last Modified: `strftime("%B %d, %Y")`}
 snippet guard
 	if exists('${1:did_`vim_snippets#Filename()`}') || &cp${2: || version < 700}
 		finish
 	endif
-	let $1 = 1${3}
+	let $1 = 1${0}
 snippet f
 	fun! ${1:`expand('%') =~ 'autoload' ? substitute(matchstr(expand('%:p'),'autoload/\zs.*\ze.vim'),'[/\\]','#','g').'#' : ''`}${2:function_name}(${3})
-		${4}
+		${0}
 	endf
 snippet t
 	try
 		${1}
 	catch ${2}
-		${3}
+		${0}
 	endtry
 snippet for
 	for ${1} in ${2}
-		${3}
+		${0}
 	endfor
 snippet forkv
 	for [${1},${2}] in items(${3})
-		${4}
+		${0}
             unlet $1 $2
 	endfor
 
 snippet wh
 	while ${1}
-		${2}
+		${0}
 	endw
 snippet if
 	if ${1}
-		${2}
+		${0}
 	endif
 snippet ife
 	if ${1}
 		${2}
 	else
-		${3}
+		${0}
 	endif
 snippet au
 	augroup ${1:AU_NAME}
 		" this one is which you're most likely to use?
-		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${4}
+		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${0}
 	augroup end
 snippet bun
-	Bundle '${1}'
+	Bundle '${0}'
diff --git a/snippets/xslt.snippets b/snippets/xslt.snippets
index 6e25fd594..700e77d74 100644
--- a/snippets/xslt.snippets
+++ b/snippets/xslt.snippets
@@ -1,23 +1,23 @@
 snippet apply-templates with-param
 	<xsl:apply-templates select="${1:*}">
 		<xsl:with-param name="${2:param}">${3}</xsl:with-param>${4}
-	</xsl:apply-templates>${5}
+	</xsl:apply-templates>
 
 snippet apply-templates sort-by
 	<xsl:apply-templates select="${1:*}">
 		<xsl:sort select="${2:node}" order="${3:ascending}" data-type="${4:text}">${5}
-	</xsl:apply-templates>${6}
+	</xsl:apply-templates>
 
 snippet apply-templates plain
-	<xsl:apply-templates select="${1:*}" />${2}
+	<xsl:apply-templates select="${1:*}" />
 
 snippet attribute blank
-	<xsl:attribute name="${1:name}">${2}</xsl:attribute>${3}
+	<xsl:attribute name="${1:name}">${2}</xsl:attribute>
 
 snippet attribute value-of
 	<xsl:attribute name="${1:name}">
 		<xsl:value-of select="${2:*}" />
-	</xsl:attribute>${3}
+	</xsl:attribute>
 
 snippet call-template
 	<xsl:call-template name="${1:template}" />
@@ -25,73 +25,73 @@ snippet call-template
 snippet call-template with-param
 	<xsl:call-template name="${1:template}">
 		<xsl:with-param name="${2:param}">${3}</xsl:with-param>${4}
-	</xsl:call-template>${5}
+	</xsl:call-template>
 
 snippet choose
 	<xsl:choose>
 		<xsl:when test="${1:value}">
 			${2}
-		</xsl:when>${3}
+		</xsl:when>
 	</xsl:choose>
 
 snippet copy-of
-	<xsl:copy-of select="${1:*}" />${2}
+	<xsl:copy-of select="${1:*}" />
 
 snippet for-each
 	<xsl:for-each select="${1:*}">${2}
-	</xsl:for-each>${3}
+	</xsl:for-each>
 
 snippet if
 	<xsl:if test="${1:test}">${2}
-	</xsl:if>${3}
+	</xsl:if>
 
 snippet import
-	<xsl:import href="${1:stylesheet}" />${2}
+	<xsl:import href="${1:stylesheet}" />
 
 snippet include
-	<xsl:include href="${1:stylesheet}" />${2}
+	<xsl:include href="${1:stylesheet}" />
 
 snippet otherwise
-	<xsl:otherwise>${1}
+	<xsl:otherwise>${0}
 	</xsl:otherwise>
 
 snippet param
 	<xsl:param name="${1:name}">${2}
-	</xsl:param>${3}
+	</xsl:param>
 
 snippet stylesheet
 	<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">${1}
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">${0}
 	</xsl:stylesheet>
 
 snippet template
-	<xsl:template match="${1:*}">${3}
+	<xsl:template match="${1:*}">${0}
 	</xsl:template>
 
 snippet template named
-	<xsl:template name="${1:name}">${2}
+	<xsl:template name="${1:name}">${0}
 	</xsl:template>
 
 snippet text
-	<xsl:text>${1}</xsl:text>
+	<xsl:text>${0}</xsl:text>
 
 snippet value-of
-	<xsl:value-of select="${1:*}" />${2}
+	<xsl:value-of select="${1:*}" />
 
 snippet variable blank
-	<xsl:variable name="${1:name}">${2}
+	<xsl:variable name="${1:name}">${0}
 	</xsl:variable>
 
 snippet variable select
-	<xsl:variable select="${1:*}" />${2}
+	<xsl:variable select="${1:*}" />
 
 snippet when
-	<xsl:when test="${1:test}">${2}
+	<xsl:when test="${1:test}">${0}
 	</xsl:when>
 
 snippet with-param
-	<xsl:with-param name="${1:name}">${2}</xsl:with-param>
+	<xsl:with-param name="${1:name}">${0}</xsl:with-param>
 
 snippet with-param select
-	<xsl:with-param name="${1:name}" select="${2:*}" />
+	<xsl:with-param name="${1:name}" select="${0:*}" />
 
diff --git a/snippets/yii-chtml.snippets b/snippets/yii-chtml.snippets
index df5d5eb73..e827901e9 100644
--- a/snippets/yii-chtml.snippets
+++ b/snippets/yii-chtml.snippets
@@ -1,248 +1,248 @@
 #--------------------Yii CHtml---------------------------------
 #Yii CHtml::radioButton
 snippet yhrb
-	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${4:optionValue} );
+	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${0:optionValue} );
 
 #Yii CHtml::asset
 snippet yhass
-	echo CHtml::asset('${1:path}');
+	echo CHtml::asset('${0:path}');
 
 #Yii CHtml::activeLabelEx
 snippet yhale
-	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::encodeArray
 snippet yheca
-	echo CHtml::encodeArray(array(${1}));
+	echo CHtml::encodeArray(array(${0}));
 
 #Yii CHtml::normalizeUrl
 snippet yhnurl
-	echo CHtml::normalizeUrl(array('${1}'));
+	echo CHtml::normalizeUrl(array('${0}'));
 
 #Yii CHtml::resetButton
 snippet yhsb
-	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${3:optionValue}));
+	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::linkButton
 snippet yhlinkb
-	echo CHtml::linkButton('${1:lable}',array('${2:optionName}'=>${3:optionValue}));
+	echo CHtml::linkButton('${1:lable}',array('${2:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeTextArea
 snippet yhata
-	echo CHtml::activeTextArea(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::activeTextArea(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::ajaxButton
 snippet yhajb
-	echo CHtml::ajaxButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
+	echo CHtml::ajaxButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeId
 snippet yhai
-	echo CHtml::activeId(${1:model}, '${2:attribute}');
+	echo CHtml::activeId(${1:model}, '${0:attribute}');
 
 #Yii CHtml::activeCheckBox
 snippet yhacb
-	echo CHtml::activeCheckBox(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::activeCheckBox(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeHiddenField
 snippet yhahf
-	echo CHtml::activeHiddenField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::activeHiddenField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::encode
 snippet yhec
-	echo CHtml::encode(${1:text});
+	echo CHtml::encode(${0:text});
 
 #Yii CHtml::metaTag
 snippet yhmtag
-	echo CHtml::metaTag('${1:content}', '${2:name}', '${3:httpEquiv}',array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::metaTag('${1:content}', '${2:name}', '${3:httpEquiv}',array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::dropDownList
 snippet yhddl
-	echo CHtml::dropDownList('${1:name}', '${2:select}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::dropDownList('${1:name}', '${2:select}', array(${3}),array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::listBox
 snippet yhlb
-	echo CHtml::listBox('${1:name}', '${2:select}',array(${3}),array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::listBox('${1:name}', '${2:select}',array(${3}),array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::script
 snippet yhjs
-	echo CHtml::script('${1:test}');
+	echo CHtml::script('${0:test}');
 
 #Yii CHtml::ajax
 snippet yhaj
-	echo CHtml::ajax(array(${1}));
+	echo CHtml::ajax(array(${0}));
 
 #Yii CHtml::textField
 snippet yhtf
-	echo CHtml::textField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::textField('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activePasswordField
 snippet yhapf
-	echo CHtml::activePasswordField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::activePasswordField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::listData
 snippet yhld
-	echo CHtml::listData(array(${1}),'${2:valueField}', '${3:textField}','${4:groupField}');
+	echo CHtml::listData(array(${1}),'${2:valueField}', '${3:textField}','${0:groupField}');
 
 #Yii CHtml::mailto
 snippet yhmt
-	echo CHtml::mailto('${1:text}', '${2:email}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::mailto('${1:text}', '${2:email}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::image
 snippet yhimg
-	echo CHtml::image('${1:src}', '${2:alt}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::image('${1:src}', '${2:alt}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeListBox
 snippet yhalb
-	echo CHtml::activeListBox(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::activeListBox(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeFileField
 snippet yhaff
-	echo CHtml::activeFileField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::activeFileField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::closeTag
 snippet yhct
-	echo CHtml::closeTag('${1:tag}');
+	echo CHtml::closeTag('${0:tag}');
 
 #Yii CHtml::activeInputField
 snippet yhaif
-	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::scriptFile
 snippet yhjsf
-	echo CHtml::scriptFile('${1:url}');
+	echo CHtml::scriptFile('${0:url}');
 
 #Yii CHtml::radioButtonList
 snippet yhrbl
-	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::cssFile
 snippet yhcssf
-	echo CHtml::cssFile('${1:url}','${2:media}');
+	echo CHtml::cssFile('${1:url}','${0:media}');
 
 #Yii CHtml::error
 snippet yherr
-	echo CHtml::error(${1:model}, '${2:attribute}');
+	echo CHtml::error(${1:model}, '${0:attribute}');
 
 #Yii CHtml::passwordField
 snippet yhpf
-	echo CHtml::passwordField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::passwordField('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::hiddenField
 snippet yhhf
-	echo CHtml::hiddenField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::hiddenField('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::cdata
 snippet yhc
-	echo CHtml::cdata(${1:text});
+	echo CHtml::cdata(${0:text});
 
 #Yii CHtml::link
 snippet yhlink
-	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::errorSummary
 snippet yherrs
-	echo CHtml::errorSummary(${1:model},'${2:headerHtml}','${3:footerHtml}');
+	echo CHtml::errorSummary(${1:model},'${2:headerHtml}','${0:footerHtml}');
 
 #Yii CHtml::tag
 snippet yht
-	echo CHtml::tag('${1:tag}',array('${2:optionName}'=>${3:optionValue}),${4:false},${5:true});
+	echo CHtml::tag('${1:tag}',array('${2:optionName}'=>${3:optionValue}),${4:false},${0:true});
 
 #Yii CHtml::ajaxLink
 snippet yhajl
-	echo CHtml::ajaxLink('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
+	echo CHtml::ajaxLink('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::label
 snippet yhlabel
-	echo CHtml::label('${1:label}', '${2:for}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::label('${1:label}', '${2:for}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeName
 snippet yhan
-	echo CHtml::activeName(${1:model}, '${2:attribute}');
+	echo CHtml::activeName(${1:model}, '${0:attribute}');
 
 #Yii CHtml::statefulForm
 snippet yhsform
-	echo CHtml::statefulForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::statefulForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::fileField
 snippet yhff
-	echo CHtml::fileField('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::fileField('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeTextField
 snippet yhatf
-	echo CHtml::activeTextField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::activeTextField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::css
 snippet yhcss
-	echo CHtml::css('${1:test}','${2:media}');
+	echo CHtml::css('${1:test}','${0:media}');
 
 #Yii CHtml::imageButton
 snippet yhimgb
-	echo CHtml::imageButton('${1:src}',array('${2:optionName}'=>${3:optionValue}));
+	echo CHtml::imageButton('${1:src}',array('${2:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::ajaxSubmitButton
 snippet yhajsb
-	echo CHtml::ajaxSubmitButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${6:optionValue}));
+	echo CHtml::ajaxSubmitButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::button
 snippet yhb
-	echo CHtml::button('${1:label}',array('${2:optionName}'=>${3:optionValue}));
+	echo CHtml::button('${1:label}',array('${2:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::listOptions
 snippet yhlo
-	echo CHtml::listOptions('${1:selection}', array(${2}), array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::listOptions('${1:selection}', array(${2}), array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeCheckBoxList
 snippet yhacbl
-	echo CHtml::activeCheckBoxList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::activeCheckBoxList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::openTag
 snippet yhot
-	echo CHtml::openTag('${1:tag}', array('${2:optionName}'=>${3:optionValue}));
+	echo CHtml::openTag('${1:tag}', array('${2:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::checkBox
 snippet yhcb
-	echo CHtml::checkBox('${1:name}', ${2:false}, array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::checkBox('${1:name}', ${2:false}, array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::textArea
 snippet yhta
-	echo CHtml::textArea('${1:name}', '${2:value}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::textArea('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::linkTag
 snippet yhlinkt
-	echo CHtml::linkTag('${1:relation}', '${2:type}', '${3:href}', '${4:media}',array('${5:optionName}'=>${6:optionValue}));
+	echo CHtml::linkTag('${1:relation}', '${2:type}', '${3:href}', '${4:media}',array('${5:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::resetButton
 snippet yhrsb
-	echo CHtml::resetButton('${1:label}',array('${2:optionName}'=>${3:optionValue}));
+	echo CHtml::resetButton('${1:label}',array('${2:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeRadioButtonList
 snippet yharbl
-	echo CHtml::activeRadioButtonList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::activeRadioButtonList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::checkBoxList
 snippet yhcbl
-	echo CHtml::checkBoxList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::checkBoxList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::form
 snippet yhform
-	echo CHtml::form(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::form(array('${1}'), '${2:post}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::beginForm
 snippet yhbeform
 	echo CHtml::beginForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
-	${5}
+	${0}
 	echo CHtml::endForm();
 
 #Yii CHtml::activeDropDownList
 snippet yhaddl
-	echo CHtml::activeDropDownList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${5:optionValue}));
+	echo CHtml::activeDropDownList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeRadioButton
 snippet yharb
-	echo CHtml::activeRadioButton(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::activeRadioButton(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 #Yii CHtml::activeLabel
 snippet yhal
-	echo CHtml::activeLabel(${1:model}, '${2:attribute}',array('${3:optionName}'=>${4:optionValue}));
+	echo CHtml::activeLabel(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
 
 
diff --git a/snippets/yii.snippets b/snippets/yii.snippets
index da48ee236..1f9fc6f78 100644
--- a/snippets/yii.snippets
+++ b/snippets/yii.snippets
@@ -1,22 +1,22 @@
 #Yii session offset
 snippet yse
-	Yii::app()->session['${1}'];
+	Yii::app()->session['${0}'];
 
 #Yii renderDynamic
 snippet yrd
-	$this->renderDynamic('${1:callback}');
+	$this->renderDynamic('${0:callback}');
 
 #Yii set cache
 snippet ycas
-	Yii::app()->cache->set('${1:key}', ${2:value}, ${3:expire}, new C${4:}CacheDependency(${5}));
+	Yii::app()->cache->set('${1:key}', ${2:value}, ${3:expire}, new C${4:}CacheDependency(${0}));
 
 #Yii Add cache
 snippet ycad
-	Yii::app()->cache->add('${1:key}', ${2:value}, ${3:expire}, new C${4}CacheDependency(${5}));
+	Yii::app()->cache->add('${1:key}', ${2:value}, ${3:expire}, new C${4}CacheDependency(${0}));
 
 #Yii register CSS file
 snippet yregcf
-	Yii::app()->clientScript->registerCssFile('${1:file}');
+	Yii::app()->clientScript->registerCssFile('${0:file}');
 
 #Yii requestType
 snippet yreqtype
@@ -28,15 +28,15 @@ snippet yisajax
 
 #Yii translate
 snippet yt
-	Yii::t('${1:category}', '${2:message}',array(${3}));
+	Yii::t('${1:category}', '${2:message}',array(${0}));
 
 #Yii register CSS
 snippet yregc
-	Yii::app()->clientScript->registerCss('${1:id}', '${2}');
+	Yii::app()->clientScript->registerCss('${1:id}', '${0}');
 
 #Yii log
 snippet ylog
-	Yii::log('${1:msg}', '${2:info}');
+	Yii::log('${1:msg}', '${0:info}');
 
 #Yii userHostAddress
 snippet yuserip
@@ -44,15 +44,15 @@ snippet yuserip
 
 #Yii register script file
 snippet yregsf
-	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${2:END});
+	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${0:END});
 
 #Yii CLinkPager
 snippet ylinkpager
-	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${1}'}))
+	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${0}'}))
 
 #Yii CJSON::encode
 snippet yjec
-	CJSON::encode(${1:text});
+	CJSON::encode(${0:text});
 
 #CActiveDataProvider
 snippet yadp
@@ -67,16 +67,16 @@ snippet yadp
 			'pageSize'=>${5},
 		),
 	));
-	${6}
+	${0}
 	// $dataProvider->getData() will return a list of Post objects
 
 #Yii renderDynamic internal
 snippet yrdi
-	$this->renderDynamic('${1:callback}', array('${2:key}'=>${3:value}));
+	$this->renderDynamic('${1:callback}', array('${2:key}'=>${0:value}));
 
 #Yii register script
 snippet yregs
-	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${3:READY});
+	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${0:READY});
 
 #Yii Flush cache
 snippet ycaf
@@ -84,11 +84,11 @@ snippet ycaf
 
 #Yii Yii::app()->request->cookies
 snippet yco
-	Yii::app()->request->cookies['${1}']
+	Yii::app()->request->cookies['${0}']
 
 #Yii user->
 snippet yuser
-	Yii::app()->user->${1}
+	Yii::app()->user->
 
 #Yii refresh
 snippet yrf
@@ -96,15 +96,15 @@ snippet yrf
 
 #Yii import
 snippet yimp
-	Yii::import('${1}');
+	Yii::import('${0}');
 
 #Yii trace
 snippet ytrace
-	Yii::trace('${1:msg}');
+	Yii::trace('${0:msg}');
 
 #Yii params
 snippet ypar
-	Yii::app()->params['${1}']
+	Yii::app()->params['${0}']
 
 #Yii isPostRequest
 snippet yispost
@@ -114,85 +114,85 @@ snippet yispost
 snippet yifisajax
 	if(Yii::app()->request->isAjaxRequest == TRUE)
 	{
-		${1}
+		${0}
 	}
 
 #Yii Yii::app()->cache->delete
 snippet ydelcache
-	Yii::app()->cache->delete('${1:key}');
+	Yii::app()->cache->delete('${0:key}');
 
 #Yii render view
 snippet yr
-	$this->render('${1:view}',array('${2:key}'=>${3:value}));
+	$this->render('${1:view}',array('${2:key}'=>${0:value}));
 
 #Yii redirect
 snippet yre
-	$this->redirect(array('${1:controller}/${2:action}'));
+	$this->redirect(array('${1:controller}/${0:action}'));
 
 #Yii Get cache
 snippet ycag
-	Yii::app()->cache->get('${1:key}');
+	Yii::app()->cache->get('${0:key}');
 
 #Yii render text
 snippet yrt
-	$this->renderText('${1}');
+	$this->renderText('${0}');
 
 #Yii render partial
 snippet yrp
-	$this->renderPartial('${1:view}',array('${2:key}'=>${3:value}));
+	$this->renderPartial('${1:view}',array('${2:key}'=>${0:value}));
 
 #----------------Yii Model-----------------------------
 #Yii Model count
 snippet ycountm
-	${1:ModelName}::model()->count(${2:condition}, array('${3:key}'=>${4:value}));
+	${1:ModelName}::model()->count(${2:condition}, array('${3:key}'=>${0:value}));
 
 #Yii Model countBySql
 snippet ycountbs
-	${1:ModelName}::model()->countBySql(${2:sql},array('${3:key}'=>${4:value}));
+	${1:ModelName}::model()->countBySql(${2:sql},array('${3:key}'=>${0:value}));
 
 #Yii Model updateAll
 snippet yupdatea
-	${1:ModelName}::model()->updateAll(${2:array('attributes')}, ${3:condition},array('${4:key}'=>${5:value}));
+	${1:ModelName}::model()->updateAll(${2:array('attributes')}, ${3:condition},array('${4:key}'=>${0:value}));
 
 #Yii Model updateByPk
 snippet yupdatebp
-	${1:ModelName}::model()->updateByPk(${2:pk}, ${3:array('attributes')}, ${4:condition},array('${5:key}'=>${6:value}));
+	${1:ModelName}::model()->updateByPk(${2:pk}, ${3:array('attributes')}, ${4:condition},array('${5:key}'=>${0:value}));
 
 #Yii Model deleteAll
 snippet ydela
-	${1:ModelName}::model()->deleteAll(${2:condition},array('${3:key}'=>${4:value}));
+	${1:ModelName}::model()->deleteAll(${2:condition},array('${3:key}'=>${0:value}));
 
 #Yii Model deleteByPk
 snippet ydelbp
-	${1:ModelName}::model()->deleteByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value}));
+	${1:ModelName}::model()->deleteByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${0:value}));
 
 #Yii Model find
 snippet yfind
-	${1:ModelName}::model()->find(${2:condition},array('${3:key}'=>${4:value}));
+	${1:ModelName}::model()->find(${2:condition},array('${3:key}'=>${0:value}));
 
 #Yii Model findAll
 snippet yfinda
-	${1:ModelName}::model()->findAll(${2:condition},array('${3:key}'=>${4:value}));
+	${1:ModelName}::model()->findAll(${2:condition},array('${3:key}'=>${0:value}));
 
 #Yii Model findByPk
 snippet yfindbp
-	${1:ModelName}::model()->findByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${5:value}));
+	${1:ModelName}::model()->findByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${0:value}));
 
 #Yii Model findAllByPk
 snippet yfindabp
-	${1:ModelName}::model()->findAllByPk(${2:pk}, ${3:condition},array('${4:key}'=>${5:value}));
+	${1:ModelName}::model()->findAllByPk(${2:pk}, ${3:condition},array('${4:key}'=>${0:value}));
 
 #Yii Model findBySql
 snippet yfindbs
-	${1:ModelName}::model()->findBySql(${2:sql}, array('${3:key}'=>${4:value}));
+	${1:ModelName}::model()->findBySql(${2:sql}, array('${3:key}'=>${0:value}));
 
 #Yii Model findAllByAttributes
 snippet yfindaba
-	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), ${4:condition}, array('${5:key}'=>${6:value}));
+	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), ${4:condition}, array('${5:key}'=>${0:value}));
 
 #Yii Model exists
 snippet yexists
-	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${4:value}));
+	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${0:value}));
 
 #Yii Create model class
 snippet ymodel
@@ -214,7 +214,7 @@ snippet ymodel
 		 */
 		public function tableName()
 		{
-			return '${3:table_name}';
+			return '${0:table_name}';
 		}
 
 		/**
@@ -258,7 +258,7 @@ snippet ycontroller
 	{
 		  public function action${4:Index}()
 		  {
-		      ${5}
+		      ${0}
 		  }
 
 		// -----------------------------------------------------------
@@ -294,7 +294,7 @@ snippet ycontroller
 snippet yact
 	public function action${1:Index}(${2:params})
 	{
-		${3}
+		${0}
 	}
 
 
diff --git a/snippets/zsh.snippets b/snippets/zsh.snippets
index b3fdb8c71..04577a968 100644
--- a/snippets/zsh.snippets
+++ b/snippets/zsh.snippets
@@ -4,59 +4,59 @@ snippet #!
 
 snippet if
 	if ${1:condition}; then
-		${2:# statements}
+		${0:# statements}
 	fi
 snippet ife
 	if ${1:condition}; then
 		${2:# statements}
 	else
-		${3:# statements}
+		${0:# statements}
 	fi
 snippet eif
 	elif ${1:condition} ; then
-		${2:# statements}
+		${0:# statements}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
-		${3:# statements}
+		${0:# statements}
 	done
 snippet fori
 	for ${1:needle} in ${2:haystack} ; do
-		${3:#statements}
+		${0:#statements}
 	done
 snippet fore
 	for ${1:item} in ${2:list}; do
-		${3:# statements}
+		${0:# statements}
 	done
 snippet wh
 	while ${1:condition}; do
-		${2:# statements}
+		${0:# statements}
 	done
 snippet until
 	until ${1:condition}; do
-		${2:# statements}
+		${0:# statements}
 	done
 snippet repeat
 	repeat ${1:integer}; do
-		${2:# statements}
+		${0:# statements}
 	done
 snippet case
 	case ${1:word} in
 		${2:pattern})
-			${3};;
+			${0};;
 	esac
 snippet select
 	select ${1:answer} in ${2:choices}; do
-		${3:# statements}
+		${0:# statements}
 	done
 snippet (
-	( ${1:#statements} )
+	( ${0:#statements} )
 snippet {
-	{ ${1:#statements} }
+	{ ${0:#statements} }
 snippet [
-	[[ ${1:test} ]]
+	[[ ${0:test} ]]
 snippet always
-	{ ${1:try} } always { ${2:always} }
+	{ ${1:try} } always { ${0:always} }
 snippet fun
 	function ${1:name} (${2:args}) {
-		${3:# body}
+		${0:# body}
 	}

From 2a0cd591e7032f2f71801efba92f58b7e24651ca Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Thu, 5 Sep 2013 21:08:21 +0800
Subject: [PATCH 0191/1587] add symfony2 form snip

---
 UltiSnips/php.snippets          |  2 +-
 UltiSnips/php/symfony2.snippets | 55 ++++++++++++++++++++++++++++++---
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 96cae3549..7cc3e3c67 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -64,7 +64,7 @@ endsnippet
 snippet sg "Setter and Getter" b
 
 /**
- * @var ${3:`!p snip.rv = t[2].capitalize()`}${4}
+ * @var ${3:`!p snip.rv = t[2].capitalize()`}
  */
 ${1:protected} $$2;
 
diff --git a/UltiSnips/php/symfony2.snippets b/UltiSnips/php/symfony2.snippets
index 0c7951ae2..5f47ce471 100644
--- a/UltiSnips/php/symfony2.snippets
+++ b/UltiSnips/php/symfony2.snippets
@@ -1,5 +1,6 @@
 # sugguestion? report bugs? 
 # go to https://github.com/chrisyue/vim-snippets/issues
+
 snippet contr "symfony2 controller" b
 namespace `!p 
 abspath = os.path.abspath(path)
@@ -15,7 +16,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * ${1:@author `whoami`}${2}
+ * ${1:@author `whoami`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -65,7 +66,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * ${3:@author `whoami`}${4}
+ * ${3:@author `whoami`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -100,7 +101,7 @@ if m:
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * ${1:@author `whoami`}${2}
+ * ${1:@author `whoami`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -132,7 +133,7 @@ use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
 /**
- * ${3:@author `whoami`}${4}
+ * ${3:@author `whoami`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -165,7 +166,7 @@ if m:
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * ${3:@author `whoami`}${4}
+ * ${3:@author `whoami`}
  *
  * @ORM\Entity()
  * @ORM\Table(name="`!p snip.rv = re.match(r'.*(?=\.)', fn).group().lower()`")
@@ -182,3 +183,47 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 	private $id;
 }
 endsnippet
+
+snippet form "symfony2 form type" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+/**
+ * ${2:@author `whoami`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends AbstractType
+{
+	/** 
+     * {@inheritDoc}
+	 */
+	public function buildForm(FormBuilderInterface $builder, array $options)
+	{   
+	}
+
+	/** 
+     * {@inheritDoc}
+	 */
+	public function setDefaultOptions(OptionsResolverInterface $resolver)
+	{   
+	    $resolver->setDefaults(); 
+	} 
+
+	/** 
+     * {@inheritDoc}
+	 */
+	public function getName()
+	{   
+		return '${1}';
+	}
+}
+endsnippet

From 1b21a7b1ef7e03b10c898f492c1f926b5c83a2a3 Mon Sep 17 00:00:00 2001
From: hulufei <f.calabash@gmail.com>
Date: Wed, 11 Sep 2013 11:46:02 +0800
Subject: [PATCH 0192/1587] Add snippet for editorconfig

---
 snippets/dosini.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 snippets/dosini.snippets

diff --git a/snippets/dosini.snippets b/snippets/dosini.snippets
new file mode 100644
index 000000000..95c759cb6
--- /dev/null
+++ b/snippets/dosini.snippets
@@ -0,0 +1,12 @@
+snippet ec
+	; http://editorconfig.org
+
+	root = true
+
+	[*]
+	indent_style = ${1:space_or_tab}
+	indent_size = ${2:indent_size}
+	end_of_line = lf
+	charset = utf-8
+	trim_trailing_whitespace = true
+	insert_final_newline = true

From 3218737414848c81facbcade5086f7f2ac3d8b36 Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Wed, 11 Sep 2013 19:20:03 +0800
Subject: [PATCH 0193/1587] table name auto add underscore if entity name
 consists of more than two word

---
 UltiSnips/php/symfony2.snippets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/php/symfony2.snippets b/UltiSnips/php/symfony2.snippets
index 5f47ce471..8fba46b9f 100644
--- a/UltiSnips/php/symfony2.snippets
+++ b/UltiSnips/php/symfony2.snippets
@@ -169,7 +169,11 @@ use Doctrine\ORM\Mapping as ORM;
  * ${3:@author `whoami`}
  *
  * @ORM\Entity()
- * @ORM\Table(name="`!p snip.rv = re.match(r'.*(?=\.)', fn).group().lower()`")
+ * @ORM\Table(name="`!p 
+tmp = re.match(r'.*(?=\.)', fn).group()
+tmp = re.sub(r'\B([A-Z])', r'_\1', tmp)
+snip.rv = tmp.lower()
+`")
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()

From dc824d2e9acc3f304a4236a9da06aa11d72eba03 Mon Sep 17 00:00:00 2001
From: Reyes Yang <reyes.yang@gmail.com>
Date: Fri, 13 Sep 2013 11:31:06 +0800
Subject: [PATCH 0194/1587] Add function snippet for shell

---
 snippets/sh.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 8b03e0c66..6bf7089cc 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -82,3 +82,11 @@ snippet getopt
 	shift $(($OPTIND-1))
 snippet root
 	if [ $(id -u) -ne 0 ]; then exec sudo $0; fi
+snippet fun
+	${1:function_name}() {
+		${0:#function_body}
+	}
+snippet ffun
+	function ${1:function_name}() {
+		${0:#function_body}
+	}

From 79f84fbde9858ca6e3665e9811f1e8afb0855d87 Mon Sep 17 00:00:00 2001
From: Norman Messtorff <normes@normes.org>
Date: Sun, 15 Sep 2013 17:21:02 +0200
Subject: [PATCH 0195/1587] Add classheader and defheader puppet snippet

---
 snippets/puppet.snippets | 81 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index cfe7f42c7..d35608ddf 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -3,6 +3,87 @@
 # Please contact R.I.Pienaar <rip@devco.net> for additions and feedback,
 # see it in action @ http://www.devco.net/archives/2009/09/22/vim_and_puppet.php
 
+# Header to match http://docs.puppetlabs.com/guides/style_guide.html#puppet-doc
+snippet classheader
+	# == Class: ${1:`vim_snippets#Filename(expand('%:p:s?.*modules/??:h:h'), 'name')`}
+	#
+	# ${2:Full description of class $1 here}
+	#
+	# === Parameters
+	#
+	# Document parameters here.
+	#
+	# [*parameter1*]
+	#   Explanation of what this parameter affects and what it defaults to.
+	#   e.g. "Specify one or more upstream ntp servers as an array."
+	#
+	# === Variables
+	#
+	# Here you should define a list of variables that this module would require.
+	#
+	# [*variable1*]
+	#   Explanation of how this variable affects the funtion of this class and
+	#   if it has a default. e.g. "The parameter enc_ntp_servers must be set by the
+	#   External Node Classifier as a comma separated list of hostnames."
+	#
+	# === Examples
+	#
+	#  class { '$1':
+	#    parameter1 => [ 'just', 'an', 'example', ]
+	#  }
+	#
+	# === Authors
+	#
+	# `g:snips_author` <`g:snips_email`>
+	#
+	# === Copyright
+	#
+	# Copyright `strftime("%Y")` `g:snips_author`
+	#
+	class $1 (${3}){
+		${4}
+	}
+
+snippet defheader
+	# == Define: ${1:`vim_snippets#Filename(expand('%:p:s?.*modules/??:r:s?/manifests/?::?'), 'name')`}
+	#
+	# ${2:Full description of defined resource type $1 here}
+	#
+	# === Parameters
+	#
+	# Document parameters here
+	#
+	# [*namevar*]
+	#   If there is a parameter that defaults to the value of the title string
+	#   when not explicitly set, you must always say so.  This parameter can be
+	#   referred to as a "namevar," since it's functionally equivalent to the
+	#   namevar of a core resource type.
+	#
+	# [*basedir*]
+	#   Description of this variable.  For example, "This parameter sets the
+	#   base directory for this resource type.  It should not contain a trailing
+	#   slash."
+	#
+	# === Examples
+	#
+	# Provide some examples on how to use this type:
+	#
+	#   $1 { 'namevar':
+	#     basedir => '/tmp/src',
+	#   }
+	#
+	# === Authors
+	#
+	# `g:snips_author` <`g:snips_email`>
+	#
+	# === Copyright
+	#
+	# Copyright `strftime("%Y")` `g:snips_author`
+	#
+	define $1(${3}) {
+		${4}
+	}
+
 # Language Constructs
 snippet class
 	class ${1:`vim_snippets#Filename('', 'name')`} {

From 83345ba6944c6afbe9f915fb5a5e06d0833e083b Mon Sep 17 00:00:00 2001
From: Bruno Sutic <bruno.sutic@gmail.com>
Date: Sat, 21 Sep 2013 12:18:02 +0200
Subject: [PATCH 0196/1587] Improve ruby `desc` snippet

Instead of dummy text, first argument for `describe` becomes a class
name derived from a file name. Example:
file:              some_class_spec.rb
describe argument: SomeClass
---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index e9d7ba339..cbfc85ee5 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -957,7 +957,7 @@ snippet tctss
 #     Rspec snippets     #
 ##########################
 snippet desc
-	describe ${1:class_name} do
+	describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		${0}
 	end
 snippet descm

From 5f6d4a293f677cd60c02b7259ec96ff3da9c7ae8 Mon Sep 17 00:00:00 2001
From: crazymaster <ken.i54k@gmail.com>
Date: Mon, 23 Sep 2013 15:24:11 +0900
Subject: [PATCH 0197/1587] Improve processing snippets

---
 snippets/processing.snippets | 365 ++++++++++++++---------------------
 1 file changed, 143 insertions(+), 222 deletions(-)

diff --git a/snippets/processing.snippets b/snippets/processing.snippets
index dcaed54aa..60fd79ecb 100755
--- a/snippets/processing.snippets
+++ b/snippets/processing.snippets
@@ -281,20 +281,16 @@ snippet gl gl clear
 	gl.glClear(${1:GL.GL_COLOR_BUFFER_BIT}${2: | }${0:GL.GL_DEPTH_BUFFER_BIT});
 
 #frame operations
-snippet fr framerate
+snippet frameRate
 	frameRate(${1:30});
 	${0}
-snippet fr frameRate
-	frameRate
-snippet fr frameCount
-	frameCount
-snippet fr saveFrame
+snippet saveFrame
 	saveFrame("${1:filename-####}${0:.ext}");
 
 #size
-snippet size normal size
+snippet size normal
 	size(${1:200}, ${2:200}${0:, P3D});
-snippet size opengl size
+snippet size opengl
 	size(${1:200}, ${2:200}${0:, OPENGL});
 
 #PRIMITIVES
@@ -327,300 +323,238 @@ snippet object
 	${1:Object} ${2:o}${3: = new $1}(${0});
 
 #curve
-snippet curve curve
+snippet curve
 	curve(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3}, ${7:x4}, ${0:y4});
-snippet curve curve 3D
+snippet curve 3D
 	curve(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${6:z2}, ${7:x3}, ${8:y3}, ${9:z3}, ${10:x4}, ${11:y4}, ${0:z4});
-snippet curve curve Detail
+snippet curveDetail
 	curveDetail(${0:detail});
-snippet curve curve point
+snippet curvePoint
 	curvePoint(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${0:t});
-snippet curve curve tightness
+snippet curveTightness
 	curveTightness(${0:squishy});
 
 #bezier
-snippet bezier bezier
+snippet bezier
 	bezier(${1:x1}, ${2:y1}, ${3:cx1}, ${4:cy1}, ${5:cx2}, ${6:cy2}, ${7:x2}, ${0:y2});
-snippet bezier bezier 3D
+snippet bezier 3D
 	bezier(${1:x1}, ${2:y1}, ${3:z1}, ${4:cx1}, ${5:cy1}, ${6:cz1}, ${7:cx2}, ${8:cy2}, ${9:cz2}, ${10:x2}, ${11:y2}, ${0:z2});
-snippet bezier bezier detail
+snippet bezierDetail
 	bezierDetail(${0:detail});
-snippet bezier bezier tangent
+snippet bezierTangent
 	bezierTangent(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${0:t});
-snippet bezier bezier point
+snippet bezierPoint
 	bezierPoint(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${0:t});
 
 #vertex
-snippet vertex vertex
+snippet vertex
 	vertex(${1:x}, ${2:y}${3:, }${4:u}${5:, }${0:v});
-snippet vertex vertex 3D
+snippet vertex 3D
 	vertex(${1:x}, ${2:y}, ${3:z}${4:, }${5:u}${6:, }${0:v});
-snippet vertex vertex bezier
+snippet bezierVertex
 	bezierVertex(${1:cx1}, ${2:cy1}, ${3:cx2}, ${4:cy2}, ${5:x}, ${0:y});
-snippet vertex vertex bezier 3D
+snippet bezierVertex 3D
 	bezierVertex(${1:cx1}, ${2:cy1}, ${3:cz1}, ${4:cx2}, ${5:cy2}, ${6:cz2}, ${7:x}, ${8:y}, ${0:z});
-snippet vertex vertex curve
+snippet curveVertex
 	curveVertex(${1:x}, ${0:y});
-snippet vertex vertex curve 3D
+snippet curveVertex 3D
 	curveVertex(${1:x}, ${2:y}, ${0:z});
 
 #stroke
-snippet stroke stroke
+snippet stroke
 	stroke(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
-snippet stroke stroke weight
+snippet strokeWeight
 	strokeWeight(${0:1});
-snippet stroke no stroke
-	noStroke();
 
 #mouse
-snippet mouse mouse x
-	mouseX
-snippet mouse mouse y
-	mouseY
-snippet mouse mouse drag
+snippet mouseDragged
 	void mouseDragged(){
 		${0}
 	}
-snippet mouse mouse move
+snippet mouseMoved
 	void mouseMoved(){
 		${0}
 	}
-snippet mouse mouse release
+snippet mouseReleased
 	void mouseReleased(){
 		${0}
 	}
-snippet mouse mouse pressed
+snippet mousePressed
 	void mousePressed(){
 		${0}
 	}
-snippet mouse mouse pressed?
-	mousePressed
-snippet mouse mouse button?
-	mouseButton
-snippet mouse pmouse X
-	pmouseX
-snippet mouse pmouse Y
-	pmouseY
 
 #key
-snippet key keycode?
-	keyCode
-snippet key key
-	key
-snippet key key released
+snippet keyReleased
 	void keyReleased(){
 		${0}
 	}
-snippet key key typed
+snippet keyTyped
 	void keyTyped(){
 		${0}
 	}
-snippet key key pressed
+snippet keyPressed
 	void keyPressed(){
 		${0}
 	}
-snippet key key pressed?
-	keyPressed
 
 #file
-snippet file load string
+snippet loadStrings
 	loadStrings("${0:filename}");
-snippet file save string
+snippet saveStrings
 	saveStrings(${1:filename}, ${0:strings});
-snippet file load bytes
+snippet loadBytes
 	loadBytes("${0:filename}");
-snippet file begin record
+snippet beginRecord
 	beginRecord(${1:renderer}, ${0:filename});
-snippet file end record
-	endRecord();
-snippet file save bytes
+snippet saveBytes
 	saveBytes(${1:filename}, ${0:bytes});
-snippet file create writer
+snippet createWriter
 	createWriter(${0:filename});
-snippet file create reader
+snippet createReader
 	createReader(${0:filename});
 
-#time
-snippet time hour
-	hour()
-snippet time milliseconds
-	millis()
-snippet time year
-	year()
-snippet time minutes
-	minutes()
-snippet time month
-	month()
-snippet time second
-	second()
-
 #matrix
-snippet matrix reset matrix
-	translate(${1:x}, ${2:y}, ${0:z});
-snippet matrix print matrix
-	printMatrix();
-snippet matrix push matrix
+snippet pushMatrix
 	pushMatrix();
 	${0:};
 	popMatrix();
 
 
 #text
-snippet txt text data
+snippet text data
 	text(${1:data}, ${2:x}, ${3:y}${4:, }${0:z});
-snippet txt text string data
+snippet text stringdata
 	text(${1:stringdata}, ${2:x}, ${3:y}, ${4:width}, ${5:height}${6:, }${0:z});
-snippet txt text size
+snippet textSize
 	textSize(${0:size});
-snippet txt text leading
+snippet textLeading
 	textLeading(${0:size});
-snippet txt text width
+snippet textWidth
 	textWidth(${0:data});
-snippet txt text descent
-	textDescent();
-snippet txt text ascent
-	textAscent();
-snippet txt font
+snippet font
 	PFont ${1:font};
 	$1 = loadFont("${0:FFScala-32.vlw}");
 #load font
-snippet txt load font
+snippet loadFont
 	${1:font} = loadFont("${0:FFScala-32.vlw}");
-snippet txt text font
+snippet textFont
 	textFont(${1:font}${2:, }${0:size});
 
 #math
-snippet math tangent
+snippet tan
 	tan(${0:rad});
-snippet math atan
+snippet atan
 	atan(${0:rad});
-snippet math atan2
+snippet atan2
 	atan2(${0:rad});
-snippet math sin
+snippet sin
 	sin(${0:rad});
-snippet math asin
+snippet asin
 	asin(${0:rad});
-snippet math cos
+snippet cos
 	cos(${0:rad});
-snippet math acos
+snippet acos
 	acos(${0:rad});
-snippet math degrees
+snippet degrees
 	degrees(${0:rad});
-snippet math radians
+snippet radians
 	radians(${0:deg});
-snippet math random seed
+snippet randomSseed
 	randomSeed(${0:value});
-snippet math random
+snippet random
 	random(${1:value1}${2:, }${0:value2});
-snippet math half PI
-	HALF_PI
-snippet math 2 PI
-	TWO_PI
-snippet math PI
-	PI
-snippet math pow
+snippet pow
 	pow(${1:num}, ${0:exponent});
-snippet math floor
+snippet floor
 	floor(${0:value});
-snippet math sqrt
+snippet sqrt
 	sqrt(${0:value});
-snippet math abs
+snippet abs
 	abs(${0:value});
-snippet math sq
+snippet sq
 	sq(${0:value});
-snippet math ceil
+snippet ceil
 	ceil(${0:value});
-snippet math exp
+snippet exp
 	exp(${0:value});
-snippet math round
+snippet round
 	round(${0:value}};
-snippet math min
+snippet min
 	min(${1:value1}, ${2:value2}${3:, }${0:value3});
-snippet math max
+snippet max
 	max(${1:value1}, ${2:value2}${3:, }${0:value3});
-snippet math array max
+snippet max array
 	max(${0:array});
-snippet math array min
+snippet min array
 	min(${0:array});
-snippet math logarithm
+snippet log
 	log(${0:value});
-snippet math map
+snippet map
 	map(${1:value}, ${2:low1}, ${4:high1}, ${5:low2}, ${0:high2});
-snippet math normalize
+snippet norm
 	norm(${1:value}, ${2:low}, ${0:high});
-snippet math constrain
+snippet constrain
 	constrain(${1:value}, ${2:min}, ${0:max});
-snippet math magnitude of a vector
+snippet mag
 	mag(${1:a}, ${2:b}${3:, }${0:c});
-snippet math distance
+snippet dist
 	dist(${1:x1}, ${2:y1}, ${4:x2}, ${0:y2});
-snippet math distance 3D
+snippet dist 3D
 	dist(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${0:z2});
 
 #noise math
-snippet noise set noise
+snippet noise
 	noise(${1:x}${2:, }${3:y}${4:, }${0:z});
-snippet noise noise detail
+snippet noiseDetail
 	noiseDetail(${1:octaves}${2:, }${0:falloff});
-snippet noise noise seed
+snippet noiseSeed
 	noiseSeed(${0:x});
 
 #material
-snippet material shininess
+snippet shininess
 	shininess(${0:shine});
-snippet material specular
+snippet specular
 	specular(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
-snippet material ambient
+snippet ambient
 	ambient(${1:value1}, ${2:value2}, ${0:value3});
-snippet material emissive
+snippet emissive
 	emissive(${1:value1}, ${2:value2}, ${0:value3});
 
 #light
-snippet light no light
-	noLights();
-snippet light light
-	lights();
-snippet light diretional light
+snippet diretionalLight
 	directionalLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:nx}, ${5:ny}, ${0:nz});
-snippet light point light
+snippet pointLight
 	pointLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:nx}, ${5:ny}, ${0:nz});
-snippet light falloff light
+snippet lightFalloff
 	lightFalloff(${1:constant}, ${2:linear}, ${0:quadratic});
-snippet light normal light
+snippet normal
 	normal(${1:nx}, ${2:ny}, ${0:nz});
-snippet light specular light
+snippet lightFalloff
 	lightFalloff(${1:v1}, ${2:v2}, ${0:v3});
-snippet light ambient light
+snippet ambientLight
 	ambientLight(${1:v1}, ${2:v2}, ${3:v3}${7:, ${4:x}, ${5:y}, ${0:z}});
-snippet light spot light
+snippet spotLight
 	spotLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:x}, ${5:y}, ${6:z}, ${7:nx}, ${8:ny}, ${9:nz}, ${10:angle}, ${0:concentration});
 
 #camera
-snippet cam camera
+snippet camera
 	camera(${1:eyeX}, ${2:eyeY}, ${3:eyeZ}, ${4:centerX}, ${5:centerY}, ${6:centerZ}, ${7:upX}, ${8:upY}, ${0:upZ});
-snippet cam ortho
+snippet ortho
 	ortho(${1:left}, ${2:right}, ${3:bottom}, ${4:top}, ${5:near}, ${0:far});
-snippet cam begin camera
-	beginCamera();
-snippet cam end camera
-	endCamera();
-snippet cam print camera
-	printCamera();
-snippet cam print camera projection
-	printProjection();
-snippet cam perspective camera
+snippet perspective
 	perspective(${1:fov}, ${2:aspect}, ${3:zNear}, ${0:zFar});
-snippet cam frustrum
+snippet frustrum
 	frustrum(${1:left}, ${2:right}, ${3:bottom}, ${4:top}, ${5:near}, ${0:far});
 
 #transformations
-snippet trans rotate
+snippet rotate
 	rotate${1:X}(${0:angle});
-snippet trans translate
+snippet translate
 	translate(${1:x}, ${2:y}${3:, }${0:z});
-snippet trans scale size
+snippet scale size
 	scale(${0:size});
-snippet trans scale
+snippet scale
 	scale(${1:x}, ${2:y}${3:, }${0:z});
 
 #coordinates
@@ -628,119 +562,109 @@ snippet coord
 	${1:model/screen}${2:X}(${3:x}, ${4:y}, ${0:z});
 
 #effects
-snippet fx brightness
+snippet brightness
 	brightness(${0:color});
-snippet fx lerp color
+snippet lerpColor
 	lerpColor(${1:c1}, ${2:c2}, ${0:amt});
-snippet fx saturation
+snippet saturation
 	saturation(${0:color});
-snippet fx hue
+snippet hue
 	hue(${0:color});
-snippet fx alpha
+snippet alpha
 	alpha(${0:color});
-snippet fx tint
+snippet tint
 	tint(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
-snippet fx notint
-	noTint();
 
 #pixel
-snippet px set pixel
+snippet set pixel
 	set(${1:x}, ${2:y}, ${0:color/image});
-snippet px update pixel
-	updatePixels();
-snippet px load pixel
-	loadPixels();
-snippet px pixels
+snippet pixels
 	pixels[${0:index}]
-snippet px get pixel
+snippet get pixel
 	get(${1:x}, ${2:y}${3:, }${4:width}${5:, }${0:height});
 
 #geometric figures
-snippet geof triangle
+snippet triangle
 	triangle(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${0:y3});
-snippet geof line
+snippet line
 	line(${1:x1}, ${2:y1}, ${3:x2}, ${0:y2});
-snippet geof line 3D
+snippet line 3D
 	line(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${0:z2});
-snippet geof arc
+snippet arc
 	arc(${1:x}, ${2:y}, ${3:width}, ${4:height}, ${5:start}, ${0:stop});
-snippet geof point
+snippet point
 	point(${1:x}, ${2:y}${3:, }${0:z});
-snippet geof quad
+snippet quad
 	quad(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3}, ${7:x4}, ${0:y4});
-snippet geof ellipse
+snippet ellipse
 	ellipse(${1:x}, ${2:y}, ${3:width}, ${0:height});
-snippet geof rect
+snippet rect
 	rect(${1:x}, ${2:y}, ${3:width}, ${0:height});
-snippet geof box
+snippet box
 	box(${1:width}, ${2:height}, ${0:depth});
-snippet geof sphere
+snippet sphere
 	sphere(${0:radius});
-snippet geof sphere details
+snippet sphereDetails
 	sphereDetail(${0:n});
-snippet geof set smooth
-	smooth();
-snippet geof set no smooth
-	noSmooth();
 
 #array operations
-snippet arrop normal split
+snippet split
 	split("${1:str}"${2: , }${0:delimiter});
-snippet arrop split Tokens
+snippet splitTokens
 	splitTokens(${1:str}${2:, }${0:tokens});
-snippet arrop join
+snippet join
 	join(${1:strgArray}${2: , }${0:seperator});
-snippet arrop shorten
+snippet shorten
 	shorten(${0:array});
-snippet arrop concat
+snippet concat
 	concat(${1:array1}, ${0:array2});
-snippet arrop subset
+snippet subset
 	subset(${1:array}, ${0:offset});
-snippet arrop append
+snippet append
 	append(${1:array}, ${0:element});
-snippet arrop reverse
+snippet reverse
 	reverse(${0:array});
-snippet arrop splice
+snippet splice
 	splice(${1:array}, ${2:value/array2}, ${0:index});
-snippet arrop sort
+snippet sort
 	sort(${1:dataArray}${2:, }${0:count});
-snippet arrop expand
+snippet expand
 	expand(${1:array}${2:, }${0:newSize});
-snippet arrop array copy
+snippet arrayCopy
 	arrayCopy(${1:src}, ${2:dest}, ${3:, }${0:length});
 
 #string operations
-snippet strop str
+snippet str
 	str("${0:str}");
-snippet strop match
+snippet match
 	match(${1:str}, ${0:regexp});
-snippet strop trim
+snippet trim
 	trim(${0:str});
-snippet strop nf
+snippet nf
 	nf(${2:value}, ${3:left}${4:, }${0:right});
-snippet strop nfs
+snippet nfs
 	nfs(${2:value}, ${3:left}${4:, }${0:right});
-snippet strop nfp
+snippet nfp
 	nfp(${2:value}, ${3:left}${4:, }${0:right});
-snippet strop nfc
+snippet nfc
 	nfc(${1:value}${2:, }${0:right});
 
 #convert
-snippet convert unbinary
+snippet unbinary
 	unbinary("${0:str}"});
-snippet convert hexadecimal
+snippet hexadecimal
 	hex(${0:c});
-snippet convert unhex
+snippet unhex
 	unhex(${0:c});
-snippet convert binary
+snippet binary
 	binary(${1:value}${2:, }${0:digits});
 
 #image operations
-snippet image load image
+snippet loadImage
 	loadImage(${0:filename});
-snippet image image
+snippet image
 	image(${1:img}, ${2:x}, ${3:y}${4:, }${5:width}${6:, }${0:height});
-snippet copy copy
+snippet copy
 	copy(${1:srcImg}${2:, }${3:x}, ${4:y}, ${5:width}, ${6:height}, ${7:dx}, ${8:dy}, ${9:dwidth}, ${0:dheight});
 
 
@@ -755,9 +679,6 @@ snippet pimage
 	PImage(${1:width}, ${0:height});
 
 #UTILS
-#nofill
-snippet nofill
-	noFill();
 #fill
 snippet fill
 	fill(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});

From c2195ff4946eefe82dfddc80cabe0d693747bcde Mon Sep 17 00:00:00 2001
From: crazymaster <ken.i54k@gmail.com>
Date: Wed, 25 Sep 2013 02:21:11 +0900
Subject: [PATCH 0198/1587] Fix a wrong snippet in processing

---
 snippets/processing.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/processing.snippets b/snippets/processing.snippets
index 60fd79ecb..015af4a5f 100755
--- a/snippets/processing.snippets
+++ b/snippets/processing.snippets
@@ -530,8 +530,8 @@ snippet lightFalloff
 	lightFalloff(${1:constant}, ${2:linear}, ${0:quadratic});
 snippet normal
 	normal(${1:nx}, ${2:ny}, ${0:nz});
-snippet lightFalloff
-	lightFalloff(${1:v1}, ${2:v2}, ${0:v3});
+snippet lightSpecular
+	lightSpecular(${1:v1}, ${2:v2}, ${0:v3});
 snippet ambientLight
 	ambientLight(${1:v1}, ${2:v2}, ${3:v3}${7:, ${4:x}, ${5:y}, ${0:z}});
 snippet spotLight

From fe4c59fa2d57f05e88940173c1b92a38513611eb Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Fri, 13 Sep 2013 11:09:29 +0800
Subject: [PATCH 0199/1587] [php] [symfony] some bugfix and improve

symfony snippet `ent` now support abstract class
---
 UltiSnips/php.snippets          | 13 +++++++------
 UltiSnips/php/symfony2.snippets |  8 ++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 7cc3e3c67..b7d016702 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -62,14 +62,15 @@ ${1:public} function __construct($2)
 endsnippet
 
 snippet sg "Setter and Getter" b
-
 /**
- * @var ${3:`!p snip.rv = t[2].capitalize()`}
+ * @var ${3:`!p snip.rv = t[2][0:1].upper() + t[2][1:]`}
+ * 
+ * ${4}
  */
-${1:protected} $$2;
+${1:protected} $${2};
 
-public function set`!p snip.rv = t[2].capitalize()`(`!p
-if re.match(r'[A-Z].*', t[3]):
+public function set`!p snip.rv = t[2][0:1].upper() + t[2][1:]`(`!p
+if re.match(r'^(\\|[A-Z]).*', t[3]):
 	snip.rv = t[3] + ' '
 else:
 	snip.rv = ''
@@ -80,7 +81,7 @@ else:
 	return $this;
 }
 
-public function get`!p snip.rv = t[2].capitalize()`()
+public function get`!p snip.rv = t[2][0:1].upper() + t[2][1:]`()
 {
 	return $this->$2;
 }
diff --git a/UltiSnips/php/symfony2.snippets b/UltiSnips/php/symfony2.snippets
index 8fba46b9f..b5ff0ee3e 100644
--- a/UltiSnips/php/symfony2.snippets
+++ b/UltiSnips/php/symfony2.snippets
@@ -33,7 +33,7 @@ snippet act "symfony2 action" b
 public function ${1}Action(${2})
 {
 	${6}
-	return $this->redirect($this->generate('home', [], false));
+	return $this->redirect($this->generateUrl('home', [], false));
 }
 endsnippet
 
@@ -175,7 +175,11 @@ tmp = re.sub(r'\B([A-Z])', r'_\1', tmp)
 snip.rv = tmp.lower()
 `")
  */
-class `!p
+`!p
+m = re.search(r'Abstract', path)
+if m:
+	snip.rv = 'abstract '
+`class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
 `
 {

From 0fd6eefc21ed42de77862514947099e4707fee19 Mon Sep 17 00:00:00 2001
From: Bruno Sutic <bruno.sutic@gmail.com>
Date: Mon, 30 Sep 2013 01:12:36 +0200
Subject: [PATCH 0200/1587] Ruby strf snippet

strf snippet contains a template that should format time in the same way
as `Time.now` default output.
---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index cbfc85ee5..fff295a41 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -585,6 +585,8 @@ snippet debug
 	require 'ruby-debug'; debugger; true;
 snippet pry
 	require 'pry'; binding.pry
+snippet strf
+	strftime("${1:%Y-%m-%d %H:%M:%S %z}")${0}
 #############################################
 # Rails snippets - for pure Ruby, see above #
 #############################################

From 6a38707185bd15db9ba529e99b0a657e6b2a8d00 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 12 Oct 2013 06:49:20 +0200
Subject: [PATCH 0201/1587] fix css_block

---
 snippets/html_minimal.snippets |   8 +-
 snippets/php.snippets          | 145 +++++++++++++++++++++++++++++++++
 snippets/ruby.snippets         |   6 ++
 3 files changed, 154 insertions(+), 5 deletions(-)

diff --git a/snippets/html_minimal.snippets b/snippets/html_minimal.snippets
index 308f44dfe..43e5d4a4e 100644
--- a/snippets/html_minimal.snippets
+++ b/snippets/html_minimal.snippets
@@ -63,12 +63,10 @@ snippet img
 snippet css_file
 	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
 snippet css_block
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${0:all}">
-        </link>
-
+	<style type='text/css'>
+	</style>
 snippet script_block
 	<script type="text/javascript" charset="utf-8">
 	</script>
 snippet script_file
-	<script type="text/javascript" charset="utf-8">
-	</script>
+	<script src="${1}" type="text/javascript"></script>
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 5af980112..1793d41c3 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -260,6 +260,10 @@ snippet if
 	if (${1:/* condition */}) {
 		${0}
 	}
+snippet ifn
+	if (!${1:/* condition */}) {
+		${2}
+	}
 snippet ifil
 	<?php if (${1:/* condition */}): ?>
 		${0}
@@ -412,3 +416,144 @@ snippet static_var
 	if (is_null($$1)){
 		$$1 = ${2};
 	}
+
+snippet CSVWriter
+	<?php
+	
+	class CSVWriter {
+		public function __construct($file_or_handle, $sep = "\t", $quot = '"'){
+			$args = func_get_args();
+			$mode = isset($opts['mode']) ? $opts['mode'] : 'w';
+	
+			$this->f =
+				is_string($file_or_handle)
+				? fopen($file_or_handle, $mode)
+				: $file_or_handle;
+	
+			$this->fputcsv_args = array($this->f, null, $sep, $quot);
+	
+			if (!$this->f) throw new Exception('bad file descriptor');
+		}
+	
+		public function write($row){
+			$this->fputcsv_args[1] =& $row;
+			call_user_func_array('fputcsv', $this->fputcsv_args);
+		}
+	
+		public function close(){
+			if (!is_null($this->f))
+				fclose($this->f);
+			$this->f = null;
+		}
+	
+		public function __destruct(){
+			$this->close();
+		}
+	
+	}
+
+snippet CSVIterator
+	
+	// http://snipplr.com/view.php?codeview&id=1986 // modified
+	class CSVIterator implements Iterator
+	{	
+		private $f;
+		private $curr;
+		private $rowCounter;
+	
+		 /* opts keys:
+			* row_size
+			* escape
+			* enclosure
+			* delimiter
+			*/
+		public function __construct( $file_or_handle, $opts = array(4096, ',') )
+		{
+			$d = function($n) use(&$opts){ return isset($opts[$n]) ? $opts[$n] : false; };
+	
+			$this->combine = $d('combine');
+			$this->headers = $d('headers');
+			$this->headerCheckFunction = $d('header_check_function');
+	
+			$this->f =
+				is_string($file_or_handle)
+				? fopen( $file_or_handle, 'r' )
+				: $file_or_handle;
+			if (!$this->f) throw new Exception('bad file descriptor');
+			$this->fgetcsv_args = array(
+					$this->f,
+					isset($opts['row_size']) ? $opts['row_size'] : 4096,
+					isset($opts['delimiter']) ? $opts['delimiter'] : ',',
+					isset($opts['enclosure']) ? $opts['enclosure'] : '"',
+					isset($opts['escape']) ? $opts['escape'] : '\\',
+			);
+			$this->start();
+		}
+	
+		protected function readRow(){
+			$this->curr = call_user_func_array('fgetcsv', $this->fgetcsv_args );
+			$this->rowCounter++;
+			if ($this->rowCounter == 1){
+				$this->processHeader();
+			} elseif ($this->curr) {
+				$this->processRow();
+			}
+		}
+	
+		public function processHeader(){
+			if ($this->headers || $this->combine){
+				$this->header = $this->curr;
+				if ($this->headerCheckFunction){
+					$f = $this->headerCheckFunction;
+					$f($this->header);
+				}
+				$this->readRow();
+			}
+		}
+	
+		public function processRow(){
+			if ($this->combine)
+				$this->curr = array_combine($this->header, $this->curr);
+		}
+	
+		public function start(){
+			$this->rowCounter = 0;
+			rewind( $this->f );
+			$this->readRow();
+		}
+	
+		public function rewind()
+		{
+			$this->start();
+		}
+	
+		public function current()
+		{
+			$curr = $this->curr;
+			$this->readRow();
+			return $curr;
+		}
+	
+		public function key()
+		{
+			return $this->rowCounter;
+		}
+	
+		public function next()
+		{
+			return $this->curr;
+		}
+	
+		public function valid(){
+			if( !$this->next() )
+			{
+				fclose( $this->f );
+				return FALSE;
+			}
+			return TRUE;
+		}
+	
+	} // end class
+
+snippet is
+	isset($1{VISUAL})
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index fff295a41..2d83f672b 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -58,6 +58,12 @@ snippet deft
 	def test_${1:case_name}
 		${0}
 	end
+snippets descendants
+	class Class
+		def descendants
+			ObjectSpace.each_object(::Class).select {|klass| klass < self }
+		end
+	end
 snippet if
 	if ${1:condition}
 		${0}

From 4526fcb19a7808ef6f08a10bb944f8e96ba6b615 Mon Sep 17 00:00:00 2001
From: Yamamoto Yuji <whosekiteneverfly@gmail.com>
Date: Sun, 13 Oct 2013 18:49:26 +0900
Subject: [PATCH 0202/1587] Fix typo in ruby.snippets: snippets => snippets

---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 2d83f672b..139a36140 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -58,7 +58,7 @@ snippet deft
 	def test_${1:case_name}
 		${0}
 	end
-snippets descendants
+snippet descendants
 	class Class
 		def descendants
 			ObjectSpace.each_object(::Class).select {|klass| klass < self }

From f35d8f2b16eb9008a7299609f9a10541ccedc7ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Szymczyszyn?= <lavrin@gmail.com>
Date: Sun, 20 Oct 2013 00:30:01 +0200
Subject: [PATCH 0203/1587] Add Erlang include_lib directive

---
 snippets/erlang.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index 799d7f57c..884587036 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -18,6 +18,9 @@ snippet exp
 # include directive
 snippet inc
 	-include("${1:file}").
+# include_lib directive
+snippet incl
+	-include_lib("${1:lib}/include/${1}.hrl").${2}
 # behavior directive
 snippet beh
 	-behaviour(${1:behaviour}).

From 6fd040687988c6a279905b3020199cfad887761d Mon Sep 17 00:00:00 2001
From: Cooper LeBrun <aerowolf01@gmail.com>
Date: Tue, 22 Oct 2013 18:56:21 -0700
Subject: [PATCH 0204/1587] added a section for assertions, and a simple
 assertEqual snippet

---
 snippets/python.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 638a9c4b8..d38df5b1a 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -140,6 +140,9 @@ snippet "
 	"""
 	${0:doc}
 	"""
+# assertions
+snippet a=
+	self.assertEqual(${0}, ${1})
 # test function/method
 snippet test
 	def test_${1:description}(${2:`indent('.') ? 'self' : ''`}):

From deffc63ee577af2e1e03cf43704263c9bd9682ff Mon Sep 17 00:00:00 2001
From: "Simeon F. Willbanks" <sfw@simeonfosterwillbanks.com>
Date: Sun, 27 Oct 2013 13:31:19 -0700
Subject: [PATCH 0205/1587] Remove duplicate "v" snippet

---
 snippets/go.snippets | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 03f7649d8..1f04d2dc0 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -213,9 +213,6 @@ snippet sp
 # true
 snippet t
 	true
-# variable declaration
-snippet v
-	var ${1:t} ${0:string}
 # goroutine named function
 snippet g
 	go ${1:funcName}(${0})

From 54ca21aaaf47e1e8712571fcd68f857ba86bd144 Mon Sep 17 00:00:00 2001
From: "Simeon F. Willbanks" <sfw@simeonfosterwillbanks.com>
Date: Sun, 27 Oct 2013 13:33:15 -0700
Subject: [PATCH 0206/1587] Refactor variable snippets * "v" is for shorthand
 variable declaration * "vr" is for variable initialization * "var" is for
 longhand variable declaration * "vars" is for multiple variable declarations

---
 snippets/go.snippets | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 1f04d2dc0..0239a3fbc 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -1,8 +1,17 @@
-# variables
+# shorthand variable declaration
 snippet v
 	${1} := ${2}
+# variable initialization
 snippet vr
+	var ${1:t} ${0:string}
+# variable declaration
+snippet var
 	var ${1} ${2} = ${3}
+# variables declaration
+snippet vars
+	var (
+		${1} ${2} = ${3}
+	)
 # append
 snippet ap
 	append(${1:slice}, ${0:value})

From 5eeaf6dd242af9ecfe251574f4a17358d92e9419 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Tue, 29 Oct 2013 22:09:20 -0300
Subject: [PATCH 0207/1587] Rename 'exp' snippet to more common snippet.

The old 'exp' with a block expectation becomes 'expb'.
---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 139a36140..ecf12d39f 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -995,6 +995,8 @@ snippet s.
 snippet spec
 	specify { subject.${0} }
 snippet exp
+	expect(${1:object}).to ${0}
+snippet expb
 	expect { ${1:object} }.to ${0}
 snippet raise
 	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/

From 5598d8990f3159580127be4749d772e03ff933e1 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Tue, 29 Oct 2013 22:11:20 -0300
Subject: [PATCH 0208/1587] Rename trigger for expectation of error from
 'raise' to 'experr'

---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index ecf12d39f..278c3615f 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -998,7 +998,7 @@ snippet exp
 	expect(${1:object}).to ${0}
 snippet expb
 	expect { ${1:object} }.to ${0}
-snippet raise
+snippet experr
 	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/
 snippet shared
 	shared_examples ${0:"shared examples name"}

From 30bc22c846f65279f86d00e2a721c30dc4bccf2b Mon Sep 17 00:00:00 2001
From: Angel Alonso <alderzdev@gmail.com>
Date: Fri, 15 Nov 2013 13:33:07 +0100
Subject: [PATCH 0209/1587] Fixed a typo in the README. whith -> with

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6d3e41db4..27592c73c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-IMPORTANT: comment on: [What about merging whith Ultisnip using its engine](https://github.com/garbas/vim-snipmate/issues/114)
+IMPORTANT: comment on: [What about merging with Ultisnip using its engine](https://github.com/garbas/vim-snipmate/issues/114)
 
 Snipmate & UltiSnip Snippets
 ============================

From f4d4005393bdf23a579667943c8a4394d91e82c8 Mon Sep 17 00:00:00 2001
From: Filipe Giusti <filipegiusti@gmail.com>
Date: Mon, 25 Nov 2013 18:52:33 -0200
Subject: [PATCH 0210/1587] Create '=' and '%' UltiSnips format shortcuts for
 eruby files

That matches the snippets for snipmate
---
 UltiSnips/eruby.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index 88f717911..cd462fb2c 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -24,6 +24,14 @@ def textmate_var(var, snip):
 endglobal
 
 
+snippet % "<% ${0} %>"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`${0}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
+endsnippet
+
+snippet = "<%= ${0} %>"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${0}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
 ###########################################################################
 #            GENERATED FROM get_tm_snippets.py + REGEX REPLACE            #
 ###########################################################################

From b79fa6736f299f274e4ab088cb40ba718c30d0ef Mon Sep 17 00:00:00 2001
From: Craig P Jolicoeur <cpjolicoeur@gmail.com>
Date: Wed, 27 Nov 2013 10:31:54 -0500
Subject: [PATCH 0211/1587] Fix typo

"cached" now "chached"
---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 278c3615f..551b313fb 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -174,7 +174,7 @@ snippet ana
 	accepts_nested_attributes_for :${0:association}
 # ivc == instance variable cache
 snippet ivc
-	@${1:variable_name} ||= ${0:chached_value}
+	@${1:variable_name} ||= ${0:cached_value}
 # include Enumerable
 snippet Enum
 	include Enumerable

From b4bbb981208dcf8ff0ed442d495dc155e255bcf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bygd=C3=A9n?= <github@bygden.nu>
Date: Sun, 1 Dec 2013 23:21:31 +0100
Subject: [PATCH 0212/1587] Some extensions to service and, primarily, file
 snippet for puppet

---
 snippets/puppet.snippets | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index d35608ddf..2e451e414 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -223,14 +223,22 @@ snippet define
 	}
 
 snippet service
-	service{ "${1:service}":
-		enable		=> ${2:true},
-		ensure		=> ${0:running},
-		hasstatus	=> true,
+	service { '${1:service}' :
+		ensure    => running,
+		enable    => true,
+		require   => [ Package['${2:package}'], File['${3:file}'], ],
+		subscribe => [ File['${4:configfile1}'], File['${5:configfile2}'], Package['${6:package}'], ]
 	}
 
 snippet file
-	file{ "${1:path}":
-		${2}	=> ${0}
+	file { '${1:filename}' :
+		ensure  => ${2:present},
+		owner   => '${3:root}',
+		group   => '${4:root}',
+		mode    => '${5:0644}',
+		source  => 'puppet:///modules/${6:module}/${7:source}',
+		content => template('/etc/puppet/templates/${8:template}'),
+		alias   => '${9:alias}',
+		require => [ Package['${10:package}'], File['${11:file}'], ],
 	}
 

From 4f3113255c12963fbdb0451f42b239ca93b1efd5 Mon Sep 17 00:00:00 2001
From: Marc Camuzat <camuzat@crans.org>
Date: Sun, 8 Dec 2013 17:11:57 +0100
Subject: [PATCH 0213/1587] Add Phpunit

---
 snippets/php.snippets | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 1793d41c3..d7b21eb5c 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -557,3 +557,44 @@ snippet CSVIterator
 
 snippet is
 	isset($1{VISUAL})
+
+# phpunit	
+snippet ase
+	$this->assertEquals(${1:expected}, ${2:actual});
+
+snippet asne
+	$this->assertNotEquals(${1:expected}, ${2:actual});
+
+snippet asf
+	$this->assertFalse(${1:Something});
+
+snippet ast
+	$this->assertTrue(${1:Something});
+
+snippet asfex
+	$this->assertFileExists(${1:path/to/file});
+
+snippet asfnex
+	$this->assertFileNotExists(${1:path/to/file});
+
+snippet ascon
+	$this->assertContains(${1:Search Value}, ${2:Array or Iterator});
+
+snippet ashk
+	$this->assertArrayHasKey(${1:key}, ${2:array});
+
+snippet asnhk
+	this->assertArrayNotHasKey(${1:value}, ${2:array});
+
+snippet ascha
+	$this->assertClassHasAttribute('${1:Attribute Name}', '${2:ClassName}');
+
+snippet asi
+	$this->assertInstanceOf(${1:expected}, ${2:actual});
+
+snippet tc
+	public function test${1:name_of_the_test}()
+	{
+		${0:code}
+	}
+

From 218eb0adb959cbdcad9a00e198d8c9f7b45da9b2 Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Sun, 8 Dec 2013 18:35:27 +0800
Subject: [PATCH 0214/1587] add twig snippets

---
 UltiSnips/php/symfony2.snippets | 48 ++++++++++++++++++++++++---------
 UltiSnips/twig.snippets         | 33 +++++++++++++++++++++++
 2 files changed, 68 insertions(+), 13 deletions(-)
 create mode 100644 UltiSnips/twig.snippets

diff --git a/UltiSnips/php/symfony2.snippets b/UltiSnips/php/symfony2.snippets
index b5ff0ee3e..77f923f64 100644
--- a/UltiSnips/php/symfony2.snippets
+++ b/UltiSnips/php/symfony2.snippets
@@ -1,7 +1,7 @@
 # sugguestion? report bugs? 
 # go to https://github.com/chrisyue/vim-snippets/issues
 
-snippet contr "symfony2 controller" b
+snippet contr "Symfony2 controller" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -25,19 +25,19 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet act "symfony2 action" b
+snippet act "Symfony2 action" b
 /**
  * @Route("${3}", name="${4}")
  * @Method({${5:"POST"}})
+ * @Template()
  */
 public function ${1}Action(${2})
 {
 	${6}
-	return $this->redirect($this->generateUrl('home', [], false));
 }
 endsnippet
 
-snippet actt "symfony2 action and template" b
+snippet actt "Symfony2 action and template" b
 /**
  * @Route("${3}", name="${4}")
  * @Method({${5:"GET"}})
@@ -51,7 +51,7 @@ public function ${1}Action(${2})
 abspath = os.path.abspath(path)`
 endsnippet
 
-snippet comm "symfony2 command" b
+snippet comm "Symfony2 command" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -74,14 +74,12 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 {
 	protected function configure()
 	{
-		$this
-			->setName('${1}')
+		$this->setName('${1}')
 			->setDescription('${2}')
 			->setDefinition([
 				new InputArgument('', InputArgument::REQUIRED, ''),
 				new InputOption('', null, InputOption::VALUE_NONE, ''),
-			])
-		;
+			]);
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output)
@@ -90,7 +88,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet subs "symfony2 subscriber" b
+snippet subs "Symfony2 subscriber" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -121,7 +119,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet transf "symfony2 form data transformer" b
+snippet transf "Symfony2 form data transformer" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -155,7 +153,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet ent "symfony2 doctrine entity" b
+snippet ent "Symfony2 doctrine entity" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -192,7 +190,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet form "symfony2 form type" b
+snippet form "Symfony2 form type" b
 namespace `!p 
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
@@ -235,3 +233,27 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 	}
 }
 endsnippet
+
+snippet ev "Symfony2 event" b
+namespace `!p 
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\EventDispatcher\Event;
+
+/**
+ * ${2:@author `whoami`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends Event
+{
+}
+endsnippet
+
+snippet redir "Symfony2 redirect"
+$this->redirect($this->generateUrl('${1}', ${2}));
+endsnippet
diff --git a/UltiSnips/twig.snippets b/UltiSnips/twig.snippets
new file mode 100644
index 000000000..373404886
--- /dev/null
+++ b/UltiSnips/twig.snippets
@@ -0,0 +1,33 @@
+snippet bl "twig block" b
+{% block ${1} %}
+${2}
+{% endblock $1 %}
+endsnippet
+
+snippet js "twig javascripts" b
+{% javascripts '${1}' %}
+	<script src="{{ asset_url }}"></script>
+{% endjavascripts %}
+endsnippet
+
+snippet css "twig stylesheets" b
+{% stylesheets '${1}' %}
+	<script src="{{ asset_url }}"></script>
+{% endstylesheets %}
+endsnippet
+
+snippet if "twig if" b
+{% if ${1} %}
+${2}
+{% endif %}
+endsnippet
+
+snippet for "twig for" b
+{% for ${1} in ${2} %}
+${3}
+{% endfor %}
+endsnippet
+
+snippet ext "twig extends" b
+{% extends ${1} %}
+endsnippet

From aef52d62132b4e96c6d0fc368b7ccb5de7403d90 Mon Sep 17 00:00:00 2001
From: Alexander Ross <izepax@gmail.com>
Date: Wed, 25 Dec 2013 01:34:33 +0100
Subject: [PATCH 0215/1587] Adds slim.

---
 snippets/slim.snippets | 64 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 snippets/slim.snippets

diff --git a/snippets/slim.snippets b/snippets/slim.snippets
new file mode 100644
index 000000000..8eeb4a535
--- /dev/null
+++ b/snippets/slim.snippets
@@ -0,0 +1,64 @@
+# Some useful Unicode entities
+# ============================
+# Non-Breaking Space
+snippet nbs
+	&nbsp;
+# ←
+snippet left
+	&#x2190;
+# →
+snippet right
+	&#x2192;
+# ↑
+snippet up
+	&#x2191;
+# ↓
+snippet down
+	&#x2193;
+# ↩
+snippet return
+	&#x21A9;
+# ⇤
+snippet backtab
+	&#x21E4;
+# ⇥
+snippet tab
+	&#x21E5;
+# ⇧
+snippet shift
+	&#x21E7;
+# ⌃
+snippet ctrl
+	&#x2303;
+# ⌅
+snippet enter
+	&#x2305;
+# ⌘
+snippet cmd
+	&#x2318;
+# ⌥
+snippet option
+	&#x2325;
+# ⌦
+snippet delete
+	&#x2326;
+# ⌫
+snippet backspace
+	&#x232B;
+# ⎋
+snippet esc
+	&#x238B;
+
+# Forms
+# =====
+snippet fieldset
+	fieldset
+		legend ${1}
+
+# Assets
+# ======
+snippet css
+	link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}"
+
+snippet script
+	script src="${1:script.js}" type="text/javascript"

From 3a5001d0d3c63633386443a974d7a0132d102f07 Mon Sep 17 00:00:00 2001
From: yuhuanbo <yuhuanbo@fabei.net>
Date: Thu, 26 Dec 2013 21:31:30 +0800
Subject: [PATCH 0216/1587] fix twig css

---
 UltiSnips/twig.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/twig.snippets b/UltiSnips/twig.snippets
index 373404886..9db43f7d7 100644
--- a/UltiSnips/twig.snippets
+++ b/UltiSnips/twig.snippets
@@ -12,7 +12,7 @@ endsnippet
 
 snippet css "twig stylesheets" b
 {% stylesheets '${1}' %}
-	<script src="{{ asset_url }}"></script>
+	<link rel="stylesheet" href="{{ asset_url }}">
 {% endstylesheets %}
 endsnippet
 

From e9ece38636aaab61c9454dc2167e103e3ab7e5ce Mon Sep 17 00:00:00 2001
From: Piotr Yordanov <piotr.yordanov@gmail.com>
Date: Fri, 3 Jan 2014 06:37:03 +0000
Subject: [PATCH 0217/1587] Added Ajax for Coffescript

---
 snippets/coffee.snippets | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/snippets/coffee.snippets b/snippets/coffee.snippets
index aca6e81aa..7ed1ebf42 100644
--- a/snippets/coffee.snippets
+++ b/snippets/coffee.snippets
@@ -93,3 +93,17 @@ snippet req
 # Export
 snippet exp
 	${0:root} = exports ? this
+
+
+snippet ajax
+	$.ajax
+	  url: "${1:mydomain.com/url}"
+	  type: "${2:POST}"
+	  dataType: "${3:xml/html/script/json}"
+	  data: ${4:data}
+	  complete: (jqXHR, textStatus) ->
+		${5:// callback}
+	  success: (data, textStatus, jqXHR) ->
+		${6:// success callback}
+	  error: (jqXHR, textStatus, errorThrown) ->
+		${0:// error callback}

From c52b4d19f78472c40d0c64d3b277a1992119cefc Mon Sep 17 00:00:00 2001
From: tUrG0n <piotr.yordanov@gmail.com>
Date: Sun, 5 Jan 2014 11:42:01 +0200
Subject: [PATCH 0218/1587] Converted jquery-js to jquery-coffee

---
 snippets/coffee/angular_coffee.snippets | 116 ++++++
 snippets/coffee/coffee.snippets         | 109 +++++
 snippets/coffee/jquery_coffee.snippets  | 524 ++++++++++++++++++++++++
 3 files changed, 749 insertions(+)
 create mode 100644 snippets/coffee/angular_coffee.snippets
 create mode 100644 snippets/coffee/coffee.snippets
 create mode 100644 snippets/coffee/jquery_coffee.snippets

diff --git a/snippets/coffee/angular_coffee.snippets b/snippets/coffee/angular_coffee.snippets
new file mode 100644
index 000000000..f98cae355
--- /dev/null
+++ b/snippets/coffee/angular_coffee.snippets
@@ -0,0 +1,116 @@
+## Global Snippets
+# Define a new Angular Controller;
+# You can change the controller name and parameters
+snippet ngc
+	${1:controllerName} = (${2:scope}, ${3:injectables}) ->
+		${4}
+# angular.foreach loop
+snippet ngfor
+	angular.forEach ${1:iterateOver}, (value, key) ->
+		${2}
+## Module Based Snippets
+# A new angular module without a config function
+snippet ngm
+	angular.module '${1:moduleName}', [${2:moduleDependencies}]
+	${3}
+# A new angular module without a config function and a variable assignment
+snippet ngma
+	${1:moduleName} = angular.module '$1', [${2:moduleDeps}]
+	${3}
+# A new angular module with a config function
+snippet ngmc
+	${1:moduleName} = angular.module('$1', [${2:moduleDeps}], (${3:configDeps}) ->
+		${4}
+	)
+# A factory in a module
+snippet ngmfa
+	factory '${1:factoryName}', (${2:dependencies}) ->
+		${3}
+# Define an Angular Module Service to be attached to a previously defined module
+# You can change the service name and service injectables
+snippet ngms
+	service '${1:serviceName}', (${2:injectables}) ->
+		${3}
+# Define an Angular Module Filter to be attached to a previously defined module
+# You can change the filter name
+snippet ngmfi
+	filter '${1:filterName}', (${2:injectables}) ->
+		(input, ${3:args}) ->
+			${4}
+## Route Based Snippets
+# Defines a when condition of an AngularJS route
+snippet ngrw
+	$routeProvider.when '${1:url}',
+		templateUrl: '${2:templateUrl}'
+		controller: '${3:controller}'
+	${4}
+# Defines a when condition of an AngularJS route with the resolve block
+snippet ngrwr
+	$routeProvider.when '${1:url}',
+		templateUrl: '${2:templateUrl}'
+		controller: '${3:controller}'
+		resolve:
+			${4}
+	${5}
+# Defines an otherwise condition of an AngularJS route
+snippet ngro
+	$routeProvider.otherwise redirectTo: '${1:url}'
+	${2}
+## Scope Related Snippets
+# Define a new $scope'd function (usually inside an AngularJS Controller)
+# You can change the function name and arguments
+snippet $f
+	$scope.${1:functionName} = (${2:args}) ->
+		${3}
+# Defines a new $scope'd variable inside an AngularJS controller
+snippet $v
+	$scope.${1:variable} = ${2:value}
+	${3}
+# Defines a new $scope'd variable inside an AngularJS controller and assigns a value from a constructor arguments
+snippet $va
+	$scope.${1:variable} = ${2:variable}
+	${3}
+# Define a $watch for an expression
+# You can change the expression to be watched
+snippet $w
+	$scope.$watch '${1:watchExpr}', (newValue, oldValue) ->
+		${2}
+# Define a $on for a $broadcast/$emit on the $scope inside an Angular Controller
+# You can change the event name to listen on
+snippet $on
+	$scope.$on '${1:eventName}', (event, ${2:args}) ->
+		${3}
+# Define a $broadcast for a $scope inside an Angular Controller / Angular Controller Function
+# You can change the event name and optional event arguments
+snippet $b
+	$scope.$broadcast '${1:eventName}', ${2:eventArgs}
+	${3}
+# Define an $emit for a $scope inside an Angular Controller / Angular Controller Function
+# You can change the event name and optional event arguments
+snippet $e
+	$scope.$emit '${1:eventName}', ${2:eventArgs}
+	${3}
+## Directive related snippets
+# A compile function
+snippet ngdcf
+	compile = (tElement, tAttrs, transclude) ->
+		(scope, element, attrs) ->
+			${1}
+# A linking function in a directive
+snippet ngdlf
+	(scope, element, attrs${1:ctrl}) ->
+		${2}
+# A directive with a compile function
+snippet ngdc
+	directive '${1:directiveName}', factory = (${2:injectables}) ->
+		directiveDefinitionObject =
+			${3:directiveAttrs}
+			compile: compile = (tElement, tAttrs, transclude) ->
+				(scope, element, attrs) ->
+		directiveDefinitionObject
+# A directive with a linking function only
+snippet ngdl
+	.directive('${1:directiveName}', (${2:directiveDeps}) ->
+		(scope, element, attrs${3:ctrl}) ->
+			${4}
+	)
\ No newline at end of file
diff --git a/snippets/coffee/coffee.snippets b/snippets/coffee/coffee.snippets
new file mode 100644
index 000000000..7ed1ebf42
--- /dev/null
+++ b/snippets/coffee/coffee.snippets
@@ -0,0 +1,109 @@
+# Closure loop
+snippet forindo
+	for ${1:name} in ${2:array}
+		do ($1) ->
+			${0:// body}
+# Array comprehension
+snippet fora
+	for ${1:name} in ${2:array}
+		${0:# body...}
+# Object comprehension
+snippet foro
+	for ${1:key}, ${2:value} of ${3:object}
+		${0:# body...}
+# Range comprehension (inclusive)
+snippet forr
+	for ${1:name} in [${2:start}..${3:finish}]
+		${0:# body...}
+snippet forrb
+	for ${1:name} in [${2:start}..${3:finish}] by ${4:step}
+		${0:# body...}
+# Range comprehension (exclusive)
+snippet forrex
+	for ${1:name} in [${2:start}...${3:finish}]
+		${0:# body...}
+snippet forrexb
+	for ${1:name} in [${2:start}...${3:finish}] by ${4:step}
+		${0:# body...}
+# Function
+snippet fun
+	(${1:args}) ->
+		${0:# body...}
+# Function (bound)
+snippet bfun
+	(${1:args}) =>
+		${0:# body...}
+# Class
+snippet cla class ..
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		${0}
+snippet cla class .. constructor: ..
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		constructor: (${2:args}) ->
+			${3}
+
+		${0}
+snippet cla class .. extends ..
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+		${0}
+snippet cla class .. extends .. constructor: ..
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+		constructor: (${3:args}) ->
+			${4}
+
+		${0}
+# If
+snippet if
+	if ${1:condition}
+		${0:# body...}
+# If __ Else
+snippet ife
+	if ${1:condition}
+		${2:# body...}
+	else
+		${0:# body...}
+# Else if
+snippet eif
+	else if ${1:condition}
+		${0:# body...}
+# Ternary If
+snippet ifte
+	if ${1:condition} then ${2:value} else ${0:other}
+# Unless
+snippet unl
+	${1:action} unless ${0:condition}
+# Switch
+snippet swi
+	switch ${1:object}
+		when ${2:value}
+			${0:# body...}
+
+# Log
+snippet log
+	console.log ${0}
+# Try __ Catch
+snippet try
+	try
+		${1}
+	catch ${2:error}
+		${0}
+# Require
+snippet req
+	${2:$1} = require '${1:sys}'
+# Export
+snippet exp
+	${0:root} = exports ? this
+
+
+snippet ajax
+	$.ajax
+	  url: "${1:mydomain.com/url}"
+	  type: "${2:POST}"
+	  dataType: "${3:xml/html/script/json}"
+	  data: ${4:data}
+	  complete: (jqXHR, textStatus) ->
+		${5:// callback}
+	  success: (data, textStatus, jqXHR) ->
+		${6:// success callback}
+	  error: (jqXHR, textStatus, errorThrown) ->
+		${0:// error callback}
diff --git a/snippets/coffee/jquery_coffee.snippets b/snippets/coffee/jquery_coffee.snippets
new file mode 100644
index 000000000..10bcd7756
--- /dev/null
+++ b/snippets/coffee/jquery_coffee.snippets
@@ -0,0 +1,524 @@
+snippet add
+	${1:obj}.add('${2:selector expression}')
+snippet addClass
+	${1:obj}.addClass('${2:class name}')
+snippet after
+	${1:obj}.after('${2:Some text <b>and bold!</b>}')
+snippet ajax
+	$.ajax
+	  url: "${1:mydomain.com/url}"
+	  type: "${2:POST}"
+	  dataType: "${3:xml/html/script/json}"
+	  data: ${4:data}
+	  complete: (jqXHR, textStatus) ->
+		${5:// callback}
+	  success: (data, textStatus, jqXHR) ->
+		${6:// success callback}
+	  error: (jqXHR, textStatus, errorThrown) ->
+		${0:// error callback}
+snippet ajaxcomplete
+	${1:obj}.ajaxComplete (${1:e}, xhr, settings) ->
+		${0:// callback}
+snippet ajaxerror
+	${1:obj}.ajaxError (${1:e}, xhr, settings, thrownError) ->
+		${2:// error callback}
+	${0}
+snippet ajaxget
+	$.get '${1:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		(data, textStatus, jqXHR) ->
+			${0:// success callback}
+snippet ajaxpost
+	$.post '${1:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		(data, textStatus, jqXHR) ->
+			${0:// success callback}
+snippet ajaxprefilter
+	$.ajaxPrefilter (${1:options}, ${2:originalOptions}, jqXHR) ->
+		${0: // Modify options, control originalOptions, store jqXHR, etc}
+snippet ajaxsend
+	${1:obj}.ajaxSend (${1:request, settings}) ->
+		${2:// error callback}
+	${0}
+snippet ajaxsetup
+	$.ajaxSetup({
+		url: "${1:mydomain.com/url}",
+		type: "${2:POST}",
+		dataType: "${3:xml/html/script/json}",
+		data: $.param( $("${4:Element or Expression}") ),
+		complete: (jqXHR, textStatus) ->
+			${5:// callback}
+		,
+		success: (data, textStatus, jqXHR) ->
+			${6:// success callback}
+		,
+		error: (jqXHR, textStatus, errorThrown) ->
+			${0:// error callback}
+	})
+snippet ajaxstart
+	$.ajaxStart ->
+		${1:// handler for when an AJAX call is started and no other AJAX calls are in progress}
+	${0}
+snippet ajaxstop
+	$.ajaxStop ->
+		${1:// handler for when all AJAX calls have been completed}
+	${0}
+snippet ajaxsuccess
+	$.ajaxSuccess (${1:e}, xhr, settings) ->
+		${2:// handler for when any AJAX call is successfully completed}
+	${0}
+snippet andself
+	${1:obj}.andSelf()
+snippet animate
+	${1:obj}.animate({${2:param1: value1, param2: value2}}, ${3:speed})
+snippet append
+	${1:obj}.append('${2:Some text <b>and bold!</b>}')
+snippet appendTo
+	${1:obj}.appendTo('${2:selector expression}')
+snippet attr
+	${1:obj}.attr('${2:attribute}', '${3:value}')
+snippet attrm
+	${1:obj}.attr({'${2:attr1}': '${3:value1}', '${4:attr2}': '${5:value2}'})
+snippet before
+	${1:obj}.before('${2:Some text <b>and bold!</b>}')
+snippet bind
+	${1:obj}.bind('${2:event name}', (${3:e}) ->
+		${0:// event handler}
+snippet blur
+	${1:obj}.blur (${2:e}) ->
+		${0:// event handler}
+snippet C
+	$.Callbacks()
+snippet Cadd
+	${1:callbacks}.add(${2:callbacks})
+snippet Cdis
+	${1:callbacks}.disable()
+snippet Cempty
+	${1:callbacks}.empty()
+snippet Cfire
+	${1:callbacks}.fire(${2:args})
+snippet Cfired
+	${1:callbacks}.fired()
+snippet Cfirew
+	${1:callbacks}.fireWith(${2:this}, ${3:args})
+snippet Chas
+	${1:callbacks}.has(${2:callback})
+snippet Clock
+	${1:callbacks}.lock()
+snippet Clocked
+	${1:callbacks}.locked()
+snippet Crem
+	${1:callbacks}.remove(${2:callbacks})
+snippet change
+	${1:obj}.change (${2:e}) ->
+		${0:// event handler}
+snippet children
+	${1:obj}.children('${2:selector expression}')
+snippet clearq
+	${1:obj}.clearQueue(${2:'queue name'})
+snippet click
+	${1:obj}.click (${2:e}) ->
+		${0:// event handler}
+snippet clone
+	${1:obj}.clone()
+snippet contains
+	$.contains(${1:container}, ${0:contents})
+snippet css
+	${1:obj}.css('${2:attribute}', '${3:value}')
+snippet csshooks
+	$.cssHooks['${1:CSS prop}'] = {
+		get: (elem, computed, extra) ->
+			${2: // handle getting the CSS property}
+		set: (elem, value) ->
+			${0: // handle setting the CSS value}
+	}
+snippet cssm
+	${1:obj}.css({${2:attribute1}: '${3:value1}', ${4:attribute2}: '${5:value2}'})
+snippet D
+	$.Deferred()
+snippet Dalways
+	${1:deferred}.always(${2:callbacks})
+snippet Ddone
+	${1:deferred}.done(${2:callbacks})
+snippet Dfail
+	${1:deferred}.fail(${2:callbacks})
+snippet Disrej
+	${1:deferred}.isRejected()
+snippet Disres
+	${1:deferred}.isResolved()
+snippet Dnotify
+	${1:deferred}.notify(${2:args})
+snippet Dnotifyw
+	${1:deferred}.notifyWith(${2:this}, ${3:args})
+snippet Dpipe
+	${1:deferred}.then(${2:doneFilter}, ${3:failFilter}, ${4:progressFilter})
+snippet Dprog
+	${1:deferred}.progress(${2:callbacks})
+snippet Dprom
+	${1:deferred}.promise(${2:target})
+snippet Drej
+	${1:deferred}.reject(${2:args})
+snippet Drejw
+	${1:deferred}.rejectWith(${2:this}, ${3:args})
+snippet Dres
+	${1:deferred}.resolve(${2:args})
+snippet Dresw
+	${1:deferred}.resolveWith(${2:this}, ${3:args})
+snippet Dstate
+	${1:deferred}.state()
+snippet Dthen
+	${1:deferred}.then(${2:doneCallbacks}, ${3:failCallbacks}, ${4:progressCallbacks})
+snippet Dwhen
+	$.when(${1:deferreds})
+snippet data
+	${1:obj}.data(${2:obj})
+snippet dataa
+	$.data('${1:selector expression}', '${2:key}'${3:, 'value'})
+snippet dblclick
+	${1:obj}.dblclick (${2:e}) ->
+		${0:// event handler}
+snippet delay
+	${1:obj}.delay('${2:slow/400/fast}'${3:, 'queue name'})
+snippet dele
+	${1:obj}.delegate '${2:selector expression}', '${3:event name}', (${4:e}) ->
+		${0:// event handler}
+snippet deq
+	${1:obj}.dequeue(${2:'queue name'})
+snippet deqq
+	$.dequeue('${1:selector expression}'${2:, 'queue name'})
+snippet detach
+	${1:obj}.detach('${2:selector expression}')
+snippet die
+	${1:obj}.die(${2:event}, ${3:handler})
+snippet each
+	${1:obj}.each (index) ->
+		${0:this.innerHTML = this + " is the element, " + index + " is the position"}
+snippet el
+	$('<${1}/>'${2:, {}})
+snippet eltrim
+	$.trim('${1:string}')
+snippet empty
+	${1:obj}.empty()
+snippet end
+	${1:obj}.end()
+snippet eq
+	${1:obj}.eq(${2:element index})
+snippet error
+	${1:obj}.error (${2:e}) ->
+		${0:// event handler}
+snippet eventsmap
+	{
+		:f${0}
+	}
+snippet extend
+	$.extend(${1:true, }${2:target}, ${3:obj})
+snippet fadein
+	${1:obj}.fadeIn('${2:slow/400/fast}')
+snippet fadeinc
+	${1:obj}.fadeIn 'slow/400/fast', ->
+		${0:// callback}
+snippet fadeout
+	${1:obj}.fadeOut('${2:slow/400/fast}')
+snippet fadeoutc
+	${1:obj}.fadeOut 'slow/400/fast', ->
+		${0:// callback}
+snippet fadeto
+	${1:obj}.fadeTo('${2:slow/400/fast}', ${3:0.5})
+snippet fadetoc
+	${1:obj}.fadeTo 'slow/400/fast', ${2:0.5}, ->
+		${0:// callback}
+snippet filter
+	${1:obj}.filter('${2:selector expression}')
+snippet filtert
+	${1:obj}.filter (${2:index}) ->
+		${3}
+snippet find
+	${1:obj}.find('${2:selector expression}')
+snippet focus
+	${1:obj}.focus (${2:e}) ->
+		${0:// event handler}
+snippet focusin
+	${1:obj}.focusIn (${2:e}) ->
+		${0:// event handler}
+snippet focusout
+	${1:obj}.focusOut (${2:e}) ->
+		${0:// event handler}
+snippet get
+	${1:obj}.get(${2:element index})
+snippet getjson
+	$.getJSON '${1:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		(data, textStatus, jqXHR) ->
+			${0:// success callback}
+snippet getscript
+	$.getScript '${1:mydomain.com/url}', (script, textStatus, jqXHR) ->
+		${0:// callback}
+snippet grep
+	$.grep(${1:array}, (item, index) >
+		${2}
+	${0:, true})
+snippet hasc
+	${1:obj}.hasClass('${2:className}')
+snippet hasd
+	$.hasData('${0:selector expression}')
+snippet height
+	${1:obj}.height(${2:integer})
+snippet hide
+	${1:obj}.hide('${2:slow/400/fast}')
+snippet hidec
+	${1:obj}.hide '${2:slow/400/fast}', ->
+		${0:// callback}
+snippet hover
+	${1:obj}.hover (${2:e}) ->
+		${3:// event handler}
+	, ($2) ->
+		${4:// event handler}
+snippet html
+	${1:obj}.html('${2:Some text <b>and bold!</b>}')
+snippet inarr
+	$.inArray(${1:value}, ${0:array})
+snippet insa
+	${1:obj}.insertAfter('${2:selector expression}')
+snippet insb
+	${1:obj}.insertBefore('${2:selector expression}')
+snippet is
+	${1:obj}.is('${2:selector expression}')
+snippet isarr
+	$.isArray(${1:obj})
+snippet isempty
+	$.isEmptyObject(${1:obj})
+snippet isfunc
+	$.isFunction(${1:obj})
+snippet isnum
+	$.isNumeric(${1:value})
+snippet isobj
+	$.isPlainObject(${1:obj})
+snippet iswin
+	$.isWindow(${1:obj})
+snippet isxml
+	$.isXMLDoc(${1:node})
+snippet jj
+	$('${1:selector}')
+snippet kdown
+	${1:obj}.keydown (${2:e}) ->
+		${0:// event handler}
+snippet kpress
+	${1:obj}.keypress (${2:e}) ->
+		${0:// event handler}
+snippet kup
+	${1:obj}.keyup (${2:e}) ->
+		${0:// event handler}
+snippet last
+	${1:obj}.last('${1:selector expression}')
+snippet live
+	${1:obj}.live '${2:events}', (${3:e}) ->
+		${0:// event handler}
+snippet load
+	${1:obj}.load (${2:e}) ->
+		${0:// event handler}
+snippet loadf
+	${1:obj}.load('${2:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		(responseText, textStatus, xhr) ->
+			${0:// success callback}
+	})
+snippet makearray
+	$.makeArray(${0:obj})
+snippet map
+	${1:obj}.map (${2:index}, ${3:element}) ->
+		${0:// callback}
+snippet mapp
+	$.map ${1:arrayOrObject}, (${2:value}, ${3:indexOrKey}) ->
+		${0:// callback}
+snippet merge
+	$.merge(${1:target}, ${0:original})
+snippet mdown
+	${1:obj}.mousedown (${2:e}) ->
+		${0:// event handler}
+snippet menter
+	${1:obj}.mouseenter (${2:e}) ->
+		${0:// event handler}
+snippet mleave
+	${1:obj}.mouseleave (${2:e}) ->
+		${0:// event handler}
+snippet mmove
+	${1:obj}.mousemove (${2:e}) ->
+		${0:// event handler}
+snippet mout
+	${1:obj}.mouseout (${2:e}) ->
+		${0:// event handler}
+snippet mover
+	${1:obj}.mouseover (${2:e}) ->
+		${0:// event handler}
+snippet mup
+	${1:obj}.mouseup (${2:e}) ->
+		${0:// event handler}
+snippet next
+	${1:obj}.next('${2:selector expression}')
+snippet nexta
+	${1:obj}.nextAll('${2:selector expression}')
+snippet nextu
+	${1:obj}.nextUntil('${2:selector expression}'${3:, 'filter expression'})
+snippet not
+	${1:obj}.not('${2:selector expression}')
+snippet off
+	${1:obj}.off('${2:events}', '${3:selector expression}'${4:, handler})
+snippet offset
+	${1:obj}.offset()
+snippet offsetp
+	${1:obj}.offsetParent()
+snippet on
+	${1:obj}.on '${2:events}', '${3:selector expression}', (${4:e}) ->
+		${0:// event handler}
+snippet one
+	${1:obj}.one '${2:event name}', (${3:e}) ->
+		${0:// event handler}
+snippet outerh
+	${1:obj}.outerHeight()
+snippet outerw
+	${1:obj}.outerWidth()
+snippet param
+	$.param(${1:obj})
+snippet parent
+	${1:obj}.parent('${2:selector expression}')
+snippet parents
+	${1:obj}.parents('${2:selector expression}')
+snippet parentsu
+	${1:obj}.parentsUntil('${2:selector expression}'${3:, 'filter expression'})
+snippet parsejson
+	$.parseJSON(${1:data})
+snippet parsexml
+	$.parseXML(${1:data})
+snippet pos
+	${1:obj}.position()
+snippet prepend
+	${1:obj}.prepend('${2:Some text <b>and bold!</b>}')
+snippet prependto
+	${1:obj}.prependTo('${2:selector expression}')
+snippet prev
+	${1:obj}.prev('${2:selector expression}')
+snippet preva
+	${1:obj}.prevAll('${2:selector expression}')
+snippet prevu
+	${1:obj}.prevUntil('${2:selector expression}'${3:, 'filter expression'})
+snippet promise
+	${1:obj}.promise(${2:'fx'}, ${3:target})
+snippet prop
+	${1:obj}.prop('${2:property name}')
+snippet proxy
+	$.proxy(${1:function}, ${2:this})
+snippet pushstack
+	${1:obj}.pushStack(${2:elements})
+snippet queue
+	${1:obj}.queue(${2:name}${3:, newQueue})
+snippet queuee
+	$.queue(${1:element}${2:, name}${3:, newQueue})
+snippet ready
+	$(() ->
+		${0}
+	)
+snippet rem
+	${1:obj}.remove()
+snippet rema
+	${1:obj}.removeAttr('${2:attribute name}')
+snippet remc
+	${1:obj}.removeClass('${2:class name}')
+snippet remd
+	${1:obj}.removeData('${2:key name}')
+snippet remdd
+	$.removeData(${1:element}${2:, 'key name}')
+snippet remp
+	${1:obj}.removeProp('${2:property name}')
+snippet repa
+	${1:obj}.replaceAll(${2:target})
+snippet repw
+	${1:obj}.replaceWith(${2:content})
+snippet reset
+	${1:obj}.reset (${2:e}) ->
+		${0:// event handler}
+snippet resize
+	${1:obj}.resize (${2:e}) ->
+		${0:// event handler}
+snippet scroll
+	${1:obj}.scroll (${2:e}) ->
+		${0:// event handler}
+snippet scrolll
+	${1:obj}.scrollLeft(${2:value})
+snippet scrollt
+	${1:obj}.scrollTop(${2:value})
+snippet sdown
+	${1:obj}.slideDown('${2:slow/400/fast}')
+snippet sdownc
+	${1:obj}.slideDown('${2:slow/400/fast}', ->
+		${0:// callback}
+snippet select
+	${1:obj}.select (${2:e}) ->
+		${0:// event handler}
+snippet serialize
+	${1:obj}.serialize()
+snippet serializea
+	${1:obj}.serializeArray()
+snippet show
+	${1:obj}.show('${2:slow/400/fast}')
+snippet showc
+	${1:obj}.show '${2:slow/400/fast}', ->
+		${0:// callback}
+snippet sib
+	${1:obj}.siblings('${2:selector expression}')
+snippet size
+	${1:obj}.size()
+snippet slice
+	${1:obj}.slice(${2:start}${3:, end})
+snippet stoggle
+	${1:obj}.slideToggle('${2:slow/400/fast}')
+snippet stop
+	${1:obj}.stop('${2:queue}', ${3:false}, ${4:false})
+snippet submit
+	${1:obj}.submit (${2:e}) ->
+		${0:// event handler}
+snippet sup
+	${1:obj}.slideUp('${2:slow/400/fast}')
+snippet supc
+	${1:obj}.slideUp '${2:slow/400/fast}', ->
+		${0:// callback}
+snippet text
+	${1:obj}.text(${2:'some text'})
+snippet this
+	$(this)
+snippet toarr
+	${0:obj}.toArray()
+snippet tog
+	${1:obj}.toggle  (${2:e}) ->
+		${3:// event handler}
+	, ($2) ->
+		${4:// event handler}
+	${0}
+snippet togclass
+	${1:obj}.toggleClass('${2:class name}')
+snippet togsh
+	${1:obj}.toggle('${2:slow/400/fast}')
+snippet trig
+	${1:obj}.trigger('${2:event name}')
+snippet trigh
+	${1:obj}.triggerHandler('${2:event name}')
+snippet $trim
+	$.trim(${1:str})
+snippet $type
+	$.type(${1:obj})
+snippet unbind
+	${1:obj}.unbind('${2:event name}')
+snippet undele
+	${1:obj}.undelegate(${2:selector expression}, ${3:event}, ${4:handler})
+snippet uniq
+	$.unique(${1:array})
+snippet unload
+	${1:obj}.unload (${2:e}) ->
+		${0:// event handler}
+snippet unwrap
+	${1:obj}.unwrap()
+snippet val
+	${1:obj}.val('${2:text}')
+snippet width
+	${1:obj}.width(${2:integer})
+snippet wrap
+	${1:obj}.wrap('${2:&ltdiv class="extra-wrapper"&gt&lt/div&gt}')

From bd04745699b01cb9538cdc3e524a5efdabc549e1 Mon Sep 17 00:00:00 2001
From: tUrG0n <piotr.yordanov@gmail.com>
Date: Sun, 5 Jan 2014 11:42:30 +0200
Subject: [PATCH 0219/1587] Moved all javascritp into a javascript. Otherwise,
 snipmate simply doesnt read them

---
 snippets/coffee.snippets                      | 109 ------------------
 .../javascript-jquery.snippets                |   0
 .../{ => javascript}/javascript.d3.snippets   |   0
 snippets/{ => javascript}/javascript.snippets |   0
 snippets/javascript_jquery.snippets           |   1 -
 5 files changed, 110 deletions(-)
 delete mode 100644 snippets/coffee.snippets
 rename snippets/{ => javascript}/javascript-jquery.snippets (100%)
 rename snippets/{ => javascript}/javascript.d3.snippets (100%)
 rename snippets/{ => javascript}/javascript.snippets (100%)
 delete mode 120000 snippets/javascript_jquery.snippets

diff --git a/snippets/coffee.snippets b/snippets/coffee.snippets
deleted file mode 100644
index 7ed1ebf42..000000000
--- a/snippets/coffee.snippets
+++ /dev/null
@@ -1,109 +0,0 @@
-# Closure loop
-snippet forindo
-	for ${1:name} in ${2:array}
-		do ($1) ->
-			${0:// body}
-# Array comprehension
-snippet fora
-	for ${1:name} in ${2:array}
-		${0:# body...}
-# Object comprehension
-snippet foro
-	for ${1:key}, ${2:value} of ${3:object}
-		${0:# body...}
-# Range comprehension (inclusive)
-snippet forr
-	for ${1:name} in [${2:start}..${3:finish}]
-		${0:# body...}
-snippet forrb
-	for ${1:name} in [${2:start}..${3:finish}] by ${4:step}
-		${0:# body...}
-# Range comprehension (exclusive)
-snippet forrex
-	for ${1:name} in [${2:start}...${3:finish}]
-		${0:# body...}
-snippet forrexb
-	for ${1:name} in [${2:start}...${3:finish}] by ${4:step}
-		${0:# body...}
-# Function
-snippet fun
-	(${1:args}) ->
-		${0:# body...}
-# Function (bound)
-snippet bfun
-	(${1:args}) =>
-		${0:# body...}
-# Class
-snippet cla class ..
-	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		${0}
-snippet cla class .. constructor: ..
-	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		constructor: (${2:args}) ->
-			${3}
-
-		${0}
-snippet cla class .. extends ..
-	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
-		${0}
-snippet cla class .. extends .. constructor: ..
-	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
-		constructor: (${3:args}) ->
-			${4}
-
-		${0}
-# If
-snippet if
-	if ${1:condition}
-		${0:# body...}
-# If __ Else
-snippet ife
-	if ${1:condition}
-		${2:# body...}
-	else
-		${0:# body...}
-# Else if
-snippet eif
-	else if ${1:condition}
-		${0:# body...}
-# Ternary If
-snippet ifte
-	if ${1:condition} then ${2:value} else ${0:other}
-# Unless
-snippet unl
-	${1:action} unless ${0:condition}
-# Switch
-snippet swi
-	switch ${1:object}
-		when ${2:value}
-			${0:# body...}
-
-# Log
-snippet log
-	console.log ${0}
-# Try __ Catch
-snippet try
-	try
-		${1}
-	catch ${2:error}
-		${0}
-# Require
-snippet req
-	${2:$1} = require '${1:sys}'
-# Export
-snippet exp
-	${0:root} = exports ? this
-
-
-snippet ajax
-	$.ajax
-	  url: "${1:mydomain.com/url}"
-	  type: "${2:POST}"
-	  dataType: "${3:xml/html/script/json}"
-	  data: ${4:data}
-	  complete: (jqXHR, textStatus) ->
-		${5:// callback}
-	  success: (data, textStatus, jqXHR) ->
-		${6:// success callback}
-	  error: (jqXHR, textStatus, errorThrown) ->
-		${0:// error callback}
diff --git a/snippets/javascript-jquery.snippets b/snippets/javascript/javascript-jquery.snippets
similarity index 100%
rename from snippets/javascript-jquery.snippets
rename to snippets/javascript/javascript-jquery.snippets
diff --git a/snippets/javascript.d3.snippets b/snippets/javascript/javascript.d3.snippets
similarity index 100%
rename from snippets/javascript.d3.snippets
rename to snippets/javascript/javascript.d3.snippets
diff --git a/snippets/javascript.snippets b/snippets/javascript/javascript.snippets
similarity index 100%
rename from snippets/javascript.snippets
rename to snippets/javascript/javascript.snippets
diff --git a/snippets/javascript_jquery.snippets b/snippets/javascript_jquery.snippets
deleted file mode 120000
index 9b4966dbb..000000000
--- a/snippets/javascript_jquery.snippets
+++ /dev/null
@@ -1 +0,0 @@
-javascript-jquery.snippets
\ No newline at end of file

From 9bee48748cf8b48ef97d374d5f8ef69fb1925844 Mon Sep 17 00:00:00 2001
From: tUrG0n <piotr.yordanov@gmail.com>
Date: Sun, 5 Jan 2014 11:45:24 +0200
Subject: [PATCH 0220/1587] Added jsonp and jsons to coffee.snippet

---
 snippets/coffee/coffee.snippets | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/snippets/coffee/coffee.snippets b/snippets/coffee/coffee.snippets
index 7ed1ebf42..bb964346f 100644
--- a/snippets/coffee/coffee.snippets
+++ b/snippets/coffee/coffee.snippets
@@ -94,16 +94,8 @@ snippet req
 snippet exp
 	${0:root} = exports ? this
 
-
-snippet ajax
-	$.ajax
-	  url: "${1:mydomain.com/url}"
-	  type: "${2:POST}"
-	  dataType: "${3:xml/html/script/json}"
-	  data: ${4:data}
-	  complete: (jqXHR, textStatus) ->
-		${5:// callback}
-	  success: (data, textStatus, jqXHR) ->
-		${6:// success callback}
-	  error: (jqXHR, textStatus, errorThrown) ->
-		${0:// error callback}
+snippet jsonp
+	JSON.parse ${0:jstr}
+# JSON.stringify
+snippet jsons
+	JSON.stringify ${0:object}

From 7c3dc8a8741b1d08943244f9bb88e2fe8ec13163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Chamoulaud?= <gael@redhat.com>
Date: Tue, 7 Jan 2014 17:21:54 +0100
Subject: [PATCH 0221/1587] Applied puppet style guide

---
 snippets/puppet.snippets | 90 ++++++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index 2e451e414..a4fdf19fc 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -90,7 +90,7 @@ snippet class
 		${0}
 	}
 snippet node
-	node "${1:`vim_snippets#Filename('', 'fqdn')`}" {
+	node '${1:`vim_snippets#Filename('', 'fqdn')`}' {
 		${0}
 	}
 snippet case
@@ -122,99 +122,99 @@ snippet [
 snippet >
 	${1}	=> ${0}
 snippet p:
-	"puppet://puppet/${1:module name}/${0:file name}"
+	'puppet://puppet/${1:module name}/${0:file name}'
 #
 # Functions
 snippet alert
-	alert("${1:message}")
+	alert('${1:message}')
 snippet crit
-	crit("${1:message}")
+	crit('${1:message}')
 snippet debug
-	debug("${1:message}")
+	debug('${1:message}')
 snippet defined
-	defined(${1:Resource}["${2:name}"])
+	defined(${1:Resource}['${2:name}'])
 snippet emerg
-	emerg("${1:message}")
+	emerg('${1:message}')
 snippet extlookup Simple extlookup
-	extlookup("${1:variable}")
+	extlookup('${1:variable}')
 snippet extlookup Extlookup with defaults
-	extlookup("${1:variable}", "${2:default}")
+	extlookup('${1:variable}', '${2:default}')
 snippet extlookup Extlookup with defaults and custom data file
-	extlookup("${1:variable}", "${2:default}", "${3:data source}")
+	extlookup('${1:variable}', '${2:default}', '${3:data source}')
 snippet fail
-	fail("${1:message}")
+	fail('${1:message}')
 snippet info
-	info("${1:message}")
+	info('${1:message}')
 snippet inline_template
-	inline_template("<%= ${1} %>")
+	inline_template('<%= ${1} %>')
 snippet notice
-	notice("${1:message}")
+	notice('${1:message}')
 snippet realize
 	realize(${1:Resource}[${2:name}])
 snippet regsubst
-	regsubst(${1:hay stack}, ${2:needle}, "${3:replacement}")
+	regsubst(${1:hay stack}, ${2:needle}, '${3:replacement}')
 snippet inc
 	include ${1:classname}
 snippet split
-	split(${1:hay stack}, "${2:patten}")
+	split(${1:hay stack}, '${2:patten}')
 snippet versioncmp
-	versioncmp("${1:version}", "${2:version}")
+	versioncmp('${1:version}', '${2:version}')
 snippet warning
-	warning("${1:message}")
+	warning('${1:message}')
 #
 # Types
 snippet cron
-	cron{ "${1:name}":
-		command	=> "${2}",
-		user	=> "${3:root}",
-		${4}	=> ${0}
+	cron { '${1:name}':
+		command => '${2}',
+		user    => '${3:root}',
+		${4}    => ${0},
 	}
 
 snippet exec
-	exec{ "${1:name}":
-		command	=> "${2:$1}",
-		user	=> "${3:root}",
-		${4}	=> ${0}
+	exec { '${1:name}':
+		command => '${2:$1}',
+		user    => '${3:root}',
+		${4}    => ${0},
 	}
 
 snippet user
-	user{ "${1:user}":
-		comment		=> "${2:$1}",
-		ensure		=> present,
-		managehome	=> true,
-		home		=> "${0:/home/$1}"
+	user { '${1:user}':
+		ensure      => present,
+		comment     => '${2:$1}',
+		managehome  => true,
+		home        => '${0:/home/$1}',
 	}
 
 snippet group
-	group{ "${1:group}":
-		ensure	=> ${0:present}
+	group { '${1:group}':
+		ensure => ${0:present},
 	}
 
 snippet host
-	host{ "${1:hostname}":
-		ip	=> ${0:127.0.0.1}
+	host { '${1:hostname}':
+		ip => ${0:127.0.0.1},
 	}
 
 snippet mailalias
-	mailalias{ "${1:localpart}":
-		recipient	=> "${0:recipient}"
+	mailalias { '${1:localpart}':
+		recipient => '${0:recipient}',
 	}
 
 snippet mount
-	mount{ "${1:destination path}":
+	mount { '${1:destination path}':
 		ensure	=> ${2:mounted},
-		device	=> "${0:device name or path}"
+		device	=> '${0:device name or path}',
 	}
 
 snippet package
-	package{ "${1:package name}":
-		ensure	=> ${0:present}
+	package { '${1:package name}':
+		ensure	=> ${0:present},
 	}
 
 snippet yumrepo
-	yumrepo{ "${1:repo name}":
-		descr	=> "${2:$1}",
-		enabled	=> ${0:1}
+	yumrepo { '${1:repo name}':
+		Descr   => '${2:$1}',
+		enabled => ${0:1},
 	}
 
 snippet define
@@ -227,7 +227,7 @@ snippet service
 		ensure    => running,
 		enable    => true,
 		require   => [ Package['${2:package}'], File['${3:file}'], ],
-		subscribe => [ File['${4:configfile1}'], File['${5:configfile2}'], Package['${6:package}'], ]
+		subscribe => [ File['${4:configfile1}'], File['${5:configfile2}'], Package['${6:package}'], ],
 	}
 
 snippet file

From 65e0266c43ff6b6a6992d4a2c127bfdf13cba51f Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 6 Feb 2014 18:24:54 +0100
Subject: [PATCH 0222/1587] fixes #307

---
 README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/README.md b/README.md
index 27592c73c..cc1d27a46 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,29 @@ If you have VimL only (vim without python support) your best option is using
 garbas/vim-snipmate and cope with the minor bugs found in the engine.
 
 
+Installation
+============
+First be aware that there are many options, see "Snippet engines" above.
+Second be aware than there are [tons of plugin managers](http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html)
+which is why Marc Weber thinks that it doesn't make sense to repeat the same
+repetitive information everywhere.
+
+*Recommended way:*
+[vim-addon-manager](vim-addon-manager) (because Marc Weber wrote it for exactly
+this reason, it supports simple dependency management). Eg you're done by this
+line in your .vimrc:
+
+```
+" assuming you want to use snipmate snippet engine
+ActivateAddons vim-snippets snipmate
+```
+
+[vim-pi](https://bitbucket.org/vimcommunity/vim-pi/issue/90/we-really-need-a-web-interface)
+Is the place to discuss plugin managers and repository resources.
+
+About how to install snipate see [snipmate@garbas](https://github.com/garbas/vim-snipmate)
+About how to install the other engines .. just use google (see above)
+
 Policies / for contributors
 ===========================
 Some snippets are useful for almost all languages, so let's try to have the same

From ad40a2e1c8287da2540d883a41cd211a09eb5884 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 6 Feb 2014 18:29:28 +0100
Subject: [PATCH 0223/1587] reference pull request because the work has been
 done

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cc1d27a46..da03e6610 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,10 @@ ActivateAddons vim-snippets snipmate
 Is the place to discuss plugin managers and repository resources.
 
 About how to install snipate see [snipmate@garbas](https://github.com/garbas/vim-snipmate)
-About how to install the other engines .. just use google (see above)
+
+(Bundle, Pathogen, git clone - keywords to make people find this link by ctrl-f search)
+I know that I should be reading the docs of the snippet engine, just let me copy paste into my .vmirc:
+(See this pull request)[https://github.com/honza/vim-snippets/pull/307/files].
 
 Policies / for contributors
 ===========================

From 9cf136348b9949436f56ca72216ea86adab4a06e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 7 Feb 2014 12:58:05 +0100
Subject: [PATCH 0224/1587] typo, turn names into links

---
 README.md | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index da03e6610..64733ebcc 100644
--- a/README.md
+++ b/README.md
@@ -14,32 +14,33 @@ Contents
     snippets/*: snippets using snipmate format
     UltiSnips/*: snippets using UltiSnips format
 
-Snippet engines
-===============
+Snippet engines supporting vim-snippets
+========================================
 
 There are different forks of snippet engines which allow the user to insert
-sippets by typing the name of a snippet hitting the expansion mapping.
+snippets by typing the name of a snippet hitting the expansion mapping.
 
-    garbas/vim-snipmate [4]:
+    github.com/garbas/vim-snipmate:
       VimL, snipmate-snippets, engine sometimes behaves strange, supports
       rewriting snippets on the fly (eg adding a second version with folding
       markers)
 
-    MarcWeber/UltiSnips [6]:
+    github.com/MarcWeber/UltiSnips:
       python, snipmate-snippets and UltiSnips-snippets
 
-    SirVer/ultisnips [7]:
+    github.com/SirVer/ultisnips:
       python, UltiSnips-snippets
 
-    github.com/Shougo/neosnippet [5]:
+    github.com/Shougo/neosnippet:
       viml, has a compatible mode allowing to reuse most snipmate snippets ?
 
-    XPTemplate:
-      totally different syntax, does not read snippets contained in this file,
-      but it is also very powerful
+    github.com/drmingdrmer/xptemplate:
+      Totally different syntax, does not read snippets contained in this file,
+      but it is also very powerful. It does not support vim-snippets (just
+      listing it here for completness)
 
-    ... there are some more, but they have less features which is why I don't
-    mention them here
+    This tries to be a more comprehensive list (which still is incomplete)
+    http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html
 
 UltiSnips engine has additional features such as "nested snippets".
 
@@ -77,6 +78,11 @@ About how to install snipate see [snipmate@garbas](https://github.com/garbas/vim
 I know that I should be reading the docs of the snippet engine, just let me copy paste into my .vmirc:
 (See this pull request)[https://github.com/honza/vim-snippets/pull/307/files].
 
+TROUBLE
+=======
+If you still have trouble getting this to work create a github ticket, ask on
+irc or the mailinglist.
+
 Policies / for contributors
 ===========================
 Some snippets are useful for almost all languages, so let's try to have the same
@@ -237,6 +243,5 @@ terms of the MIT license.
 [2]: http://github.com/msanders
 [3]: http://github.com/garbas
 [4]: http://github.com/garbas/vim-snipmate
-[5]: http://github.com/Shougo/neosnippet
 [6]: http://github.com/MarcWeber/UltiSnips
 [7]: http://github.com/SirVer/ultisnips

From c7d3ce085cd2355e06be3346b1db7a537f664d4d Mon Sep 17 00:00:00 2001
From: Roberto Miranda <rjmaltamar@gmail.com>
Date: Sun, 16 Feb 2014 21:54:19 -0500
Subject: [PATCH 0225/1587] Add before_action snippet

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 551b313fb..1798e08bf 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -620,6 +620,8 @@ snippet asrj
 	assert_rjs :${1:replace}, "${0:dom id}"
 snippet ass assert_select(..)
 	assert_select '${1:path}', :${2:text} => '${3:inner_html' ${4:do}
+snippet ba
+	before_action :${0:method}
 snippet bf
 	before_filter :${0:method}
 snippet bt

From 5063a02b5091aebe23070dfc78d9f5446e5a5914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9?= <rene@habr.de>
Date: Mon, 17 Feb 2014 10:37:44 +0100
Subject: [PATCH 0226/1587] Remove space at end of \section

---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 97ea8a82e..db5330709 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -74,7 +74,7 @@ ${0}
 endsnippet
 
 snippet sec "Section" b
-\section{${1:section name}} 
+\section{${1:section name}}
 \label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
 
 ${0}

From 66545e110d652f0f94b271fa6a7424f4d72c2371 Mon Sep 17 00:00:00 2001
From: majjoha <mathias@mjj.io>
Date: Fri, 21 Feb 2014 07:02:23 +0100
Subject: [PATCH 0227/1587] Add define snippet with no block.

---
 snippets/elixir.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 54aa180b3..13e1ba440 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -50,6 +50,9 @@ snippet case
 		${0}
 	end
 
+snippet df
+	def ${1:name}, do: {2}
+
 snippet def
 	def ${1:name} do
 		${0}

From 190b3d47d39f0cc7389c03de223155abff5b944c Mon Sep 17 00:00:00 2001
From: majjoha <mathias@mjj.io>
Date: Wed, 26 Feb 2014 16:41:19 +0100
Subject: [PATCH 0228/1587] Fix stupid typo.

---
 snippets/elixir.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 13e1ba440..bd84cd965 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -51,7 +51,7 @@ snippet case
 	end
 
 snippet df
-	def ${1:name}, do: {2}
+	def ${1:name}, do: ${2}
 
 snippet def
 	def ${1:name} do

From 68cb7d8da2328ebb52365863b393a04514fc705e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20L=C3=A9vigne?= <florent.levigne@obspm.fr>
Date: Fri, 28 Feb 2014 15:03:44 +0100
Subject: [PATCH 0229/1587] remove border attribute for table tag

---
 snippets/html.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index f25e1bc73..d8892b5bc 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -749,15 +749,15 @@ snippet summary
 snippet sup
 	<sup>${0}</sup>
 snippet table
-	<table border="${1:0}">
+	<table>
 		${0}
 	</table>
 snippet table.
-	<table class="${1}" border="${2:0}">
+	<table class="${1}">
 		${0}
 	</table>
 snippet table#
-	<table id="${1}" border="${2:0}">
+	<table id="${1}">
 		${0}
 	</table>
 snippet tbody

From 59dcc2b72d9dc070d13bb711406fed6e666366d6 Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Wed, 26 Feb 2014 09:31:33 +0100
Subject: [PATCH 0230/1587] Brings current UltiSnips snippets into the
 repository.

---
 UltiSnips/README                              |  12 +-
 UltiSnips/all.snippets                        | 132 +++----
 UltiSnips/bib.snippets                        |  52 +++
 UltiSnips/bindzone.snippets                   |  32 +-
 UltiSnips/c.snippets                          |  62 +++-
 UltiSnips/coffee.snippets                     |  28 +-
 UltiSnips/coffee_jasmine.snippets             |   5 +-
 UltiSnips/cpp.snippets                        |   9 +-
 UltiSnips/cs.snippets                         | 328 ++++++++++++++++++
 UltiSnips/css.snippets                        |   2 +
 UltiSnips/d.snippets                          | 175 +++++-----
 UltiSnips/django.snippets                     |  28 +-
 UltiSnips/elixir.snippets                     |   2 +
 UltiSnips/erlang.snippets                     |   2 +
 UltiSnips/eruby.snippets                      |  49 +--
 UltiSnips/go.snippets                         |  44 ++-
 UltiSnips/haskell.snippets                    |  14 +-
 UltiSnips/help.snippets                       |   8 +-
 UltiSnips/html.snippets                       |  71 ++--
 UltiSnips/html_minimal.snippets               |   2 +
 UltiSnips/htmldjango.snippets                 |   2 +
 UltiSnips/htmljinja.snippets                  |   3 +
 UltiSnips/java.snippets                       | 279 +++++++++++++--
 UltiSnips/javascript.snippets                 | 140 ++++++--
 UltiSnips/javascript_ember.snippets           |  22 +-
 UltiSnips/javascript_jasmine.snippets         |   5 +-
 UltiSnips/javascript_jsdoc.snippets           |  51 +++
 UltiSnips/jinja2.snippets                     |  38 +-
 UltiSnips/json.snippets                       |   7 +-
 UltiSnips/ledger.snippets                     |   8 +
 UltiSnips/lhaskell.snippets                   |   3 +
 UltiSnips/lua.snippets                        |  10 +-
 UltiSnips/mako.snippets                       |   2 +
 UltiSnips/markdown.snippets                   |   4 +-
 UltiSnips/objc.snippets                       |  14 +-
 UltiSnips/ocaml.snippets                      |  87 ++---
 UltiSnips/perl.snippets                       |  25 +-
 UltiSnips/php.snippets                        | 288 +++++++++++----
 .../phpunit.snippets => php_phpunit.snippets} |   6 +-
 ...ymfony2.snippets => php_symfony2.snippets} |  42 +--
 UltiSnips/puppet.snippets                     | 250 ++++++++++---
 UltiSnips/python.snippets                     | 175 +++++++---
 UltiSnips/rails.snippets                      | 260 +++++++-------
 UltiSnips/rst.snippets                        | 250 ++++++-------
 UltiSnips/ruby.snippets                       | 130 +++----
 UltiSnips/scss.snippets                       |  55 +++
 UltiSnips/sh.snippets                         |  22 +-
 UltiSnips/snippets.snippets                   |  10 +-
 UltiSnips/tcl.snippets                        |  10 +-
 UltiSnips/tex.snippets                        |  80 ++---
 UltiSnips/texmath.snippets                    |   2 +
 UltiSnips/twig.snippets                       |   2 +
 UltiSnips/vim.snippets                        |  18 +-
 UltiSnips/xhtml.snippets                      |   3 +
 UltiSnips/xml.snippets                        |   7 +
 UltiSnips/zsh.snippets                        |  10 +-
 56 files changed, 2349 insertions(+), 1028 deletions(-)
 create mode 100644 UltiSnips/bib.snippets
 create mode 100644 UltiSnips/cs.snippets
 create mode 100644 UltiSnips/htmljinja.snippets
 create mode 100644 UltiSnips/javascript_jsdoc.snippets
 create mode 100644 UltiSnips/ledger.snippets
 create mode 100644 UltiSnips/lhaskell.snippets
 rename UltiSnips/{php/phpunit.snippets => php_phpunit.snippets} (90%)
 rename UltiSnips/{php/symfony2.snippets => php_symfony2.snippets} (94%)
 create mode 100644 UltiSnips/scss.snippets

diff --git a/UltiSnips/README b/UltiSnips/README
index eafd0866b..41d859234 100644
--- a/UltiSnips/README
+++ b/UltiSnips/README
@@ -1,4 +1,5 @@
-This directory contains the main scripts that come bundled with UltiSnips.
+This directory contains the snippets for UltiSnips.
+https://github.com/sirver/ultisnips
 
 Standing On The Shoulders of Giants
 ===================================
@@ -10,12 +11,7 @@ two projects:
    TextMate: http://svn.textmate.org/trunk/Bundles/
    SnipMate: http://code.google.com/p/snipmate/
 
-All snippets from those sources were copied and cleaned up, so that they are 
-  - not using shell script, only python (so they are cross platform compatible)
-  - not using any feature that UltiSnips doesn't offer
-
-UltiSnips has seen contributions by various individuals. Those contributions
-have been merged into this collection seamlessly and without further comments.
+UltiSnips has seen contributions by many individuals. Those contributions have
+been merged into this collection seamlessly and without further comments.
 
 -- vim:ft=rst:nospell:
-
diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 8844e2813..085440a4a 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -1,6 +1,8 @@
 # This file contains snippets that are always defined. I personally
 # have snippets for signatures and often needed texts
 
+priority -50
+
 ##############
 # NICE BOXES #
 ##############
@@ -12,71 +14,62 @@ Automatically filled during usage"""
 _commentDict = { }
 
 def _parse_comments(s):
-    """ Parses vim's comments option to extract comment format """
-    i = iter(s.split(","))
-
-    rv = []
-    try:
-        while True:
-            # get the flags and text of a comment part
-            flags,text = i.next().split(':', 1)
-
-            if len(flags) == 0:
-                if len(text) == 1:
-                    rv.append((text,text,text, ""))
-            # parse 3-part comment, but ignore those with O flag
-            elif flags[0] == 's' and 'O' not in flags:
-                ctriple = []
-                indent = ""
-
-                if flags[-1] in string.digits:
-                    indent = " " * int(flags[-1])
-                ctriple.append(text)
+	""" Parses vim's comments option to extract comment format """
+	i = iter(s.split(","))
+
+	rv = []
+	try:
+		while True:
+			# get the flags and text of a comment part
+			flags, text = next(i).split(':', 1)
+
+			if len(flags) == 0:
+				rv.append((text, text, text, ""))
+			# parse 3-part comment, but ignore those with O flag
+			elif flags[0] == 's' and 'O' not in flags:
+				ctriple = []
+				indent = ""
+
+				if flags[-1] in string.digits:
+					indent = " " * int(flags[-1])
+				ctriple.append(text)
+
+				flags,text = next(i).split(':', 1)
+				assert(flags[0] == 'm')
+				ctriple.append(text)
+
+				flags,text = next(i).split(':', 1)
+				assert(flags[0] == 'e')
+				ctriple.append(text)
+				ctriple.append(indent)
+
+				rv.append(ctriple)
+			elif flags[0] == 'b':
+				if len(text) == 1:
+					rv.insert(0, (text,text,text, ""))
+	except StopIteration:
+		return rv
 
-                flags,text = i.next().split(':', 1)
-                assert(flags[0] == 'm')
-                ctriple.append(text)
-
-                flags,text = i.next().split(':', 1)
-                assert(flags[0] == 'e')
-                ctriple.append(text)
-                ctriple.append(indent)
+def _get_comment_format():
+	""" Returns a 4-element tuple representing the comment format for
+	the current file. """
+	return _parse_comments(vim.eval("&comments"))[0]
 
-                rv.append(ctriple)
 
-            elif flags[0] == 'b':
-                if len(text) == 1:
-                    rv.insert(0, (text,text,text, ""))
+def make_box(twidth, bwidth=None):
+	b, m, e, i = _get_comment_format()
+	bwidth_inner = bwidth - 3 - max(len(b), len(i + e)) if bwidth else twidth + 2
+	sline = b + m + bwidth_inner * m[0] + 2 * m[0]
+	nspaces = (bwidth_inner - twidth) // 2
+	mlines = i + m + " " + " " * nspaces
+	mlinee = " " + " "*(bwidth_inner - twidth - nspaces) + m
+	eline = i + m + bwidth_inner * m[0] + 2 * m[0] + e
+	return sline, mlines, mlinee, eline
 
-    except StopIteration:
-       return rv
+def foldmarker():
+	"Return a tuple of (open fold marker, close fold marker)"
+	return vim.eval("&foldmarker").split(",")
 
-def _get_comment_format():
-    """ Returns a 4-element tuple representing the comment format for
-    the current file. """
-
-    ft = vim.eval("&filetype")
-    # check if the comment dict has the format for the current file
-    if _commentDict.has_key(ft):
-        return _commentDict[ft]
-
-    # otherwise parse vim's comments and add it for later use
-    commentformat = _parse_comments(vim.eval("&comments"))[0]
-    _commentDict[ft] = commentformat
-
-    return commentformat
-
-
-def make_box(twidth, bwidth = None):
-   if bwidth is None:
-      bwidth = twidth + 2
-   b,m,e,i = _get_comment_format()
-   sline = b + m + bwidth*m + 2*m
-   nspaces = (bwidth - twidth)//2 
-   mlines = i + m + " " + " "*nspaces
-   mlinee = " " + " "*(bwidth-twidth-nspaces) + m
-   eline = i + 2*m + bwidth*m + m + e
-   return sline, mlines, mlinee, eline
 endglobal
 
 snippet box "A nice box with the current comment symbol" b
@@ -91,14 +84,29 @@ endsnippet
 
 snippet bbox "A nice box over the full width" b
 `!p
-box = make_box(len(t[1]), 71)
+width = int(vim.eval("&textwidth")) or 71
+box = make_box(len(t[1]), width)
 snip.rv = box[0] + '\n' + box[1]
 `${1:content}`!p
-box = make_box(len(t[1]), 71)
+box = make_box(len(t[1]), width)
 snip.rv = box[2] + '\n' + box[3]`
 $0
 endsnippet
 
+snippet fold "Insert a vim fold marker" b
+`!p snip.rv = _get_comment_format()[0]` ${1:Fold description} `!p snip.rv = foldmarker()[0]`${2:1} `!p snip.rv = _get_comment_format()[2]`
+endsnippet
+
+snippet foldc "Insert a vim fold close marker" b
+`!p snip.rv = _get_comment_format()[0]` ${2:1}`!p snip.rv = foldmarker()[1]` `!p snip.rv = _get_comment_format()[2]`
+endsnippet
+
+snippet foldp "Insert a vim fold marker pair" b
+`!p snip.rv = _get_comment_format()[0]` ${1:Fold description} `!p snip.rv = foldmarker()[0]` `!p snip.rv = _get_comment_format()[2]`
+${2:${VISUAL:Content}}
+`!p snip.rv = _get_comment_format()[0]` `!p snip.rv = foldmarker()[1]` $1 `!p snip.rv = _get_comment_format()[2]`
+endsnippet
+
 ##########################
 # LOREM IPSUM GENERATORS #
 ##########################
diff --git a/UltiSnips/bib.snippets b/UltiSnips/bib.snippets
new file mode 100644
index 000000000..c9b8df5c6
--- /dev/null
+++ b/UltiSnips/bib.snippets
@@ -0,0 +1,52 @@
+priority -50
+
+snippet online "Online resource" b
+@online{${1:name},
+	author={${2:author}},
+	title={${3:title}},
+	date={${4:date}},
+	url={${5:url}}
+}
+$0
+endsnippet
+
+snippet article "Article reference" b
+@article{${1:name},
+	author={${2:author}},
+	title={${3:title}},
+	journaltitle={${4:journal}},
+	volume={${5:NN}},
+	number={${6:NN}},
+	year={${7:YYYY}},
+	pages={${8:NN}--${9:NN}}
+}
+$0
+endsnippet
+
+snippet book "Book reference" b
+@book{${1:name},
+	author={${2:author}},
+	title={${3:title}},
+	subtitle={${4:subtitle}},
+	year={${5:YYYY}},
+	location={${6:somewhere}},
+	publisher={${7:publisher}},
+	pages={${8:NN}--${9:NN}}
+}
+$0
+endsnippet
+
+snippet inb "In Book reference" b
+@inbook{${1:name},
+	author={${2:author}},
+	title={${3:title}},
+	subtitle={${4:subtitle}},
+	booktitle={${5:book}},
+	editor={${6:editor}},
+	year={${7:YYYY}},
+	location={${8:somewhere}},
+	publisher={${9:publisher}},
+	pages={${10:NN}--${11:NN}}
+}
+$0
+endsnippet
diff --git a/UltiSnips/bindzone.snippets b/UltiSnips/bindzone.snippets
index 034ccdec9..b8ab0dfd4 100644
--- a/UltiSnips/bindzone.snippets
+++ b/UltiSnips/bindzone.snippets
@@ -1,27 +1,29 @@
+priority -50
+
 global !p
 def newsoa():
-    import datetime
-    now = datetime.datetime.now()
-    # return standard SOA formatted serial for today
-    return now.strftime("%Y%m%d00")
+	import datetime
+	now = datetime.datetime.now()
+	# return standard SOA formatted serial for today
+	return now.strftime("%Y%m%d00")
 endglobal
 
 snippet zone "Bootstrap a new Bind zonefile" b
 $TTL 86400
-@     IN SOA   ${1:example.net}.     ${2:hostmaster.$1}.(
-                        `!p snip.rv = newsoa()`;     serial
-                        21600;          refresh every 6 hours
-                        3600;           retry after one hour
-                        604800;         expire after a week
-                        86400 );        minimum TTL of 1 day
+@	  IN SOA   ${1:example.net}.	 ${2:hostmaster.$1}.(
+						`!p snip.rv = newsoa()`;	 serial
+						21600;			refresh every 6 hours
+						3600;			retry after one hour
+						604800;			expire after a week
+						86400 );		minimum TTL of 1 day
 
-                IN      NS              ns01.$1.
-                IN      MX      10      mail.$1.
+				IN		NS				ns01.$1.
+				IN		MX		10		mail.$1.
 
-ns01.$1         IN      A       
-mail.$1         IN      A   
+ns01.$1			IN		A
+mail.$1			IN		A
 endsnippet
 
 snippet A "Insert A Record" b
-${1:hostname}   IN      A   ${2:ip}
+${1:hostname}	IN		A	${2:ip}
 endsnippet
diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 062a36aeb..5b8eae848 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -2,6 +2,8 @@
 #                            TextMate Snippets                            #
 ###########################################################################
 
+priority -50
+
 snippet def "#define ..."
 #define ${1}
 endsnippet
@@ -12,9 +14,9 @@ snippet ifndef "#ifndef ... #define ... #endif"
 #endif
 endsnippet
 
-snippet #if "#if #endif" !b
+snippet #if "#if #endif" b
 #if ${1:0}
-${VISUAL:code}$0
+${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
 #endif
 endsnippet
 
@@ -36,17 +38,24 @@ $0
 endsnippet
 
 snippet main "main() (main)"
-int main(int argc, char const *argv[])
+int main(int argc, char *argv[])
 {
-	${0:/* code */}
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
 	return 0;
 }
 endsnippet
 
-snippet for "for int loop (fori)"
-for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
+snippet for "for loop (for)"
+for (${2:i} = 0; $2 < ${1:count}; ${3:++$2})
+{
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet fori "for int loop (fori)"
+for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-	${0:/* code */}
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
 }
 endsnippet
 
@@ -62,7 +71,7 @@ if not snip.c:
 	rand = ''.join(random.sample(string.ascii_letters+string.digits, 8))
 	snip.rv = ('%s_%s' % (name,rand)).upper()
 else:
-    snip.rv = snip.c`}
+	snip.rv = snip.c`}
 #define $1
 
 ${0}
@@ -75,9 +84,15 @@ snippet td "Typedef"
 typedef ${1:int} ${2:MyCustomType};
 endsnippet
 
+snippet wh "while loop"
+while(${1:/* condition */}) {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
 snippet do "do...while loop (do)"
 do {
-	${0:/* code */}
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
 } while(${1:/* condition */});
 endsnippet
 
@@ -88,18 +103,30 @@ endsnippet
 snippet if "if .. (if)"
 if (${1:/* condition */})
 {
-	${0:/* code */}
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet el "else .. (else)"
+else {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet eli "else if .. (eli)"
+else if (${1:/* condition */}) {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
 }
 endsnippet
 
 snippet ife "if .. else (ife)"
 if (${1:/* condition */})
 {
-        ${2:/* code */}
+	${2:/* code */}
 }
 else
 {
-        ${3:/* else */}
+	${3:/* else */}
 }
 endsnippet
 
@@ -114,4 +141,15 @@ struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`}
 };
 endsnippet
 
+snippet fun "function" b
+${1:void} ${2:function_name}(${3})
+{
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet fund "function declaration" b
+${1:void} ${2:function_name}(${3});
+endsnippet
+
 # vim:ft=snippets:
diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
index 68d40349d..467b2b57c 100644
--- a/UltiSnips/coffee.snippets
+++ b/UltiSnips/coffee.snippets
@@ -1,5 +1,4 @@
-# From the TextMate bundle
-# with some modification
+priority -50
 
 snippet fun "Function" b
 ${1:name} = `!p snip.rv = "(" if t[2] else ""`${2:args}`!p snip.rv = ") " if t[2] else ""`->
@@ -10,52 +9,52 @@ snippet bfun "Function (bound)" i
 `!p snip.rv = "(" if t[1] else ""`${1:args}`!p snip.rv = ") " if t[1] else ""`=>`!p snip.rv = " " if t[2] and not t[2].startswith("\n") else ""`${2:expr}
 endsnippet
 
-snippet if "If"
+snippet if "If" b
 if ${1:condition}
 	${0:# body...}
 endsnippet
 
-snippet ife "If .. Else"
+snippet ife "If .. Else" b
 if ${1:condition}
 	${2:# body...}
 else
 	${3:# body...}
 endsnippet
 
-snippet eif "Else if" b
+snippet elif "Else if" b
 else if ${1:condition}
 	${0:# body...}
 endsnippet
 
-snippet ifte "Ternary if"
+snippet ifte "Ternary if" b
 if ${1:condition} then ${2:value} else ${3:other}
 endsnippet
 
-snippet unl "Unless"
+snippet unl "Unless" b
 ${1:action} unless ${2:condition}
 endsnippet
 
-snippet fora "Array Comprehension"
+snippet fora "Array Comprehension" b
 for ${1:name} in ${2:array}
 	${0:# body...}
 endsnippet
 
-snippet foro "Object Comprehension"
+snippet foro "Object Comprehension" b
 for ${1:key}, ${2:value} of ${3:Object}
 	${0:# body...}
 endsnippet
 
-snippet forr "Range Comprehension (inclusive)"
+snippet forr "Range Comprehension (inclusive)" b
 for ${1:name} in [${2:start}..${3:finish}]`!p snip.rv = " by " if t[4] else ""`${4:step}
 	${0:# body...}
 endsnippet
 
-snippet forrex "Range Comprehension (exclusive)"
+snippet forrex "Range Comprehension (exclusive)" b
 for ${1:name} in [${2:start}...${3:finish}]`!p snip.rv = " by " if t[4] else ""`${4:step}
 	${0:# body...}
 endsnippet
 
-snippet swi "Switch"
+snippet swi "Switch" b
 switch ${1:object}
 	when ${2:value}
 		${3:# body...}
@@ -63,7 +62,7 @@ switch ${1:object}
 		$0
 endsnippet
 
-snippet swit "Switch when .. then"
+snippet swit "Switch when .. then" b
 switch ${1:object}
 	when ${2:condition}`!p snip.rv = " then " if t[3] else ""`${3:value}
 	else`!p snip.rv = " " if t[4] and not t[4].startswith("\n") else ""`${4:value}
@@ -77,7 +76,7 @@ class ${1:ClassName}`!p snip.rv = " extends " if t[2] else ""`${2:Ancestor}
 	$0
 endsnippet
 
-snippet try "Try .. Catch"
+snippet try "Try .. Catch" b
 try
 	$1
 catch ${2:error}
@@ -95,4 +94,3 @@ endsnippet
 snippet log "Log" b
 console.log ${1:"${2:msg}"}
 endsnippet
-
diff --git a/UltiSnips/coffee_jasmine.snippets b/UltiSnips/coffee_jasmine.snippets
index 47d1e6b53..0dd35cd65 100644
--- a/UltiSnips/coffee_jasmine.snippets
+++ b/UltiSnips/coffee_jasmine.snippets
@@ -2,8 +2,12 @@
 # CoffeeScript versions -- adapted from the JS TextMate bundle + additions
 # for some jasmine-jquery matchers
 #
+priority -50
+
 extends coffee
 
+priority -49
+
 snippet des "Describe (coffee)" b
 describe '${1:description}', ->
 	$0
@@ -160,4 +164,3 @@ endsnippet
 snippet noscw "expect was not called with (coffee)" b
 expect(${1:target}).wasNotCalledWith(${2:arguments})
 endsnippet
-
diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index 6999c1f97..3d79a64e4 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -1,3 +1,10 @@
+priority -50
+
+extends c
+
+# We want to overwrite everything in parent ft.
+priority -49
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
@@ -20,7 +27,7 @@ endsnippet
 snippet ns "namespace .. (namespace)"
 namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`}
 {
-	$0
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
 }${1/.+/ \/* /m}$1${1/.+/ *\/ /m}
 endsnippet
 
diff --git a/UltiSnips/cs.snippets b/UltiSnips/cs.snippets
new file mode 100644
index 000000000..aca245e52
--- /dev/null
+++ b/UltiSnips/cs.snippets
@@ -0,0 +1,328 @@
+#######################################################################
+#                      C# Snippets for UltiSnips                      #
+#######################################################################
+
+priority -50
+
+#########################
+#  classes and structs  #
+#########################
+
+snippet namespace "namespace" b
+namespace ${1:MyNamespace}
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet class "class" w
+class ${1:MyClass}
+{
+	$0
+}
+endsnippet
+
+snippet struct "struct" w
+struct ${1:MyStruct}
+{
+	$0
+}
+endsnippet
+
+snippet interface "interface" w
+interface I${1:Interface}
+{
+	$0
+}
+endsnippet
+
+snippet enum "enumeration" b
+enum ${1:MyEnum} { ${2:Item} };
+endsnippet
+
+
+############
+#  Main()  #
+############
+
+snippet sim "static int main" b
+static int Main(string[] args)
+{
+	$0
+}
+endsnippet
+
+snippet svm "static void main" b
+static void Main(string[] args)
+{
+	$0
+}
+endsnippet
+
+
+################
+#  properties  #
+################
+
+snippet prop "Simple property declaration" b
+public ${1:int} ${2:MyProperty} { get; set; }
+endsnippet
+
+snippet propfull "Full property declaration" b
+private ${1:int} ${2:_myProperty};
+
+public $1 ${3:MyProperty}
+{
+	get { return $2; }
+	set { $2 = value; }
+}
+endsnippet
+
+snippet propg "Property with a private setter" b
+public ${1:int} ${2:MyProperty} { get; private set; }
+endsnippet
+
+
+############
+#  blocks  #
+############
+
+snippet #if "#if #endif" b
+#if ${1:DEBUG}
+${VISUAL}$0
+#endif
+endsnippet
+
+snippet #region "#region #endregion" b
+#region ${1:Region}
+${VISUAL}$0
+#endregion
+endsnippet
+
+
+###########
+#  loops  #
+###########
+
+snippet for "for loop" b
+for (int ${1:i} = 0; $1 < ${2:10}; $1++)
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet forr "for loop (reverse)" b
+for (int ${1:i} = ${2:10}; $1 >= 0; $1--)
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet foreach "foreach loop" b
+foreach (${3:var} ${2:item} in ${1:items})
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet while "while loop" b
+while (${1:true})
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet do "do loop" b
+do
+{
+	${VISUAL}$0
+} while (${1:true});
+endsnippet
+
+
+###############
+#  branching  #
+###############
+
+snippet if "if statement" b
+if ($1)
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet ife "if else statement" b
+if ($1)
+{
+	${VISUAL}$0
+}
+else
+{
+}
+endsnippet
+
+snippet elif "else if" b
+else if ($1)
+{
+	$0
+}
+endsnippet
+
+snippet elseif "else if" b
+else if ($1)
+{
+	$0
+}
+endsnippet
+
+snippet ifnn "if not null" b
+if ($1 != null)
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet switch "switch statement" b
+switch (${1:statement})
+{
+	case ${2:value}:
+		break;
+
+	default:
+		$0break;
+}
+endsnippet
+
+snippet case "case" b
+case ${1:value}:
+	$2
+	break;
+endsnippet
+
+
+##############
+#  wrappers  #
+##############
+
+snippet using "using statement" b
+using (${1:resource})
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet unchecked "unchecked block" b
+unchecked
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet checked "checked block" b
+checked
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet unsafe "unsafe" b
+unsafe
+{
+	${VISUAL}$0
+}
+endsnippet
+
+
+########################
+#  exception handling  #
+########################
+
+snippet try "try catch block" b
+try
+{
+	${VISUAL}$0
+}
+catch (${1:Exception} ${2:e})
+{
+	throw;
+}
+endsnippet
+
+snippet tryf "try finally block" b
+try
+{
+	${VISUAL}$0
+}
+finally
+{
+}
+endsnippet
+
+snippet throw "throw"
+throw new ${1}Exception("${2}");
+endsnippet
+
+
+##########
+#  LINQ  #
+##########
+
+snippet from "LINQ syntax" b
+var ${1:seq} =
+	from ${2:item1} in ${3:items1}
+	join ${4:item2} in ${5:items2} on $2.${6:prop1} equals $4.${7:prop2}
+	select ${8:$2.prop3}
+	where ${9:clause}
+endsnippet
+
+
+############################
+#  feedback and debugging  #
+############################
+
+snippet da "Debug.Assert" b
+Debug.Assert(${1:true});
+endsnippet
+
+snippet cw "Console.WriteLine" b
+Console.WriteLine("$1");
+endsnippet
+
+# as you first type comma-separated parameters on the right, {n} values appear in the format string
+snippet cwp "Console.WriteLine with parameters" b
+Console.WriteLine("${2:`!p
+snip.rv = ' '.join(['{' + str(i) + '}' for i in range(t[1].count(','))])
+`}"${1:, something});
+endsnippet
+
+snippet mbox "Message box" b
+MessageBox.Show("${1:message}");
+endsnippet
+
+
+##################
+#  full methods  #
+##################
+
+snippet equals "Equals method" b
+public override bool Equals(object obj)
+{
+	if (obj == null || GetType() != obj.GetType())
+	{
+		return false;
+	}
+	$0
+	return base.Equals(obj);
+}
+endsnippet
+
+
+##############
+#  comments  #
+##############
+
+snippet /// "XML comment" b
+/// <summary>
+/// $1
+/// </summary>
+endsnippet
diff --git a/UltiSnips/css.snippets b/UltiSnips/css.snippets
index d14d51c04..32c3f217e 100644
--- a/UltiSnips/css.snippets
+++ b/UltiSnips/css.snippets
@@ -2,6 +2,8 @@
 #                    Most of these came from TextMate                     #
 ###########################################################################
 
+priority -50
+
 snippet ! "!important CSS (!)"
 ${1:!important}
 endsnippet
diff --git a/UltiSnips/d.snippets b/UltiSnips/d.snippets
index 7f38c6d8d..99da292e3 100644
--- a/UltiSnips/d.snippets
+++ b/UltiSnips/d.snippets
@@ -1,5 +1,7 @@
 # Simple shortcuts
 
+priority -50
+
 snippet imp "import (imp)" b
 import ${1:std.stdio};
 endsnippet
@@ -42,22 +44,22 @@ endsnippet
 
 snippet pub "public (pub)" b
 public:
-    ${1:/*members*/}
+	${1:/*members*/}
 endsnippet
 
 snippet priv "private (priv)" b
 private:
-    ${1:/*members*/}
+	${1:/*members*/}
 endsnippet
 
 snippet prot "protected (prot)" b
 protected:
-    ${1:/*members*/}
+	${1:/*members*/}
 endsnippet
 
 snippet pack "package (pack)" b
 package:
-    ${1:/*members*/}
+	${1:/*members*/}
 endsnippet
 
 snippet ret "return (ret)"
@@ -96,7 +98,7 @@ endsnippet
 
 snippet enf "enforce (enf)" b
 enforce(${1:/*condition*/},
-        new ${2}Exception(${3:/*args*/}));
+	new ${2}Exception(${3:/*args*/}));
 endsnippet
 
 # Branches
@@ -104,67 +106,67 @@ endsnippet
 snippet if "if .. (if)"
 if(${1:/*condition*/})
 {
-    ${VISUAL}${0:/*code*/}
+	${VISUAL}${0:/*code*/}
 }
 endsnippet
 
 snippet ife "if .. else (ife)" b
 if(${1:/*condition*/})
 {
-    ${2:/*code*/}
+	${2:/*code*/}
 }
 else
 {
-    ${3:/*else*/}
+	${3:/*else*/}
 }
 endsnippet
 
 snippet el "else (el)" b
 else
 {
-    ${VISUAL}${1:/*code*/}
+	${VISUAL}${1:/*code*/}
 }
 endsnippet
 
-snippet eif "else if (elif)" b
+snippet elif "else if (elif)" b
 else if(${1:/*condition*/})
 {
-    ${VISUAL}${0:/*code*/}
+	${VISUAL}${0:/*code*/}
 }
 endsnippet
 
 snippet sw "switch (sw)"
 switch(${1:/*var*/})
 {
-    case ${2:/*value*/}:
-        ${3:/*code*/}
-        break;
-    case ${4:/*value*/}:
-        ${5:/*code*/}
-        break;
-    ${7:/*more cases*/}
-    default:
-        ${6:assert(false);}
+	case ${2:/*value*/}:
+		${3:/*code*/}
+		break;
+	case ${4:/*value*/}:
+		${5:/*code*/}
+		break;
+	${7:/*more cases*/}
+	default:
+		${6:assert(false);}
 }
 endsnippet
 
 snippet fsw "final switch (fsw)"
 switch(${1:/*var*/})
 {
-    case ${2:/*value*/}:
-        ${3:/*code*/}
-        break;
-    case ${4:/*value*/}:
-        ${5:/*code*/}
-        break;
-    ${7:/*more cases*/}
+	case ${2:/*value*/}:
+		${3:/*code*/}
+		break;
+	case ${4:/*value*/}:
+		${5:/*code*/}
+		break;
+	${7:/*more cases*/}
 }
 endsnippet
 
 snippet case "case (case)" b
 case ${1:/*value*/}:
-    ${2:/*code*/}
-    break;
+	${2:/*code*/}
+	break;
 endsnippet
 
 snippet ?: "ternary operator (?:)"
@@ -176,42 +178,42 @@ endsnippet
 snippet do "do while (do)" b
 do
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 } while(${1:/*condition*/});
 endsnippet
 
 snippet wh "while (wh)" b
 while(${1:/*condition*/})
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 }
 endsnippet
 
 snippet for "for (for)" b
 for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-    ${VISUAL}${0:/*code*/}
+	${VISUAL}${0:/*code*/}
 }
 endsnippet
 
 snippet forever "forever (forever)" b
 for(;;)
 {
-    ${VISUAL}${0:/*code*/}
+	${VISUAL}${0:/*code*/}
 }
 endsnippet
 
 snippet fore "foreach (fore)"
 foreach(${1:/*elem*/}; ${2:/*range*/})
 {
-    ${VISUAL}${3:/*code*/}
+	${VISUAL}${3:/*code*/}
 }
 endsnippet
 
 snippet forif "foreach if (forif)" b
 foreach(${1:/*elem*/}; ${2:/*range*/}) if(${3:/*condition*/})
 {
-    ${VISUAL}${4:/*code*/}
+	${VISUAL}${4:/*code*/}
 }
 endsnippet
 
@@ -219,8 +221,8 @@ endsnippet
 snippet in "in contract (in)" b
 in
 {
-    assert(${1:/*condition*/}, "${2:error message}");
-    ${3}
+	assert(${1:/*condition*/}, "${2:error message}");
+	${3}
 }
 body
 endsnippet
@@ -228,8 +230,8 @@ endsnippet
 snippet out "out contract (out)" b
 out${1:(result)}
 {
-    assert(${2:/*condition*/}, "${3:error message}");
-    ${4}
+	assert(${2:/*condition*/}, "${3:error message}");
+	${4}
 }
 body
 endsnippet
@@ -237,8 +239,8 @@ endsnippet
 snippet inv "invariant (inv)" b
 invariant()
 {
-    assert(${1:/*condition*/}, "${2:error message}");
-    ${3}
+	assert(${1:/*condition*/}, "${2:error message}");
+	${3}
 }
 endsnippet
 
@@ -247,29 +249,29 @@ endsnippet
 snippet fun "function definition (fun)"
 ${1:void} ${2:/*function name*/}(${3:/*args*/}) ${4:@safe pure nothrow}
 {
-    ${VISUAL}${5:/*code*/}
+	${VISUAL}${5:/*code*/}
 }
 endsnippet
 
 snippet void "void function definition (void)"
 void ${1:/*function name*/}(${2:/*args*/}) ${3:@safe pure nothrow}
 {
-    ${VISUAL}${4:/*code*/}
+	${VISUAL}${4:/*code*/}
 }
 endsnippet
 
 snippet this "ctor (this)" w
 this(${1:/*args*/})
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 }
 endsnippet
 
-snippet get "getter property (get)" !
+snippet get "getter property (get)"
 @property ${1:/*type*/} ${2:/*member_name*/}() const pure nothrow {return ${3:$2_};}
 endsnippet
 
-snippet set "setter property (set)" !
+snippet set "setter property (set)"
 @property void ${1:/*member_name*/}(${2:/*type*/} rhs) pure nothrow {${3:$1_} = rhs;}
 endsnippet
 
@@ -278,7 +280,7 @@ endsnippet
 snippet main "Main" b
 void main(string[] args)
 {
-    ${VISUAL}${0: /*code*/}
+	${VISUAL}${0: /*code*/}
 }
 endsnippet
 
@@ -293,7 +295,7 @@ endsnippet
 snippet scope "scope (scope)" b
 scope(${1:exit})
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 }
 endsnippet
 
@@ -302,7 +304,7 @@ endsnippet
 snippet with "with (with)"
 with(${1})
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 }
 endsnippet
 
@@ -311,33 +313,33 @@ endsnippet
 snippet try "try/catch (try)" b
 try
 {
-    ${VISUAL}${1:/*code to try*/}
+	${VISUAL}${1:/*code to try*/}
 }
 catch(${2}Exception e)
 {
-    ${3:/*handle exception*/}
+	${3:/*handle exception*/}
 }
 endsnippet
 
 snippet tryf "try/catch/finally (tryf)" b
 try
 {
-    ${VISUAL}${1:/*code to try*/}
+	${VISUAL}${1:/*code to try*/}
 }
 catch(${2}Exception e)
 {
-    ${3:/*handle exception*/}
+	${3:/*handle exception*/}
 }
 finally
 {
-    ${4:/*cleanup*/}
+	${4:/*cleanup*/}
 }
 endsnippet
 
 snippet catch "catch (catch)" b
 catch(${1}Exception e)
 {
-    ${2:/*handle exception*/}
+	${2:/*handle exception*/}
 }
 endsnippet
 
@@ -351,35 +353,35 @@ endsnippet
 snippet struct "struct (struct)"
 struct ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-    ${2}
+	${2}
 }
 endsnippet
 
 snippet union "union (union)"
 union ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-    ${2}
+	${2}
 }
 endsnippet
 
 snippet class "class (class)"
 class ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-    ${2}
+	${2}
 }
 endsnippet
 
 snippet inter "interface (inter)"
 interface ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-    ${2}
+	${2}
 }
 endsnippet
 
 snippet enum "enum (enum)"
 enum ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-    ${2}
+	${2}
 }
 endsnippet
 
@@ -388,12 +390,12 @@ endsnippet
 
 snippet exc "exception declaration (exc)" b
 /// ${3:/*documentation*/}
-class ${1}Exception : ${2}Exception 
+class ${1}Exception : ${2}Exception
 {
-    public this(string msg, string file = __FILE__, int line = __LINE__)
-    {
-        super(msg, file, line);
-    }
+	public this(string msg, string file = __FILE__, int line = __LINE__)
+	{
+		super(msg, file, line);
+	}
 }
 endsnippet
 
@@ -403,14 +405,14 @@ endsnippet
 snippet version "version (version)" b
 version(${1:/*version name*/})
 {
-    ${VISUAL}${2:/*code*/}
+	${VISUAL}${2:/*code*/}
 }
 endsnippet
 
 snippet debug "debug" b
 debug
 {
-    ${VISUAL}${1:/*code*/}
+	${VISUAL}${1:/*code*/}
 }
 endsnippet
 
@@ -420,7 +422,7 @@ endsnippet
 snippet temp "template (temp)" b
 template ${2:/*name*/}(${1:/*args*/})
 {
-    ${3:/*code*/}
+	${3:/*code*/}
 }
 endsnippet
 
@@ -438,7 +440,7 @@ endsnippet
 snippet unittest "unittest (unittest)" b
 unittest
 {
-    ${1:/*code*/}
+	${1:/*code*/}
 }
 endsnippet
 
@@ -448,41 +450,41 @@ endsnippet
 snippet opDis "opDispatch (opDis)" b
 ${1:/*return type*/} opDispatch(string s)()
 {
-    ${2:/*code*/};
+	${2:/*code*/};
 }
 endsnippet
 
 snippet op= "opAssign (op=)" b
 void opAssign(${1} rhs) ${2:@safe pure nothrow}
 {
-    ${2:/*code*/}
+	${2:/*code*/}
 }
 endsnippet
 
 snippet opCmp "opCmp (opCmp)" b
 int opCmp(${1} rhs) @safe const pure nothrow
 {
-    ${2:/*code*/}
+	${2:/*code*/}
 }
 endsnippet
 
 snippet opApply "opApply (opApply)" b
 int opApply(int delegate(ref ${1:/*iterated type/s*/}) dg)
 {
-    int result = 0;
-    ${2:/*loop*/}
-    {
-        result = dg(${3:/*arg/s*/});
-        if(result){break;}
-    }
-    return result;
+	int result = 0;
+	${2:/*loop*/}
+	{
+		result = dg(${3:/*arg/s*/});
+		if(result){break;}
+	}
+	return result;
 }
 endsnippet
 
 snippet toString "toString (toString)" b
 string toString() @safe const pure nothrow
 {
-    ${1:/*code*/}
+	${1:/*code*/}
 }
 endsnippet
 
@@ -490,12 +492,11 @@ endsnippet
 # Comments
 
 
-snippet todo "TODO (todo)" !
+snippet todo "TODO (todo)"
 // TODO: ${1}
 endsnippet
 
 
-
 # DDoc
 
 snippet doc "generic ddoc block (doc)" b
@@ -508,7 +509,7 @@ snippet fdoc "function ddoc block (fdoc)" b
 /// ${1:description}
 ///
 /// ${2:Params:  ${3:param} = ${4:param description}
-///          ${5}}
+///			 ${5}}
 ///
 /// ${6:Returns: ${7:return value}}
 ///
@@ -517,7 +518,7 @@ endsnippet
 
 snippet Par "Params (Par)"
 Params:  ${1:param} = ${2:param description}
-///         ${3}
+///			${3}
 endsnippet
 
 snippet Ret "Returns (Ret)"
@@ -543,16 +544,16 @@ snippet gpl "GPL (gpl)" b
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-// 
+//
 // Copyright (C) ${1:Author}, `!v strftime("%Y")`
 
 ${2}
diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 553babab9..9d6ce279b 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 # Generic Tags
 snippet %
 {% ${1} %}${2}
@@ -5,7 +7,7 @@ endsnippet
 
 snippet %%
 {% ${1:tag_name} %}
-  ${2}
+	${2}
 {% end$1 %}
 endsnippet
 
@@ -17,14 +19,14 @@ endsnippet
 
 snippet autoescape
 {% autoescape ${1:off} %}
-  ${2}
+	${2}
 {% endautoescape %}
 endsnippet
 
 snippet block
 {% block ${1} %}
-  ${2}
-{% endblock %}
+	${2}
+{% endblock $1 %}
 endsnippet
 
 snippet #
@@ -33,7 +35,7 @@ endsnippet
 
 snippet comment
 {% comment %}
-  ${1}
+	${1}
 {% endcomment %}
 endsnippet
 
@@ -51,7 +53,7 @@ endsnippet
 
 snippet filter
 {% filter ${1} %}
-  ${2}
+	${2}
 {% endfilter %}
 endsnippet
 
@@ -61,24 +63,24 @@ endsnippet
 
 snippet for
 {% for ${1} in ${2} %}
-  ${3}
+	${3}
 {% endfor %}
 endsnippet
 
 snippet empty
 {% empty %}
-  ${1}
+	${1}
 endsnippet
 
 snippet if
 {% if ${1} %}
-  ${2}
+	${2}
 {% endif %}
 endsnippet
 
-snippet el
+snippet else
 {% else %}
-  ${1}
+	${1}
 endsnippet
 
 snippet ifchanged
@@ -87,13 +89,13 @@ endsnippet
 
 snippet ifequal
 {% ifequal ${1} ${2} %}
-  ${3}
+	${3}
 {% endifequal %}
 endsnippet
 
 snippet ifnotequal
 {% ifnotequal ${1} ${2} %}
-  ${3}
+	${3}
 {% endifnotequal %}
 endsnippet
 
diff --git a/UltiSnips/elixir.snippets b/UltiSnips/elixir.snippets
index ae7ea2011..6abcb8c32 100644
--- a/UltiSnips/elixir.snippets
+++ b/UltiSnips/elixir.snippets
@@ -1,5 +1,7 @@
 # Credit: @iurifg
 
+priority -50
+
 snippet do
 do
 	${1}
diff --git a/UltiSnips/erlang.snippets b/UltiSnips/erlang.snippets
index 782316261..e27fbefae 100644
--- a/UltiSnips/erlang.snippets
+++ b/UltiSnips/erlang.snippets
@@ -2,6 +2,8 @@
 #                            TEXTMATE SNIPPETS                            #
 ###########################################################################
 
+priority -50
+
 snippet pat "Case:Receive:Try Clause"
 ${1:pattern}${2: when ${3:guard}} ->;
 	${4:body}
diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index cd462fb2c..118cdfec1 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 # TextMate added these variables to cope with changes in ERB handling
 # in different versions of Rails -- for instance, Rails 3 automatically
 # strips whitespace so that it's no longer necessary to use a form like
@@ -11,16 +13,15 @@
 #
 global !p
 def textmate_var(var, snip):
-    lookup = dict(
-       TM_RAILS_TEMPLATE_START_RUBY_EXPR = snip.opt('g:tm_rails_template_start_ruby_expr', '<%= '),
-       TM_RAILS_TEMPLATE_END_RUBY_EXPR = snip.opt('g:tm_rails_template_end_ruby_expr', ' %>'),
-       TM_RAILS_TEMPLATE_START_RUBY_INLINE = snip.opt('g:tm_rails_template_start_ruby_inline', '<% '),
-       TM_RAILS_TEMPLATE_END_RUBY_INLINE = snip.opt('g:tm_rails_template_end_ruby_inline', ' %>'),
-       TM_RAILS_TEMPLATE_END_RUBY_BLOCK = '<% end %>'
-    )
-
-    snip.rv = lookup[var]
-    return
+	lookup = dict(
+		TM_RAILS_TEMPLATE_START_RUBY_EXPR = snip.opt('g:tm_rails_template_start_ruby_expr', '<%= '),
+		TM_RAILS_TEMPLATE_END_RUBY_EXPR = snip.opt('g:tm_rails_template_end_ruby_expr', ' %>'),
+		TM_RAILS_TEMPLATE_START_RUBY_INLINE = snip.opt('g:tm_rails_template_start_ruby_inline', '<% '),
+		TM_RAILS_TEMPLATE_END_RUBY_INLINE = snip.opt('g:tm_rails_template_end_ruby_inline', ' %>'),
+		TM_RAILS_TEMPLATE_END_RUBY_BLOCK = '<% end %>'
+	)
+	snip.rv = lookup[var]
+	return
 endglobal
 
 
@@ -42,7 +43,7 @@ endsnippet
 
 snippet ft "form_tag"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => "${5:update}"}${6:, {:${8:class} => "${9:form}"\}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-  $0
+	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
@@ -52,11 +53,11 @@ endsnippet
 
 snippet for "for loop (ERB)"
 <% if !${1:list}.blank? %>
-  <% for ${2:item} in ${1} %>
-    $3
-  <% end %>
+	<% for ${2:item} in ${1} %>
+		$3
+	<% end %>
 <% else %>
-  $4
+	$4
 <% end %>
 
 endsnippet
@@ -74,7 +75,7 @@ snippet ffhf "form_for hidden_field 2"
 endsnippet
 
 snippet ffl "form_for label 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.label :${1:attribute', snip)`${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.label :${1:attribute}${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet ffpf "form_for password_field 2"
@@ -99,7 +100,7 @@ endsnippet
 
 snippet fields "fields_for"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`fields_for :${1:model}, @${2:$1} do |$1|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
-  $0
+	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
@@ -122,7 +123,7 @@ snippet f. "f.hidden_field"
 endsnippet
 
 snippet f. "f.label"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR}f.label :${1:attribute', snip)`${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.label :${1:attribute}${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet f. "f.password_field"
@@ -148,14 +149,14 @@ endsnippet
 snippet ffe "form_for with errors"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`error_messages_for :${1:model}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_for @${2:$1} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
-  $0
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`form_for @${2:$1} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
 snippet ff "form_for"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_for @${1:model} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
-  $0
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`form_for @${1:model} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
@@ -271,9 +272,9 @@ snippet st "submit_tag"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`submit_tag "${1:Save changes}"${2:, :id => "${3:submit}"}${4:, :name => "${5:$3}"}${6:, :class => "${7:form_$3}"}${8:, :disabled => ${9:false}}${10:, :disable_with => "${11:Please wait...}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet el "else (ERB)"
+snippet else "else (ERB)"
 <% else %>
-  
+	$0
 endsnippet
 
 snippet if "if (ERB)"
diff --git a/UltiSnips/go.snippets b/UltiSnips/go.snippets
index ea46931ba..d01e3f1c5 100644
--- a/UltiSnips/go.snippets
+++ b/UltiSnips/go.snippets
@@ -1,5 +1,7 @@
 # Snippets for Go
 
+priority -50
+
 # when to abbriviate and when not?
 # b doesn't work here, because it ignores whitespace
 # optional local name?
@@ -31,37 +33,55 @@ const (
 )
 endsnippet
 
+snippet struct "Struct declaration" b
+type ${1:Struct} struct {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet interface "Interface declaration" b
+type ${1:Interface} interface {
+	${0:${VISUAL}}
+}
+endsnippet
+
 # statements
-snippet for "For loop" !b
+snippet for "For loop" b
 for ${1:condition}${1/(.+)/ /}{
 	${0:${VISUAL}}
 }
 endsnippet
 
-snippet forr "For range loop" !b
+snippet forr "For range loop" b
 for ${2:name} := range ${1:collection} {
 	${0:${VISUAL}}
 }
 endsnippet
 
-snippet if "If statement" !b
+snippet if "If statement" b
 if ${1:condition}${1/(.+)/ /}{
 	${0:${VISUAL}}
 }
 endsnippet
 
-snippet switch "Switch statement" !b
+snippet switch "Switch statement" b
 switch ${1:expression}${1/(.+)/ /}{
 case${0}
 }
 endsnippet
 
-snippet case "Case clause" !b
+snippet select "Select statement" b
+select {
+case${0}
+}
+endsnippet
+
+snippet case "Case clause" b
 case ${1:condition}:
 	${0:${VISUAL}}
 endsnippet
 
-snippet default "Default clause" !b
+snippet default "Default clause" b
 default:
 	${0:${VISUAL}}
 endsnippet
@@ -86,22 +106,26 @@ func ${1:name}(${2:params})${3/(.+)/ /}${3:type} {
 endsnippet
 
 # types and variables
-snippet map "Map type" !b
+snippet map "Map type" b
 map[${1:keytype}]${2:valtype}
 endsnippet
 
-snippet : "Variable declaration :=" !b
+snippet : "Variable declaration :=" b
 ${1:name} := ${0:value}
 endsnippet
 
-snippet var "Variable declaration" !b
+snippet var "Variable declaration" b
 var ${1:name}${2/(.+)/ /}${2:type}${3: = ${0:value}}
 endsnippet
 
-snippet vars "Variables declaration" !b
+snippet vars "Variables declaration" b
 var (
 	${1:name}${2/(.+)/ /}${2:type}${3: = ${0:value} }
 )
 endsnippet
 
+snippet json "JSON field"
+\`json:"${1:displayName}"\`
+endsnippet
+
 # vim:ft=snippets:
diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets
index 99f947f81..ad217fd8e 100644
--- a/UltiSnips/haskell.snippets
+++ b/UltiSnips/haskell.snippets
@@ -1,13 +1,15 @@
-snippet ife "if ... then ... else ..."
+priority -50
+
+snippet if "if ... then ... else ..."
 if ${1:condition}
-   then ${2:expression}
-   else ${3:expression}
+	then ${2:expression}
+	else ${3:expression}
 endsnippet
 
 snippet case "case ... of ..."
-case ${1} of
-     ${2} -> ${3}
-     ${4} -> ${5}
+case ${1:expression} of
+	${2:pattern} -> ${3:expression}
+	${4:pattern} -> ${5:expression}
 endsnippet
 
 snippet :: "Type signature"
diff --git a/UltiSnips/help.snippets b/UltiSnips/help.snippets
index bd0bb12fb..613273856 100644
--- a/UltiSnips/help.snippets
+++ b/UltiSnips/help.snippets
@@ -1,10 +1,12 @@
 # Snippets for VIM Help Files
 
+priority -50
+
 global !p
 def sec_title(snip, t):
-    file_start = snip.fn.split('.')[0]
-    sec_name = t[1].strip("1234567890. ").lower().replace(' ', '-')
-    return ("*%s-%s*" % (file_start, sec_name)).rjust(78-len(t[1]))
+	file_start = snip.fn.split('.')[0]
+	sec_name = t[1].strip("1234567890. ").lower().replace(' ', '-')
+	return ("*%s-%s*" % (file_start, sec_name)).rjust(78-len(t[1]))
 endglobal
 
 snippet sec "Section marker" b
diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index fd11d70b8..31f7cc34d 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -1,13 +1,15 @@
+priority -50
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
 
 global !p
 def x(snip):
-    if snip.ft.startswith("x"):
-        snip.rv = '/'
-    else:
-        snip.rv = ""
+	if snip.ft.startswith("x"):
+		snip.rv = '/'
+	else:
+		snip.rv = ""
 endglobal
 
 ############
@@ -123,21 +125,21 @@ endsnippet
 #############
 # HTML TAGS #
 #############
-snippet input "Input with Label"
+snippet input "Input with Label" w
 <label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}">$1</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="$5"${6: id="${7:$2}"}`!p x(snip)`>
 
 endsnippet
 
-snippet input "XHTML   <input>"
+snippet input "XHTML   <input>" w
 <input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}`!p x(snip)`>
 endsnippet
 
 
-snippet opt "Option"
+snippet opt "Option" w
 <option${1: value="${2:option}"}>${3:$2}</option>
 endsnippet
 
-snippet select "Select Box"
+snippet select "Select Box" w
 <select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: onchange="${6:}"}${7: size="${8:1}"}}>
 	<option${9: value="${10:option1}"}>${11:$10}</option>
 	<option${12: value="${13:option2}"}>${14:$13}</option>${15:}
@@ -146,18 +148,22 @@ snippet select "Select Box"
 endsnippet
 
 
-snippet textarea "XHTML   <textarea>"
+snippet textarea "XHTML   <textarea>" w
 <textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">$0</textarea>
 endsnippet
 
-snippet mailto "XHTML <a mailto: >"
+snippet mailto "XHTML <a mailto: >" w
 <a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
 endsnippet
 
-snippet base "XHTML <base>"
+snippet base "XHTML <base>" w
 <base href="$1"${2: target="$3"}`!p x(snip)`>
 endsnippet
 
+snippet img "XHTML <img>" w
+<img src="${1:imgsrc}">
+endsnippet
+
 snippet body "XHTML <body>"
 <body id="${1:`!p
 snip.rv = snip.fn and 'Hallo' or 'Nothin'
@@ -166,13 +172,13 @@ snip.rv = snip.fn and 'Hallo' or 'Nothin'
 </body>
 endsnippet
 
-snippet div "XHTML <div>"
-<div`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`>
-   $0
+snippet div "XHTML <div>" w
+<div`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`>
+	$0
 </div>
 endsnippet
 
-snippet form "XHTML <form>"
+snippet form "XHTML <form>" w
 <form action="${1:`!p
 snip.rv = (snip.basename or 'unnamed') + '_submit'
 `}" method="${2:get}" accept-charset="utf-8">
@@ -182,7 +188,7 @@ snip.rv = (snip.basename or 'unnamed') + '_submit'
 </form>
 endsnippet
 
-snippet h1 "XHTML <h1>"
+snippet h1 "XHTML <h1>" w
 <h1 id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}">${1}</h1>
 endsnippet
 
@@ -194,71 +200,70 @@ snippet head "XHTML <head>"
 </head>
 endsnippet
 
-snippet link "XHTML <link>"
+snippet link "XHTML <link>" w
 <link rel="${1:stylesheet}" href="${2:/css/master.css}" type="text/css" media="${3:screen}" title="${4:no title}" charset="${5:utf-8}"`!p x(snip)`>
 endsnippet
 
-snippet meta "XHTML <meta>"
+snippet meta "XHTML <meta>" w
 <meta name="${1:name}" content="${2:content}"`!p x(snip)`>
 endsnippet
 
-snippet scriptsrc "XHTML <script src...>"
+snippet scriptsrc "XHTML <script src...>" w
 <script src="$1" type="text/javascript" charset="${3:utf-8}"></script>
 endsnippet
 
-snippet script "XHTML <script>"
+snippet script "XHTML <script>" w
 <script type="text/javascript" charset="utf-8">
 	$0
 </script>
 endsnippet
 
-snippet style "XHTML <style>"
+snippet style "XHTML <style>" w
 <style type="text/css" media="screen">
 	$0
 </style>
 endsnippet
 
-snippet table "XHTML <table>"
+snippet table "XHTML <table>" w
 <table border="${1:0}"${2: cellspacing="${3:5}" cellpadding="${4:5}"}>
 	<tr><th>${5:Header}</th></tr>
 	<tr><td>${0:Data}</td></tr>
 </table>
 endsnippet
 
-snippet a "Link"
+snippet a "Link" w
 <a href="${1:http://www.${2:url.com}}"${3: target="_blank"}>${4:Anchor Text}</a>
 endsnippet
 
-snippet p "paragraph"
+snippet p "paragraph" w
 <p>$0</p>
 endsnippet
 
-snippet li "list item"
-<li></li>
+snippet li "list item" w
+<li>$0</li>
 endsnippet
 
-snippet ul "unordered list"
+snippet ul "unordered list" w
 <ul>
 $0
 </ul>
 endsnippet
 
-snippet td "table cell"
+snippet td "table cell" w
 <td>$0</td>
 endsnippet
 
-snippet tr "table row"
+snippet tr "table row" w
 <tr>$0</tr>
 endsnippet
 
-snippet title "XHTML <title>"
+snippet title "XHTML <title>" w
 <title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
 endsnippet
 
-snippet fieldset "Fieldset"
+snippet fieldset "Fieldset" w
 <fieldset id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}" ${2:class="${3:}"}>
 	<legend>$1</legend>
-	
 	$0
 </fieldset>
 endsnippet
@@ -282,7 +287,7 @@ snippet html5 "HTML5 Template"
 <html>
 <head>
 	<title>${1}</title>
-	<meta charset="utf-8">
+	<meta charset="utf-8" />
 </head>
 <body>
 	<header>
diff --git a/UltiSnips/html_minimal.snippets b/UltiSnips/html_minimal.snippets
index 1f77ad7b9..48ff4b723 100644
--- a/UltiSnips/html_minimal.snippets
+++ b/UltiSnips/html_minimal.snippets
@@ -1,6 +1,8 @@
 # more can be found in snippets/html_minimal.snippets
 # these UltiSnips override snippets because nested placeholders are being used
 
+priority -50
+
 snippet id
 id="${1}"${2}
 endsnippet
diff --git a/UltiSnips/htmldjango.snippets b/UltiSnips/htmldjango.snippets
index 9df5f7884..5836a2f69 100644
--- a/UltiSnips/htmldjango.snippets
+++ b/UltiSnips/htmldjango.snippets
@@ -1 +1,3 @@
+priority -50
+
 extends html, django
diff --git a/UltiSnips/htmljinja.snippets b/UltiSnips/htmljinja.snippets
new file mode 100644
index 000000000..fa3b3c22a
--- /dev/null
+++ b/UltiSnips/htmljinja.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends html, jinja2
diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 617c16166..96cc7a9ee 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -1,27 +1,75 @@
-###########################################################################
-#                            TEXTMATE SNIPPETS                            #
-###########################################################################
+priority -50
 
 # Many of the snippets here use a global option called
 # "g:ultisnips_java_brace_style" which, if set to "nl" will put a newline
 # before '{' braces.
+# Setting "g:ultisnips_java_junit" will change how the test method snippet
+# looks, it is defaulted to junit4, setting this option to 3 will remove the
+# @Test annotation from the method
 
 global !p
+def junit(snip):
+	if snip.opt("g:ultisnips_java_junit", "") == "3":
+		snip += ""
+	else:
+		snip.rv += "@Test\n\t"
+
 def nl(snip):
-    if snip.opt("g:ultisnips_java_brace_style", "") == "nl":
-        snip += ""
-    else:
-        snip.rv += " "
+	if snip.opt("g:ultisnips_java_brace_style", "") == "nl":
+		snip += ""
+	else:
+		snip.rv += " "
+def getArgs(group):
+	import re
+	word = re.compile('[a-zA-Z><.]+ \w+')
+	return [i.split(" ") for i in word.findall(group) ]
+
+def camel(word):
+	return word[0].upper() + word[1:]
+
 endglobal
 
+snippet sleep "try sleep catch" b
+try {
+	Thread.sleep(${1:1000});
+} catch (InterruptedException e){
+	e.printStackTrace();
+}
+endsnippet
+
+snippet /i|n/ "new primitive or int" br
+${1:int} ${2:i} = ${3:1};
+$0
+endsnippet
+
+snippet /o|v/ "new Object or variable" br
+${1:Object} ${2:var} = new $1(${3});
+endsnippet
+
+snippet f "field" b
+${1:private} ${2:String} ${3:`!p snip.rv = t[2].lower()`};
+endsnippet
+
 snippet ab "abstract" b
-abstract 
+abstract $0
 endsnippet
 
 snippet as "assert" b
 assert ${1:test}${2/(.+)/(?1: \: ")/}${2:Failure message}${2/(.+)/(?1:")/};$0
 endsnippet
 
+snippet at "assert true" b
+assertTrue(${1:actual});
+endsnippet
+
+snippet af "assert false" b
+assertFalse(${1:actual});$0
+endsnippet
+
+snippet ae "assert equals" b
+assertEquals(${1:expected}, ${2:actual});
+endsnippet
+
 snippet br "break"
 break;
 
@@ -39,19 +87,85 @@ catch (${1:Exception} ${2:e})`!p nl(snip)`{
 }
 endsnippet
 
-snippet cl "class" b
-class ${1:`!p
+snippet cle "class extends" b
+public class ${1:`!p
 snip.rv = snip.basename or "untitled"`} ${2:extends ${3:Parent} }${4:implements ${5:Interface} }{
 	$0
 }
 endsnippet
 
+snippet clc "class with constructor, fields, setter and getters" b
+public class `!p
+snip.rv = snip.basename or "untitled"` {
+`!p
+args = getArgs(t[1])
+if len(args) == 0: snip.rv = ""
+for i in args:
+	snip.rv += "\n\tprivate " + i[0] + " " + i[1]+ ";"
+if len(args) > 0:
+	snip.rv += "\n"`
+	public `!p snip.rv = snip.basename or "unknown"`($1) { `!p
+args = getArgs(t[1])
+for i in args:
+	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1] + ";"
+if len(args) == 0:
+	snip.rv += "\n"`
+	}$0
+`!p
+args = getArgs(t[1])
+if len(args) == 0: snip.rv = ""
+for i in args:
+	snip.rv += "\n\tpublic void set" + camel(i[1]) + "(" + i[0] + " " + i[1] + ") {\n" + "\
+	\tthis." + i[1] + " = " + i[1] + ";\n\t}\n"
+
+	snip.rv += "\n\tpublic " + i[0] + " get" + camel(i[1]) + "() {\
+	\n\t\treturn " + i[1] + ";\n\t}\n"
+`
+}
+endsnippet
+
+snippet clc "class with constructor, with field names" b
+public class `!p
+snip.rv = snip.basename or "untitled"` {
+`!p
+args = getArgs(t[1])
+for i in args:
+	snip.rv += "\n\tprivate " + i[0] + " " + i[1]+ ";"
+if len(args) > 0:
+	snip.rv += "\n"`
+	public `!p snip.rv = snip.basename or "unknown"`($1) { `!p
+args = getArgs(t[1])
+for i in args:
+	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1]
+if len(args) == 0:
+	snip.rv += "\n"`
+	}
+}
+endsnippet
+
+snippet clc "class and constructor" b
+public class `!p
+snip.rv = snip.basename or "untitled"` {
+
+	public `!p snip.rv = snip.basename or "untitled"`($2) {
+		$0
+	}
+}
+endsnippet
+
+snippet cl "class" b
+public class ${1:`!p
+snip.rv = snip.basename or "untitled"`} {
+	$0
+}
+endsnippet
+
 snippet cos "constant string" b
-static public final String ${1:var} = "$2";$0
+public static final String ${1:var} = "$2";$0
 endsnippet
 
 snippet co "constant" b
-static public final ${1:String} ${2:var} = $3;$0
+public static final ${1:String} ${2:var} = $3;$0
 endsnippet
 
 snippet de "default" b
@@ -59,7 +173,7 @@ default:
 	$0
 endsnippet
 
-snippet eif "else if" b
+snippet elif "else if" b
 else if ($1)`!p nl(snip)`{
 	$0
 }
@@ -72,7 +186,7 @@ else`!p nl(snip)`{
 endsnippet
 
 snippet fi "final" b
-final 
+final $0
 endsnippet
 
 snippet fore "for (each)" b
@@ -81,6 +195,12 @@ for ($1 : $2)`!p nl(snip)`{
 }
 endsnippet
 
+snippet fori "for" b
+for (int ${1:i} = 0; $1 < ${2:10}; $1++)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
 snippet for "for" b
 for ($1; $2; $3)`!p nl(snip)`{
 	$0
@@ -99,7 +219,7 @@ $0
 endsnippet
 
 snippet im "import"  b
-import 
+import ${1:java}.${2:util}.$0
 endsnippet
 
 snippet in "interface" b
@@ -108,6 +228,48 @@ interface ${1:`!p snip.rv = snip.basename or "untitled"`} ${2:extends ${3:Parent
 }
 endsnippet
 
+snippet cc "constructor call or setter body"
+this.${1:var} = $1;
+endsnippet
+
+snippet list "Collections List" b
+List<${1:String}> ${2:list} = new ${3:Array}List<$1>();
+endsnippet
+
+snippet map "Collections Map" b
+Map<${1:String}, ${2:String}> ${3:map} = new ${4:Hash}Map<$1, $2>();
+endsnippet
+
+snippet set "Collections Set" b
+Set<${1:String}> ${2:set} = new ${3:Hash}Set<$1>();
+endsnippet
+
+snippet /Str?|str/ "String" br
+String $0
+endsnippet
+
+snippet cn "Constructor" b
+public `!p snip.rv = snip.basename or "untitled"`(${1:}) {
+	$0
+}
+endsnippet
+
+snippet cn "constructor, \w fields + assigments" b
+	`!p
+args = getArgs(t[1])
+for i in args:
+	snip.rv += "\n\tprivate " + i[0] + " " + i[1]+ ";"
+if len(args) > 0:
+	snip.rv += "\n"`
+public `!p snip.rv = snip.basename or "unknown"`($1) { `!p
+args = getArgs(t[1])
+for i in args:
+	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1]
+if len(args) == 0:
+	snip.rv += "\n"`
+}
+endsnippet
+
 snippet j.b "java_beans_" i
 java.beans.
 endsnippet
@@ -134,15 +296,70 @@ public static void main(String[] args)`!p nl(snip)`{
 }
 endsnippet
 
-snippet m "method" b
-${1:void} ${2:method}($3) ${4:throws $5 }{
+snippet try "try/catch" b
+try {
+	$1
+} catch(${2:Exception} ${3:e}){
+	${4:e.printStackTrace();}
+}
+endsnippet
+
+snippet mt "method throws" b
+${1:private} ${2:void} ${3:method}(${4}) ${5:throws $6 }{
+	$0
+}
+endsnippet
+
+snippet m  "method" b
+${1:private} ${2:void} ${3:method}(${4}) {
+	$0
+}
+endsnippet
+
+snippet md "Method With javadoc" b
+/**
+ * ${7:Short Description}`!p
+for i in getArgs(t[4]):
+	snip.rv += "\n\t * @param " + i[1] + " usage..."`
+ * `!p
+if "throws" in t[5]:
+	snip.rv = "\n\t * @throws " + t[6]
+else:
+	snip.rv = ""` `!p
+if not "void" in t[2]:
+	snip.rv = "\n\t * @return object"
+else:
+	snip.rv = ""`
+ **/
+${1:public} ${2:void} ${3:method}($4) ${5:throws $6 }{
 	$0
 }
+endsnippet
+
+snippet /get(ter)?/ "getter" br
+public ${1:String} get${2:Name}() {
+	return `!p snip.rv = t[2].lower()`;
+}
+endsnippet
+
+snippet /set(ter)?/ "setter" br
+public void set${1:Name}(${2:String} $1) {
+	return this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+}
+endsnippet
 
+snippet /se?tge?t|ge?tse?t|gs/ "setter and getter" br
+public void set${1:Name}(${2:String} `!p snip.rv = t[1].lower()`) {
+	this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+}
+
+public $2 get$1() {
+	return `!p snip.rv = t[1].lower()`;
+}
 endsnippet
 
 snippet pa "package" b
-package 
+package $0
 endsnippet
 
 snippet p "print" b
@@ -154,33 +371,33 @@ System.out.println($1);$0
 endsnippet
 
 snippet pr "private" b
-private 
+private $0
 endsnippet
 
 snippet po "protected" b
-protected 
+protected $0
 endsnippet
 
 snippet pu "public" b
-public 
+public $0
 endsnippet
 
 snippet re "return" b
-return 
+return $0
 endsnippet
 
 snippet st "static"
-static 
+static $0
 endsnippet
 
 snippet sw "switch" b
 switch ($1)`!p nl(snip)`{
-	$0
+	case $2: $0
 }
 endsnippet
 
 snippet sy "synchronized"
-synchronized 
+synchronized $0
 endsnippet
 
 snippet tc "test case"
@@ -190,17 +407,19 @@ public class ${1:`!p snip.rv = snip.basename or "untitled"`} extends ${2:TestCas
 endsnippet
 
 snippet t "test" b
-public void test${1:Name}() throws Exception`!p nl(snip)`{
+`!p junit(snip)`public void test${1:Name}() {
 	$0
 }
 endsnippet
 
-snippet th "throw" b
-throw $0
+snippet tt "test throws" b
+`!p junit(snip)`public void test${1:Name}() ${2:throws Exception }{
+	$0
+}
 endsnippet
 
-snippet v "variable" b
-${1:String} ${2:var}${3: = ${0:null}};
+snippet th "throw" b
+throw new $0
 endsnippet
 
 snippet wh "while" b
diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 439ec874c..f8d4790e4 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
@@ -6,19 +8,19 @@ getElement${1/(T)|.*/(?1:s)/}By${1:T}${1/(T)|(I)|.*/(?1:agName)(?2:d)/}('$2')
 endsnippet
 
 snippet '':f "object method string"
-'${1:${2:#thing}:${3:click}}': function(element){
-	$0
+'${1:${2:#thing}:${3:click}}': function(element) {
+	${VISUAL}$0
 }${10:,}
 endsnippet
 
 snippet :f "Object Method"
-${1:method_name}: function(${3:attribute}){
-	$0
+${1:method_name}: function(${3:attribute}) {
+	${VISUAL}$0
 }${10:,}
 endsnippet
 
 snippet :, "Object Value JS"
-${1:value_name}:${0:value},
+${1:value_name}: ${0:value},
 endsnippet
 
 snippet : "Object key key: 'value'"
@@ -26,47 +28,135 @@ ${1:key}: ${2:"${3:value}"}${4:, }
 endsnippet
 
 snippet proto "Prototype (proto)"
-${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) ,,{
-	${0}
-}
- 
+${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {
+	${VISUAL}$0
+};
+
 endsnippet
 
-snippet for "for (...) {...} (faster)"
-for (var ${2:i} = ${1:Things}.length - 1; $2 >= 0; $2--){
-	${3:$1[$2]}$0
+snippet for "for (...) {...} (counting up)" b
+for (var ${1:i} = 0, ${2:len} = ${3:Things.length}; $1 < $2; $1++) {
+	${VISUAL}$0
 }
 endsnippet
 
-snippet for "for (...) {...}"
-for (var ${2:i}=0; $2 < ${1:Things}.length; $2++) {
-	${3:$1[$2]}$0
+snippet ford "for (...) {...} (counting down, faster)" b
+for (var ${2:i} = ${1:Things.length} - 1; $2 >= 0; $2--) {
+	${VISUAL}$0
 }
 endsnippet
 
 snippet fun "function (fun)"
-function ${1:function_name} (${2:argument}) {
-	${0}
+function ${1:function_name}(${2:argument}) {
+	${VISUAL}$0
 }
 endsnippet
 
-# for one line if .. else you usually use a ? b : c
+snippet iife "Immediately-Invoked Function Expression (iife)"
+(function (${1:argument}) {
+	${VISUAL}$0
+}(${2:$1}));
+endsnippet
+
 snippet ife "if ___ else"
-if (${1}) {
-	${2}
-} else {
-	${3}
+if (${1:condition}) {
+	${2://code}
+}
+else {
+	${3://code}
 }
 endsnippet
 
 snippet if "if"
-if (${1}) {
-	${2}
+if (${1:condition}) {
+	${VISUAL}$0
 }
 endsnippet
 
 snippet timeout "setTimeout function"
-setTimeout(function() {$0}${2:}, ${1:10})
+setTimeout(function() {
+	${VISUAL}$0
+}${2:.bind(${3:this})}, ${1:10});
+endsnippet
+
+# Snippets for Console Debug Output
+
+snippet ca "console.assert" b
+console.assert(${1:assertion}, ${2:"${3:message}"});
+endsnippet
+
+snippet cclear "console.clear" b
+console.clear();
+endsnippet
+
+snippet cdir "console.dir" b
+console.dir(${1:object});
+endsnippet
+
+snippet cdirx "console.dirxml" b
+console.dirxml(${1:object});
+endsnippet
+
+snippet ce "console.error" b
+console.error(${1:"${2:value}"});
+endsnippet
+
+snippet cgroup "console.group" b
+console.group("${1:label}");
+${VISUAL}$0
+console.groupEnd();
+endsnippet
+
+snippet cgroupc "console.groupCollapsed" b
+console.groupCollapsed("${1:label}");
+${VISUAL}$0
+console.groupEnd();
+endsnippet
+
+snippet ci "console.info" b
+console.info(${1:"${2:value}"});
+endsnippet
+
+snippet cl "console.log" b
+console.log(${1:"${2:value}"});
+endsnippet
+
+snippet cprof "console.profile" b
+console.profile("${1:label}");
+${VISUAL}$0
+console.profileEnd();
+endsnippet
+
+snippet ctable "console.table" b
+console.table(${1:"${2:value}"});
+endsnippet
+
+snippet ctime "console.time" b
+console.time("${1:label}");
+${VISUAL}$0
+console.timeEnd("$1");
+endsnippet
+
+snippet ctimestamp "console.timeStamp" b
+console.timeStamp("${1:label}");
+endsnippet
+
+snippet ctrace "console.trace" b
+console.trace();
+endsnippet
+
+snippet cw "console.warn" b
+console.warn(${1:"${2:value}"});
+endsnippet
+
+# AMD (Asynchronous Module Definition) snippets
+
+snippet def "define an AMD module"
+define(${1:optional_name, }[${2:'jquery'}], ${3:callback});
+endsnippet
+
+snippet req "require an AMD module"
+require([${1:'dependencies'}], ${2:callback});
 endsnippet
 
 # vim:ft=snippets:
diff --git a/UltiSnips/javascript_ember.snippets b/UltiSnips/javascript_ember.snippets
index 543a26adc..1b7e7b8db 100644
--- a/UltiSnips/javascript_ember.snippets
+++ b/UltiSnips/javascript_ember.snippets
@@ -2,6 +2,8 @@
 #                        Ember snippets                           #
 ###################################################################
 
+priority -50
+
 # Application
 snippet eapp "App.Name = Ember.Application.create({});"
 ${1:App.Name} = Ember.Application.create({});
@@ -10,48 +12,48 @@ endsnippet
 # Models
 snippet emod "App.ModelName = Ember.Model.extend({...});"
 ${1:model_name} = Ember.Model.extend({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 # View
 snippet eview "App.ViewName = Ember.Model.extend({...});"
 ${1:view_name} = Ember.View.extend({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 # Controller
 snippet econtroller "App.ControllerName = Ember.Model.extend({...});"
 ${1:controller_name} = Ember.ObjectController.extend({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 # Route
 snippet eroute "App.RouteName = Ember.Route.extend({...});"
 ${1:route_name} = Ember.Route.extend({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 snippet eview "App.ViewName = Ember.Model.create({...});"
 ${1:view_name} = Ember.View.create({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 # Object
 snippet eobj "App.ObjectName = Ember.Object.extend({...});"
 ${1:object_name} = Ember.Object.create({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
 # Mixin
 snippet emix "App.MixinName = Ember.Model.extend({...});"
 ${1:view_name} = Ember.Mixin.create({
-     ${0://Properties here...}
+	${0://Properties here...}
 });
 endsnippet
 
@@ -67,13 +69,13 @@ endsnippet
 # Computer properties
 snippet cpro "property_name: function() {...}.property(),"
 ${1:property_name}: function() {
-    ${0://body...}
+	${0://body...}
 }.property('${3:argumenet}'),
 endsnippet
 
 snippet cpro ": function() {...}.property('property'),"
 ${1:property_name}: function() {
-    ${0://body...}
+	${0://body...}
 }.property(),
 endsnippet
 
@@ -81,7 +83,7 @@ endsnippet
 # Observes
 snippet proo "property_name: function() {...}.property()"
 ${1:property_name}: function() {
-    ${0://body...}
+	${0://body...}
 }.observes('${3:property}'),
 endsnippet
 
diff --git a/UltiSnips/javascript_jasmine.snippets b/UltiSnips/javascript_jasmine.snippets
index 49e38a35d..3a8729857 100644
--- a/UltiSnips/javascript_jasmine.snippets
+++ b/UltiSnips/javascript_jasmine.snippets
@@ -1,8 +1,8 @@
-#
+priority -50
+
 # JavaScript versions -- from the TextMate bundle + some additions
 # for jasmine-jquery matchers
 #
-extends javascript
 
 snippet des "Describe (js)" b
 describe('${1:description}', function() {
@@ -165,4 +165,3 @@ endsnippet
 snippet noscw "expect was not called with (js)" b
 expect(${1:target}).wasNotCalledWith(${2:arguments});
 endsnippet
-
diff --git a/UltiSnips/javascript_jsdoc.snippets b/UltiSnips/javascript_jsdoc.snippets
new file mode 100644
index 000000000..ca943fc7a
--- /dev/null
+++ b/UltiSnips/javascript_jsdoc.snippets
@@ -0,0 +1,51 @@
+priority -50
+
+# JSDoc snippets
+
+snippet /* "A JSDoc comment" b
+/**
+ * ${1:${VISUAL}}$0
+ */
+endsnippet
+
+snippet @au "@author email (First Last)"
+@author ${1:`!v g:snips_author_email`} (${2:`!v g:snips_author`})
+endsnippet
+
+snippet @li "@license Description"
+@license ${1:MIT}$0
+endsnippet
+
+snippet @ver "@version Semantic version"
+@version ${1:0.1.0}$0
+endsnippet
+
+snippet @fileo "@fileoverview Description" b
+/**
+ * @fileoverview ${1:${VISUAL:A description of the file}}$0
+ */
+endsnippet
+
+snippet @constr "@constructor"
+@constructor
+endsnippet
+
+snippet @p "@param {Type} varname Description"
+@param {${1:Type}} ${2:varname} ${3:Description}
+endsnippet
+
+snippet @ret "@return {Type} Description"
+@return {${1:Type}} ${2:Description}
+endsnippet
+
+snippet @pri "@private"
+@private
+endsnippet
+
+snippet @over "@override"
+@override
+endsnippet
+
+snippet @pro "@protected"
+@protected
+endsnippet
diff --git a/UltiSnips/jinja2.snippets b/UltiSnips/jinja2.snippets
index 6fef6edfa..ded01dcf0 100644
--- a/UltiSnips/jinja2.snippets
+++ b/UltiSnips/jinja2.snippets
@@ -1,3 +1,4 @@
+priority -50
 
 # http://jinja.pocoo.org/
 
@@ -11,7 +12,7 @@
 
 snippet block "block" b
 {% block ${1:name} %}
-    $2
+		$2
 {% endblock $1 %}
 endsnippet
 
@@ -33,7 +34,7 @@ endsnippet
 
 snippet raw "escaped block" b
 {% raw %}
-    $1
+		$1
 {% endraw %}
 endsnippet
 
@@ -60,7 +61,7 @@ endsnippet
 
 snippet filter "filter" b
 {% filter ${1:filter} %}
-    $2
+	$2
 {% endfilter %}
 endsnippet
 
@@ -78,57 +79,57 @@ endsnippet
 
 snippet for "for" b
 {% for ${1:item} in ${2:sequence} %}
-    $3
+	$3
 {% endfor %}
 endsnippet
 
 
 snippet for "for/else" b
 {% for ${1:item} in ${2:sequence} %}
-    $3
+	$3
 {% else %}
-    $4
+	$4
 {% endfor %}
 endsnippet
 
 
 snippet if "if" b
 {% if ${1:expr} %}
-    $2
+	$2
 {% endif %}
 endsnippet
 
 
 snippet if "if/else" b
 {% if ${1:expr} %}
-    $2
+	$2
 {% else %}
-    $3
+	$3
 {% endif %}
 endsnippet
 
 
 snippet if "if/elif/else" b
 {% if ${1:expr} %}
-    $2
+	$2
 {% elif %}
-    $3
+	$3
 {% else %}
-    $4
+	$4
 {% endif %}
 endsnippet
 
 
 snippet macro "macro" b
 {% macro ${1:name}(${2:args}) %}
-    $3
+	$3
 {% endmacro %}
 endsnippet
 
 
 snippet call "call" b
 {% call ${1:name}(${2:args}) %}
-    $3
+	$3
 {% endcall %}
 endsnippet
 
@@ -140,25 +141,24 @@ endsnippet
 
 snippet trans "translation" b
 {% trans %}
-    $1
+	$1
 {% endtrans %}
 endsnippet
 
 
 snippet with "with" b
 {% with %}
-    $1
+	$1
 {% endwith %}
 endsnippet
 
-
 snippet autoescape "autoescape" b
 {% autoescape ${1:true} %}
-    $2
+	$2
 {% endautoescape %}
 endsnippet
 
-# Filters 
+# Filters
 # @todo: expand only when snippet is preceeded by a |
 
 snippet batch "batch items" w
diff --git a/UltiSnips/json.snippets b/UltiSnips/json.snippets
index 81e65611d..b0cad8303 100644
--- a/UltiSnips/json.snippets
+++ b/UltiSnips/json.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 snippet s "String" b
 "${1:key}": "${0:value}",
 endsnippet
@@ -8,12 +10,11 @@ endsnippet
 
 snippet a "Array" b
 [
-   ${VISUAL}$0
+	${VISUAL}$0
 ],
 endsnippet
 snippet o "Object" b
 {
-   ${VISUAL}$0
+	${VISUAL}$0
 },
 endsnippet
-
diff --git a/UltiSnips/ledger.snippets b/UltiSnips/ledger.snippets
new file mode 100644
index 000000000..4bf46916f
--- /dev/null
+++ b/UltiSnips/ledger.snippets
@@ -0,0 +1,8 @@
+priority -50
+
+snippet t "Transaction" b
+${1:`!v strftime("%Y")`}-${2:`!v strftime("%m")`}-${3:`!v strftime("%d")`} ${4:*} ${5:Payee}
+	${6:Expenses}			\$${7:0.00}
+	${8:Assets:Checking}
+$0
+endsnippet
diff --git a/UltiSnips/lhaskell.snippets b/UltiSnips/lhaskell.snippets
new file mode 100644
index 000000000..29169a555
--- /dev/null
+++ b/UltiSnips/lhaskell.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends haskell
diff --git a/UltiSnips/lua.snippets b/UltiSnips/lua.snippets
index 1b82a245b..bc59c60cc 100644
--- a/UltiSnips/lua.snippets
+++ b/UltiSnips/lua.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 #################################
 # Snippets for the Lua language #
 #################################
@@ -8,25 +10,25 @@ endsnippet
 
 snippet !fun(ction)?! "New function" br
 function ${1:new_function}(${2:args})
-   $0
+	$0
 end
 endsnippet
 
 snippet forp "pair for loop" b
 for ${1:name},${2:val} in pairs(${3:table_name}) do
-   $0
+	$0
 end
 endsnippet
 
 snippet fori "ipair for foop" b
 for ${1:idx},${2:val} in ipairs(${3:table_name}) do
-   $0
+	$0
 end
 endsnippet
 
 snippet for "numeric for loop" b
 for ${1:i}=${2:first},${3:last}${4/^..*/(?0:,:)/}${4:step} do
-   $0
+	$0
 end
 endsnippet
 
diff --git a/UltiSnips/mako.snippets b/UltiSnips/mako.snippets
index 92a7be38a..fb31ec848 100644
--- a/UltiSnips/mako.snippets
+++ b/UltiSnips/mako.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 #################
 # From snipmate #
 #################
diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index c3189b8a1..fa708ab88 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -1,6 +1,4 @@
-###########################################################################
-#                          SNIPPETS for MARKDOWN                          #
-###########################################################################
+priority -50
 
 ###########################
 # Sections and Paragraphs #
diff --git a/UltiSnips/objc.snippets b/UltiSnips/objc.snippets
index 0c6766417..45e41fc15 100644
--- a/UltiSnips/objc.snippets
+++ b/UltiSnips/objc.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
@@ -11,11 +13,11 @@ snippet Imp "#import <> (Imp)"
 endsnippet
 
 snippet cl "020 Class (objc)"
-@interface ${1:`!p 
+@interface ${1:`!p
 if len(fn):
-   snip.rv = re.sub(r'\..*$', '', fn)
+		snip.rv = re.sub(r'\..*$', '', fn)
 else:
-   snip.rv = "object"
+		snip.rv = "object"
 `} : ${2:NSObject}
 {
 }
@@ -118,7 +120,7 @@ snippet arracc "LoD array (arracc)"
 	[${3:${1/./\l$0/}} addObject:anObject];
 }
 
-- (void)insertObject:($2)anObject in$1AtIndex:(unsigned int)i 
+- (void)insertObject:($2)anObject in$1AtIndex:(unsigned int)i
 {
 	[$3 insertObject:anObject atIndex:i];
 }
@@ -189,7 +191,7 @@ if(choice == NSAlertDefaultReturn) // "$3"
 }
 else if(choice == NSAlertAlternateReturn) // "$4"
 {
-	
+		$0
 }
 endsnippet
 
@@ -217,7 +219,7 @@ endsnippet
 snippet responds "Responds to Selector"
 if ([${1:self} respondsToSelector:@selector(${2:someSelector:})])
 {
-    [$1 ${3:${2/((:\s*$)|(:\s*))/:<>(?3: )/g}}];
+		[$1 ${3:${2/((:\s*$)|(:\s*))/:<>(?3: )/g}}];
 }
 endsnippet
 
diff --git a/UltiSnips/ocaml.snippets b/UltiSnips/ocaml.snippets
index 157eb91a3..1ebc3477f 100644
--- a/UltiSnips/ocaml.snippets
+++ b/UltiSnips/ocaml.snippets
@@ -1,20 +1,22 @@
+priority -50
+
 snippet rs "raise" b
 raise (${1:Not_found})
 endsnippet
 
 snippet open "open"
 let open ${1:module} in
-${2}
+${2:e}
 endsnippet
 
 snippet try "try"
-try ${1}
+try ${1:e}
 with ${2:Not_found} -> ${3:()}
 endsnippet
 
 snippet ref "ref"
-let ${1} = ref ${2} in
-${3}
+let ${1:name} = ref ${2:val} in
+${3:e}
 endsnippet
 
 snippet matchl "pattern match on a list"
@@ -24,83 +26,88 @@ match ${1:list} with
 endsnippet
 
 snippet matcho "pattern match on an option type"
-match ${1} with
-| Some(${2}) -> ${3:()}
+match ${1:x} with
+| Some(${2:y}) -> ${3:()}
 | None -> ${4:()}
 endsnippet
 
 snippet fun "anonymous function"
-(fun ${1} -> ${2})
+(fun ${1:x} -> ${2:x})
 endsnippet
 
 snippet cc "commment"
-(* ${1} *)
+(* ${1:comment} *)
 endsnippet
 
 snippet let "let .. in binding"
-let ${1} = ${2} in
-${3}
+let ${1:x} = ${2:v} in
+${3:e}
 endsnippet
 
 snippet lr "let rec"
-let rec ${1} =
-  ${2}
+let rec ${1:f} =
+	${2:expr}
 endsnippet
 
-snippet ife "if"
-if ${1} then
-  ${2}
+snippet if "if"
+if ${1:(* condition *)} then
+	${2:(* A *)}
 else
-  ${3}
+	${3:(* B *)}
 endsnippet
 
-snippet if "If"
-if ${1} then
-  ${2}
+snippet If "If"
+if ${1:(* condition *)} then
+	${2:(* A *)}
 endsnippet
 
-snippet wh "while"
-while ${1} do
-  ${2}
+snippet while "while"
+while ${1:(* condition *)} do
+	${2:(* A *)}
 done
 endsnippet
 
 snippet for "for"
 for ${1:i} = ${2:1} to ${3:10} do
-  ${4}
+	${4:(* BODY *)}
 done
 endsnippet
 
 snippet match "match"
-match ${1} with
-| ${2} -> ${3}
+match ${1:(* e1 *)} with
+| ${2:p} -> ${3:e2}
+endsnippet
+
+snippet Match "match"
+match ${1:(* e1 *)} with
+| ${2:p} -> ${3:e2}
 endsnippet
 
 snippet class "class"
 class ${1:name} = object
-  ${2}
+	${2:methods}
 end
 endsnippet
 
 snippet obj "obj"
 object
-  ${2}
+	${2:methods}
 end
 endsnippet
 
 snippet Obj "object"
 object (self)
-  ${2}
+	${2:methods}
 end
 endsnippet
 
 snippet {{ "object functional update"
-{< ${1} = ${2} >}
+{< ${1:x} = ${2:y} >}
 endsnippet
 
 snippet beg "beg"
 begin
-  ${1}${VISUAL}
+	${1:block}
 end
 endsnippet
 
@@ -110,19 +117,19 @@ endsnippet
 
 snippet mod "module - no signature"
 module ${1:(* Name *)} = struct
-  ${2}
+	${2:(* BODY *)}
 end
 endsnippet
 
 snippet Mod "module with signature"
 module ${1:(* Name *)} : ${2:(* SIG *)} = struct
-  ${3}
+	${3:(* BODY *)}
 end
 endsnippet
 
 snippet sig "anonymous signature"
 sig
-  ${2}
+	${2:(* BODY *)}
 end
 endsnippet
 
@@ -132,36 +139,36 @@ endsnippet
 
 snippet func "define functor - no signature"
 module ${1:M} (${2:Arg} : ${3:ARG}) = struct
-  ${4}
+	${4:(* BODY *)}
 end
 endsnippet
 
 snippet Func "define functor - with signature"
 module ${1:M} (${2:Arg} : ${3:ARG}) : ${4:SIG} = struct
-  ${5}
+	${5:(* BODY *)}
 end
 endsnippet
 
 snippet mot "Declare module signature"
 module type ${1:(* Name *)} = sig
-  ${2}
+	${2:(* BODY *)}
 end
 endsnippet
 
 snippet module "Module with anonymous signature"
 module ${1:(* Name *)} : sig
-  ${2}
+	${2:(* SIGNATURE *)}
 end = struct
-  ${3}
+	${3:(* BODY *)}
 end
 endsnippet
 
 snippet oo "odoc"
-(** ${1} *)
+(** ${1:odoc} *)
 endsnippet
 
 snippet qt "inline qtest"
 (*$T ${1:name}
-   ${2:test}
+	${2:test}
 *)
 endsnippet
diff --git a/UltiSnips/perl.snippets b/UltiSnips/perl.snippets
index e183b115e..abaae3f5a 100644
--- a/UltiSnips/perl.snippets
+++ b/UltiSnips/perl.snippets
@@ -1,10 +1,13 @@
+priority -50
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
 snippet ife "Conditional if..else (ife)"
 if ($1) {
 	${2:# body...}
-} else {
+}
+else {
 	${3:# else...}
 }
 
@@ -13,9 +16,11 @@ endsnippet
 snippet ifee "Conditional if..elsif..else (ifee)"
 if ($1) {
 	${2:# body...}
-} elsif ($3) {
+}
+elsif ($3) {
 	${4:# elsif...}
-} else {
+}
+else {
 	${5:# else...}
 }
 
@@ -49,7 +54,7 @@ ${1:expression} while ${2:condition};
 endsnippet
 
 snippet test "Test"
-#!/usr/bin/perl -w
+#!/usr/bin/env perl -w
 
 use strict;
 use Test::More tests => ${1:1};
@@ -62,7 +67,7 @@ endsnippet
 snippet class "class"
 package ${1:ClassName};
 
-${2:use base qw(${3:ParentClass});}${2/.+/\n\n/}sub new {
+${2:use parent qw(${3:ParentClass});}${2/.+/\n\n/}sub new {
 	my $class = shift;
 	$class = ref $class if ref $class;
 	my $self = bless {}, $class;
@@ -74,11 +79,12 @@ ${2:use base qw(${3:ParentClass});}${2/.+/\n\n/}sub new {
 endsnippet
 
 snippet eval "eval"
+local $@;
 eval {
 	${1:# do something risky...}
 };
-if ($@) {
-	${2:# handle failure...}
+if (my $${2:exception} = $@) {
+	${3:# handle failure...}
 }
 
 endsnippet
@@ -105,8 +111,7 @@ if ($1) {
 endsnippet
 
 snippet slurp "slurp"
-my $${1:var};
-{ local $/ = undef; local *FILE; open FILE, "<${2:file}"; $$1 = <FILE>; close FILE }
+my $${1:var} = do { local $/ = undef; open my $fh, '<', ${2:$file}; <$fh> };
 
 endsnippet
 
@@ -117,7 +122,7 @@ unless ($1) {
 
 endsnippet
 
-snippet wh "while"
+snippet while "while"
 while ($1) {
 	${2:# body...}
 }
diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index b7d016702..24f6cc527 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -1,108 +1,264 @@
-snippet <? "php open tag" b
-<?php
+priority -50
 
+## Snippets from SnipMate, taken from
+## https://github.com/scrooloose/snipmate-snippets.git
 
+snippet array "array"
+$${1:arrayName} = array('${2}' => ${3});${4}
 endsnippet
 
-snippet vdd "php var_dump and die"
-var_dump(${1}); die();
+snippet def "def"
+define('${1}'${2});${3}
 endsnippet
 
-snippet ns "php namespace" b
-namespace ${1:`!p 
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
-if m:
-	snip.rv = m.group().replace('/', '\\')
-`};
-
+snippet do "do"
+do {
+	${2:// code... }
+} while (${1:/* condition */});"
 endsnippet
 
-snippet nc "php namespace and class or interface" b
-namespace ${1:`!p 
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
-if m:
-	snip.rv = m.group().replace('/', '\\')
-`};
+snippet doc_f "doc_f"
+/**
+ * $2
+ * @return ${4:void}
+ * @author ${5:`!v g:snips_author`}
+ **/
+${1:public }function ${2:someFunc}(${3})
+{${6}
+}
+endsnippet
 
+snippet doc_i "doc_i"
 /**
- * ${3:@author `whoami`}${4}
+ * $1
+ * @package ${2:default}
+ * @author ${3:`!v g:snips_author`}
+ **/
+interface ${1:someClass}
+{${4}
+} // END interface $1"
+endsnippet
+
+snippet else "else"
+else {
+	${1:// code...}
+}
+endsnippet
+
+snippet for "for"
+for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
+	${4:// code...}
+}
+endsnippet
+
+snippet foreachk "foreachk"
+foreach ($${1:variable} as $${2:key} => $${3:value}){
+	${4:// code...}
+}
+endsnippet
+
+snippet get "get"
+$_GET['${1}']${2}
+endsnippet
+
+snippet if "if"
+if (${1:/* condition */}) {
+	${2:// code...}
+}
+endsnippet
+
+snippet inc "inc"
+include '${1:file}';${2}
+endsnippet
+
+snippet log "log"
+error_log(var_export(${1}, true));${2}
+endsnippet
+
+snippet post "post"
+$_POST['${1}']${2}
+endsnippet
+
+snippet req1 "req1"
+require_once '${1:file}';${2}
+endsnippet
+
+snippet session "session"
+$_SESSION['${1}']${2}
+endsnippet
+
+snippet t "t"
+$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};${5}
+endsnippet
+
+snippet var "var"
+var_export(${1});${2}
+endsnippet
+
+snippet getter "PHP Class Getter" b
+/*
+ * Getter for $1
  */
-`!p
-m = re.search(r'Abstract', path)
-if m:
-	snip.rv = 'abstract '
-``!p
-if re.search(r'Interface', path):
-	snip.rv = 'interface'
-elif re.search(r'Trait', path):
-	snip.rv = 'trait'
-else:
-	snip.rv = 'class'
-` ${2:`!p
-snip.rv = re.match(r'.*(?=\.)', fn).group()
-`}
+public function get${1/\w+\s*/\u$0/}()
 {
+	return $this->$1;$2
 }
+$4
 endsnippet
 
-snippet st "php static function" b
-${1:public} static function $2($3)
+snippet setter "PHP Class Setter" b
+/*
+ * Setter for $1
+ */
+public function set${1/\w+\s*/\u$0/}($$1)
 {
-	${4}
+	$this->$1 = $$1;$3
+	${4:return $this;}
 }
+$0
 endsnippet
 
-snippet __ "php constructor" b
-${1:public} function __construct($2)
+snippet gs "PHP Class Getter Setter" b
+/*
+ * Getter for ${1/(\w+)\s*;/$1/}
+ */
+public function get${1/(\w+)\s*;/\u$1/}()
 {
-	${3}
+	return $this->${1/(\w+)\s*;/$1/};$2
 }
-endsnippet
 
-snippet sg "Setter and Getter" b
-/**
- * @var ${3:`!p snip.rv = t[2][0:1].upper() + t[2][1:]`}
- * 
- * ${4}
+/*
+ * Setter for ${1/(\w+)\s*;/$1/}
  */
-${1:protected} $${2};
-
-public function set`!p snip.rv = t[2][0:1].upper() + t[2][1:]`(`!p
-if re.match(r'^(\\|[A-Z]).*', t[3]):
-	snip.rv = t[3] + ' '
-else:
-	snip.rv = ''
-`$$2)
+public function set${1/(\w+)\s*;/\u$1/}($${1/(\w+)\s*;/$1/})
+{
+	$this->${1/(\w+)\s*;/$1/} = $${1/(\w+)\s*;/$1/};$3
+	${4:return $this;}
+}
+$0
+endsnippet
+
+snippet pub "Public function" b
+public function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pro "Protected function" b
+protected function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pri "Private function" b
+private function ${1:name}(${2:$param})
 {
-	$this->$2 = $$2;
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pubs "Public static function" b
+public static function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet pros "Protected static function" b
+protected static function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
 
-	return $this;
+snippet pris "Private static function" b
+private static function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
 }
+$0
+endsnippet
 
-public function get`!p snip.rv = t[2][0:1].upper() + t[2][1:]`()
+snippet fu "Function snip" b
+function ${1:name}(${2:$param})
 {
-	return $this->$2;
+	${VISUAL}${3:return null;}
 }
+$0
 endsnippet
 
-snippet if "php if" !b
-if (${1}) {
-	${2}
+snippet fore "Foreach loop"
+foreach ($${1:variable} as $${3:value}){
+	${VISUAL}${4}
 }
+$0
 endsnippet
 
-snippet ife "php ife" !b
-if (${1}) {
-	${2}
+snippet new "New class instance" b
+$$1 = new $1($2);
+$0
+endsnippet
+
+snippet ife "if else"
+if (${1:/* condition */}) {
+	${2:// code...}
 } else {
+	${3:// code...}
+}
+$0
+endsnippet
 
+snippet class "Class declaration template" b
+/**
+ * Class ${1:`!p snip.rv=snip.fn.split('.')[0]`}
+ * @author ${2:`!v g:snips_author`}
+ */
+class $1
+{
+	public function ${3:__construct}(${4:$options})
+	{
+		${4:// code}
+	}
 }
+$0
 endsnippet
 
-snippet /** "php comment block" b
+snippet construct "__construct()" b
 /**
- * @${1}
+ * @param $2mixed ${1/, /\n     * \@param mixed /g}
  */
+public function __construct(${1:$dependencies})
+{${1/\$(\w+)(, )*/\n        $this->$1 = $$1;/g}
+}
+$0
 endsnippet
+
+snippet pr "Dumb debug helper in HTML"
+echo '<pre>' . var_export($1, 1) . '</pre>';$0
+endsnippet
+
+snippet pc "Dumb debug helper in cli"
+var_export($1);$0
+endsnippet
+
+# Symfony 2 based snippets
+snippet sfa "Symfony 2 Controller action"
+/**
+* @Route("/${1:route_name}", name="$1")
+* @Template()
+*/
+public function $1Action($2)
+{
+	$3
+	return ${4:array();}$0
+}
+endsnippet
+
+# :vim:ft=snippets:
diff --git a/UltiSnips/php/phpunit.snippets b/UltiSnips/php_phpunit.snippets
similarity index 90%
rename from UltiSnips/php/phpunit.snippets
rename to UltiSnips/php_phpunit.snippets
index 6609f3fa6..1a310a191 100644
--- a/UltiSnips/php/phpunit.snippets
+++ b/UltiSnips/php_phpunit.snippets
@@ -1,7 +1,9 @@
-# sugguestion? report bugs? 
+# suggestion? report bugs?
 # please go to https://github.com/chrisyue/vim-snippets/issues
+priority -50
+
 snippet test "phpunit test class" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
diff --git a/UltiSnips/php/symfony2.snippets b/UltiSnips/php_symfony2.snippets
similarity index 94%
rename from UltiSnips/php/symfony2.snippets
rename to UltiSnips/php_symfony2.snippets
index 77f923f64..3d433169d 100644
--- a/UltiSnips/php/symfony2.snippets
+++ b/UltiSnips/php_symfony2.snippets
@@ -1,8 +1,10 @@
-# sugguestion? report bugs? 
+# sugguestion? report bugs?
 # go to https://github.com/chrisyue/vim-snippets/issues
 
+priority -50
+
 snippet contr "Symfony2 controller" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -52,7 +54,7 @@ abspath = os.path.abspath(path)`
 endsnippet
 
 snippet comm "Symfony2 command" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -89,7 +91,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet subs "Symfony2 subscriber" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -120,7 +122,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet transf "Symfony2 form data transformer" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -154,7 +156,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet ent "Symfony2 doctrine entity" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -167,7 +169,7 @@ use Doctrine\ORM\Mapping as ORM;
  * ${3:@author `whoami`}
  *
  * @ORM\Entity()
- * @ORM\Table(name="`!p 
+ * @ORM\Table(name="`!p
 tmp = re.match(r'.*(?=\.)', fn).group()
 tmp = re.sub(r'\B([A-Z])', r'_\1', tmp)
 snip.rv = tmp.lower()
@@ -191,7 +193,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet form "Symfony2 form type" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
@@ -209,33 +211,33 @@ class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
 ` extends AbstractType
 {
-	/** 
-     * {@inheritDoc}
+	/**
+	 * {@inheritDoc}
 	 */
 	public function buildForm(FormBuilderInterface $builder, array $options)
-	{   
+	{
 	}
 
-	/** 
-     * {@inheritDoc}
+	/**
+	 * {@inheritDoc}
 	 */
 	public function setDefaultOptions(OptionsResolverInterface $resolver)
-	{   
-	    $resolver->setDefaults(); 
-	} 
+	{
+		$resolver->setDefaults();
+	}
 
-	/** 
-     * {@inheritDoc}
+	/**
+	 * {@inheritDoc}
 	 */
 	public function getName()
-	{   
+	{
 		return '${1}';
 	}
 }
 endsnippet
 
 snippet ev "Symfony2 event" b
-namespace `!p 
+namespace `!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
diff --git a/UltiSnips/puppet.snippets b/UltiSnips/puppet.snippets
index 68ae0fe44..a8fc1ed8d 100644
--- a/UltiSnips/puppet.snippets
+++ b/UltiSnips/puppet.snippets
@@ -1,78 +1,232 @@
-# Snippets for Puppet
+priority -50
 
-snippet /^class/ "Class declaration" r
-class ${1:name} {
-    ${0:# body}
+#########################################################################
+#  Python helper code                                                   #
+#########################################################################
+
+global !p
+import vim
+import os.path
+def get_module_namespace_and_basename():
+	"""This function will try to guess the current class or define name you are
+	trying to create. Note that for this to work you should be using the module
+	structure as per the style guide. Examples inputs and it's output
+	* /home/nikolavp/puppet/modules/collectd/manifests/init.pp -> collectd
+	* /home/nikolavp/puppet/modules/collectd/manfistes/mysql.pp -> collectd::mysql
+	"""
+	first_time = True
+	current_file_path_without_ext = vim.eval('expand("%:p:r")') or ""
+	if not current_file_path_without_ext:
+		return "name"
+	parts = os.path.split(current_file_path_without_ext)
+	namespace = ''
+	while parts[0] and parts[0] != '/':
+		if parts[1] == 'init' and first_time and not namespace:
+			first_time = False
+			parts = os.path.split(parts[0])
+			continue
+		if parts[1] == 'manifests':
+			return os.path.split(parts[0])[1] + ('::' + namespace).rstrip(':')
+		else:
+			namespace = parts[1] + '::' + namespace
+		parts = os.path.split(parts[0])
+	# couldn't guess the namespace. The user is editing a raw file in no module like the site.pp file
+	return "name"
+endglobal
+
+###############################################################################
+#  Puppet Language Constructs                                                 #
+#    See http://docs.puppetlabs.com/puppet/latest/reference/lang_summary.html #
+###############################################################################
+
+snippet class "Class declaration" b
+class ${1:`!p snip.rv = get_module_namespace_and_basename()`} {
+	${0:# body}
 }
 endsnippet
 
-snippet File "Defaults for file" b
-File {
-    owner => ${1:username},
-    group => ${2:groupname},
+snippet define "Definition" b
+define ${1:`!p snip.rv = get_module_namespace_and_basename()`} {
+	${0:# body}
 }
 endsnippet
 
-# Resource types
-snippet package "Package resource type" b
-package { "${1:name}":
-    ensure => ${2:installed},
+#################################################################
+#  Puppet Types                                                 #
+#    See http://docs.puppetlabs.com/references/latest/type.html #
+#################################################################
+
+snippet cron "Cron resource type" b
+cron { '${1:name}':
+	user    => ${2:user},
+	command => '${3:command}',
+	minute  => ${3:minute},
+	hour    => ${4:hour},
+}
+endsnippet
+
+snippet exec "Exec resource type" b
+exec { '${1:command}':
+	refreshonly => true,
 }
 endsnippet
 
 snippet file "File resource type" b
-file { "${1:name}":
-    source => "puppet://${2:path}",
-    mode   => ${3:mode},
+file { '${1:name}':
+	source => "puppet://${2:path}",
+	mode   => ${3:mode},
 endsnippet
 
-snippet group "Group resource type" b
-group { "${1:groupname}":
-    ensure => ${3:present},
-    gid    => ${2:gid},
+snippet File "Defaults for file" b
+File {
+	owner => ${1:username},
+	group => ${2:groupname},
+}
 endsnippet
 
-snippet user "user resource type" b
-group { "${1:username}":
-    ensure     => ${2:present},
-    uid        => ${3:uid},
-    gid        => ${4:gid},
-    comment    => ${5:gecos},
-    home       => ${6:homedirectory},
-    managehome => false,
-    require    => Group["${7:group"],
+snippet group "Group resource type" b
+group { '${1:groupname}':
+	ensure => ${3:present},
+	gid    => ${2:gid},
 endsnippet
 
-snippet exec "Exec resource type" b
-exec { "${1:command}":
-    refreshonly => true,
+snippet mount "Mount resource type" b
+mount { '${1:path}':
+	device  => '${2:/dev}',
+	fstype  => '${3:filesystem}',
+	ensure  => mounted,
+	options => 'rw,errors=remount-ro',
 }
 endsnippet
 
-snippet cron "Cron resource type" b
-cron { "${1:name}":
-    user    => ${2:user},
-    command => "${3:command}",
-    minute  => ${3:minute},
-    hour    => ${4:hour},
+snippet package "Package resource type" b
+package { '${1:name}':
+	ensure => ${2:installed},
 }
 endsnippet
 
-snippet mount "Mount resource type" b
-mount { "${1:path}":
-    device  => "${2:/dev}",
-    fstype  => "${3:filesystem}",
-    ensure  => mounted,
-    options => "rw,errors=remount-ro",
-}
+snippet user "user resource type" b
+user { '${1:username}':
+	ensure     => ${2:present},
+	uid        => ${3:uid},
+	gid        => ${4:gid},
+	comment    => ${5:gecos},
+	home       => ${6:homedirectory},
+	managehome => false,
+	require    => Group['${7:group'}],
 endsnippet
 
 snippet service "Service resource type" b
-service { "${1:name}":
-    hasstatus => true,
-    enable    => true,
-    ensure    => running,
+service { '${1:name}':
+	hasstatus => true,
+	enable    => true,
+	ensure    => running,
 }
 endsnippet
 
+########################################################################
+#  Puppet Functions                                                    #
+#    See http://docs.puppetlabs.com/references/latest/function.html    #
+########################################################################
+
+snippet alert "Alert Function" b
+alert("${1:message}")${0}
+endsnippet
+
+snippet crit "Crit Function" b
+crit("${1:message}")${0}
+endsnippet
+
+snippet debug "Debug Function" b
+debug("${1:message}")${0}
+endsnippet
+
+snippet defined "Defined Function" b
+defined(${1:Resource}["${2:name}"])${0}
+endsnippet
+
+snippet emerg "Emerg Function" b
+emerg("${1:message}")${0}
+endsnippet
+
+snippet extlookup "Simple Extlookup" b
+$${1:Variable} = extlookup("${2:Lookup}")${0}
+endsnippet
+
+snippet extlookup "Extlookup with defaults" b
+$${1:Variable} = extlookup("${2:Lookup}", ${3:Default})${0}
+endsnippet
+
+snippet extlookup "Extlookup with defaults and custom data file" b
+$${1:Variable} = extlookup("${2:Lookup}", ${3:Default}, ${4:Data Source})${0}
+endsnippet
+
+snippet fail "Fail Function" b
+fail("${1:message}")${0}
+endsnippet
+
+snippet hiera "Hiera Function" b
+$${1:Variable} = hiera("${2:Lookup}")${0}
+endsnippet
+
+snippet hiera "Hiera with defaults" b
+$${1:Variable} = hiera("${2:Lookup}", ${3:Default})${0}
+endsnippet
+
+snippet hiera "Hiera with defaults and override" b
+$${1:Variable} = hiera("${2:Lookup}", ${3:Default}, ${4:Override})${0}
+endsnippet
+
+snippet hiera_hash "Hiera Hash Function" b
+$${1:Variable} = hiera_hash("${2:Lookup}")${0}
+endsnippet
+
+snippet hiera_hash "Hiera Hash with defaults" b
+$${1:Variable} = hiera_hash("${2:Lookup}", ${3:Default})${0}
+endsnippet
+
+snippet hiera_hash "Hiera Hash with defaults and override" b
+$${1:Variable} = hiera_hash("${2:Lookup}", ${3:Default}, ${4:Override})${0}
+endsnippet
+
+snippet hiera_include "Hiera Include Function" b
+hiera_include("${1:Lookup}")${0}
+endsnippet
+
+snippet include "Include Function" b
+include ${1:classname}${0}
+endsnippet
+
+snippet info "Info Function" b
+info("${1:message}")${0}
+endsnippet
+
+snippet inline_template "Inline Template Function" b
+inline_template("<%= ${1:template} %>")${0}
+endsnippet
+
+snippet notice "Notice Function" b
+notice("${1:message}")${0}
+endsnippet
+
+snippet realize "Realize Function" b
+realize(${1:Resource}["${2:name}"])${0}
+endsnippet
+
+snippet regsubst "Regsubst Function" b
+regsubst($${1:Target}, '${2:regexp}', '${3:replacement}')${0}
+endsnippet
+
+snippet split "Split Function" b
+$${1:Variable} = split($${1:Target}, '${2:regexp}')${0}
+endsnippet
+
+snippet versioncmp "Version Compare Function" b
+$${1:Variable} = versioncmp('${1:version}', '${2:version}')${0}
+endsnippet
+
+snippet warning "Warning Function" b
+warning("${1:message}")${0}
+endsnippet
+
 # vim:ft=snippets:
diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index a770d2a98..357d01d3b 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ###########################################################################
 #                            TEXTMATE SNIPPETS                            #
 ###########################################################################
@@ -14,6 +16,10 @@ if __name__ == '__main__':
 	${1:main()}$0
 endsnippet
 
+snippet for "for loop" b
+for ${1:item} in ${2:iterable}:
+	${3:pass}
+endsnippet
 
 ##########
 # COMMON #
@@ -29,67 +35,81 @@ NORMAL  = 0x1
 DOXYGEN = 0x2
 SPHINX  = 0x3
 
+SINGLE_QUOTES = 0x1
+DOUBLE_QUOTES = 0x2
+
 def get_args(arglist):
-    args = [arg.split('=')[0].strip() for arg in arglist.split(',') if arg]
-    args = [arg for arg in args if arg and arg != "self"]
+	args = [arg.split('=')[0].strip() for arg in arglist.split(',') if arg]
+	args = [arg for arg in args if arg and arg != "self"]
 
-    return args
+	return args
 
 
+def get_quoting_style(snip):
+	style = snip.opt("g:ultisnips_python_quoting_style", "double")
+	if style == 'single':
+		return SINGLE_QUOTES
+	return DOUBLE_QUOTES
+
+def tripple_quotes(snip):
+	if get_quoting_style(snip) == SINGLE_QUOTES:
+		return "'''"
+	return '"""'
+
 def get_style(snip):
-    style = snip.opt("g:ultisnips_python_style", "normal")
+	style = snip.opt("g:ultisnips_python_style", "normal")
 
-    if    style == "doxygen": return DOXYGEN
-    elif  style == "sphinx": return SPHINX
-    else: return NORMAL
+	if    style == "doxygen": return DOXYGEN
+	elif  style == "sphinx": return SPHINX
+	else: return NORMAL
 
 
 def format_arg(arg, style):
-    if style == DOXYGEN:
-        return "@param %s @todo" % arg
-    elif style == SPHINX:
-        return ":param %s: @todo" % arg
-    elif style == NORMAL:
-        return ":%s: @todo" % arg
+	if style == DOXYGEN:
+		return "@param %s @todo" % arg
+	elif style == SPHINX:
+		return ":param %s: @todo" % arg
+	elif style == NORMAL:
+		return ":%s: @todo" % arg
 
 
 def format_return(style):
-    if style == DOXYGEN:
-        return "@return: @todo"
-    elif style in (NORMAL, SPHINX):
-        return ":returns: @todo"
+	if style == DOXYGEN:
+		return "@return: @todo"
+	elif style in (NORMAL, SPHINX):
+		return ":returns: @todo"
 
 
 def write_docstring_args(args, snip):
-    if not args:
-        snip.rv += ' """'
-        return
+	if not args:
+		snip.rv += ' {0}'.format(tripple_quotes(snip))
+		return
 
-    snip.rv += '\n' + snip.mkline('', indent='')
+	snip.rv += '\n' + snip.mkline('', indent='')
 
-    style = get_style(snip)
+	style = get_style(snip)
 
-    for arg in args:
-        snip += format_arg(arg, style)
+	for arg in args:
+		snip += format_arg(arg, style)
 
 
 def write_init_body(args, parents, snip):
-    parents = [p.strip() for p in parents.split(",")]
-    parents = [p for p in parents if p != 'object']
+	parents = [p.strip() for p in parents.split(",")]
+	parents = [p for p in parents if p != 'object']
 
-    for p in parents:
-        snip += p + ".__init__(self)"
+	for p in parents:
+		snip += p + ".__init__(self)"
 
-    if parents:
-        snip.rv += '\n' + snip.mkline('', indent='')
+	if parents:
+		snip.rv += '\n' + snip.mkline('', indent='')
 
-    for arg in args:
-        snip += "self._%s = %s" % (arg, arg)
+	for arg in args:
+		snip += "self._%s = %s" % (arg, arg)
 
 
 def write_slots_args(args, snip):
-    args = ['"%s"' % arg for arg in args]
-    snip += '__slots__ = (%s,)' % ', '.join(args)
+	args = ['"_%s"' % arg for arg in args]
+	snip += '__slots__ = (%s,)' % ', '.join(args)
 
 endglobal
 
@@ -99,10 +119,11 @@ endglobal
 
 snippet class "class with docstrings" b
 class ${1:MyClass}(${2:object}):
-	"""${3:Docstring for $1 }"""
+
+	`!p snip.rv = tripple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = tripple_quotes(snip)`
 
 	def __init__(self$4):
-		"""${5:@todo: to be defined}`!p
+		`!p snip.rv = tripple_quotes(snip)`${5:@todo: to be defined1.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -110,8 +131,8 @@ args = get_args(t[4])
 
 write_docstring_args(args, snip)
 if args:
-    snip.rv += '\n' + snip.mkline('', indent='')
-    snip += '"""'
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += '{0}'.format(tripple_quotes(snip))
 
 write_init_body(args, t[2], snip)
 `
@@ -121,7 +142,8 @@ endsnippet
 
 snippet slotclass "class with slots and docstrings" b
 class ${1:MyClass}(${2:object}):
-	"""${3:Docstring for $1 }"""
+
+	`!p snip.rv = tripple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = tripple_quotes(snip)`
 `!p
 snip >> 1
 args = get_args(t[4])
@@ -129,7 +151,7 @@ write_slots_args(args, snip)
 `
 
 	def __init__(self$4):
-		"""${5:@todo: to be defined}`!p
+		`!p snip.rv = tripple_quotes(snip)`${5:@todo: to be defined.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -137,8 +159,8 @@ args = get_args(t[4])
 
 write_docstring_args(args, snip)
 if args:
-    snip.rv += '\n' + snip.mkline('', indent='')
-    snip += '"""'
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += tripple_quotes(snip)
 
 write_init_body(args, t[2], snip)
 `
@@ -330,19 +352,19 @@ endsnippet
 snippet def "function with docstrings" b
 def ${1:function}(`!p
 if snip.indent:
-   snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
-	"""${4:@todo: Docstring for $1}`!p
+	snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
+	`!p snip.rv = tripple_quotes(snip)`${4:@todo: Docstring for $1.}`!p
 snip.rv = ""
 snip >> 1
 
 args = get_args(t[2])
 if args:
-   write_docstring_args(args, snip)
+	write_docstring_args(args, snip)
 
 style = get_style(snip)
 snip += format_return(style)
 snip.rv += '\n' + snip.mkline('', indent='')
-snip += '"""' `
+snip += tripple_quotes(snip) `
 	${0:pass}
 endsnippet
 
@@ -362,23 +384,57 @@ endsnippet
 ##############
 snippet roprop "Read Only Property" b
 @property
-def ${1:property}(self):
+def ${1:name}(self):
 	${2:return self._$1}$0
 endsnippet
 
 snippet rwprop "Read write property" b
-def ${1:property}():
-	${2/.+/(?0:""")/}${2:The RW property $1}`!p if t[2]:
-   snip.rv += '"""'
-   snip >> 1
-   snip += ""
+def ${1:name}():
+	`!p snip.rv = tripple_quotes(snip) if t[2] else ''
+`${2:@todo: Docstring for $1.}`!p
+if t[2]:
+	snip >> 1
+
+	style = get_style(snip)
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += format_return(style)
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += tripple_quotes(snip)
 else:
-   snip.rv = ""`def fget(self):
+	snip.rv = ""`
+	def fget(self):
 		return self._$1$0
+
 	def fset(self, value):
 		self._$1 = value
 	return locals()
-$1 = property(**$1())
+
+$1 = property(**$1(), doc=$1.__doc__)
+endsnippet
+
+
+####################
+# If / Else / Elif #
+####################
+snippet if "If" b
+if ${1:condition}:
+	${2:pass}
+endsnippet
+
+snippet ife "If / Else" b
+if ${1:condition}:
+	${2:pass}
+else:
+	${3:pass}
+endsnippet
+
+snippet ifee "If / Elif / Else" b
+if ${1:condition}:
+	${2:pass}
+elif ${3:condition}:
+	${4:pass}
+else:
+	${5:pass}
 endsnippet
 
 
@@ -430,6 +486,14 @@ snippet pdb "Set PDB breakpoint" b
 import pdb; pdb.set_trace()
 endsnippet
 
+snippet ipdb "Set IPDB breakpoint" b
+import ipdb; ipdb.set_trace()
+endsnippet
+
+snippet pudb "Set PUDB breakpoint" b
+import pudb; pudb.set_trace()
+endsnippet
+
 snippet ae "Assert equal" b
 self.assertEqual(${1:first},${2:second})
 endsnippet
@@ -453,7 +517,8 @@ endsnippet
 
 snippet testcase "pyunit testcase" b
 class Test${1:Class}(${2:unittest.TestCase}):
-	"""${3:Test case docstring}"""
+
+	`!p snip.rv = tripple_quotes(snip)`${3:Test case docstring.}`!p snip.rv = tripple_quotes(snip)`
 
 	def setUp(self):
 		${4:pass}
diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index 9e0e29f88..5c5217958 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -1,6 +1,4 @@
-###########################################################################
-#                    GENERATED FROM get_tm_snippets.py                    #
-###########################################################################
+priority -50
 
 snippet anaf "accepts_nested_attributes_for"
 accepts_nested_attributes_for :${1:association_name}${2:${3:, :allow_destroy => true}${4:, :reject_if => proc \{ |obj| ${5:obj.blank?} \}}}
@@ -77,90 +75,90 @@ endsnippet
 
 snippet resources "Create resources controller class"
 class ${1:Model}sController < ApplicationController
-  before_filter :find_${1/./\l$0/}, :only => [:show, :edit, :update, :destroy]
-
-  # GET /${1/./\l$0/}s
-  # GET /${1/./\l$0/}s.xml
-  def index
-    @${1/./\l$0/}s = ${1:Model}.all
-
-    respond_to do |wants|
-      wants.html # index.html.erb
-      wants.xml  { render :xml => @${1/./\l$0/}s }
-    end
-  end
-
-  # GET /${1/./\l$0/}s/1
-  # GET /${1/./\l$0/}s/1.xml
-  def show
-    respond_to do |wants|
-      wants.html # show.html.erb
-      wants.xml  { render :xml => @${1/./\l$0/} }
-    end
-  end
-
-  # GET /${1/./\l$0/}s/new
-  # GET /${1/./\l$0/}s/new.xml
-  def new
-    @${1/./\l$0/} = ${1:Model}.new
-
-    respond_to do |wants|
-      wants.html # new.html.erb
-      wants.xml  { render :xml => @${1/./\l$0/} }
-    end
-  end
-
-  # GET /${1/./\l$0/}s/1/edit
-  def edit
-  end
-
-  # POST /${1/./\l$0/}s
-  # POST /${1/./\l$0/}s.xml
-  def create
-    @${1/./\l$0/} = ${1:Model}.new(params[:${1/./\l$0/}])
-
-    respond_to do |wants|
-      if @${1/./\l$0/}.save
-        flash[:notice] = '${1:Model} was successfully created.'
-        wants.html { redirect_to(@${1/./\l$0/}) }
-        wants.xml  { render :xml => @${1/./\l$0/}, :status => :created, :location => @${1/./\l$0/} }
-      else
-        wants.html { render :action => "new" }
-        wants.xml  { render :xml => @${1/./\l$0/}.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /${1/./\l$0/}s/1
-  # PUT /${1/./\l$0/}s/1.xml
-  def update
-    respond_to do |wants|
-      if @${1/./\l$0/}.update_attributes(params[:${1/./\l$0/}])
-        flash[:notice] = '${1:Model} was successfully updated.'
-        wants.html { redirect_to(@${1/./\l$0/}) }
-        wants.xml  { head :ok }
-      else
-        wants.html { render :action => "edit" }
-        wants.xml  { render :xml => @${1/./\l$0/}.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /${1/./\l$0/}s/1
-  # DELETE /${1/./\l$0/}s/1.xml
-  def destroy
-    @${1/./\l$0/}.destroy
-
-    respond_to do |wants|
-      wants.html { redirect_to(${1/./\l$0/}s_url) }
-      wants.xml  { head :ok }
-    end
-  end
-
-  private
-    def find_${1/./\l$0/}
-      @${1/./\l$0/} = ${1:Model}.find(params[:id])
-    end
+	before_filter :find_${1/./\l$0/}, :only => [:show, :edit, :update, :destroy]
+
+	# GET /${1/./\l$0/}s
+	# GET /${1/./\l$0/}s.xml
+	def index
+		@${1/./\l$0/}s = ${1:Model}.all
+
+		respond_to do |wants|
+			wants.html # index.html.erb
+			wants.xml  { render :xml => @${1/./\l$0/}s }
+		end
+	end
+
+	# GET /${1/./\l$0/}s/1
+	# GET /${1/./\l$0/}s/1.xml
+	def show
+		respond_to do |wants|
+			wants.html # show.html.erb
+			wants.xml  { render :xml => @${1/./\l$0/} }
+		end
+	end
+
+	# GET /${1/./\l$0/}s/new
+	# GET /${1/./\l$0/}s/new.xml
+	def new
+		@${1/./\l$0/} = ${1:Model}.new
+
+		respond_to do |wants|
+			wants.html # new.html.erb
+			wants.xml  { render :xml => @${1/./\l$0/} }
+		end
+	end
+
+	# GET /${1/./\l$0/}s/1/edit
+	def edit
+	end
+
+	# POST /${1/./\l$0/}s
+	# POST /${1/./\l$0/}s.xml
+	def create
+		@${1/./\l$0/} = ${1:Model}.new(params[:${1/./\l$0/}])
+
+		respond_to do |wants|
+			if @${1/./\l$0/}.save
+				flash[:notice] = '${1:Model} was successfully created.'
+				wants.html { redirect_to(@${1/./\l$0/}) }
+				wants.xml  { render :xml => @${1/./\l$0/}, :status => :created, :location => @${1/./\l$0/} }
+			else
+				wants.html { render :action => "new" }
+				wants.xml  { render :xml => @${1/./\l$0/}.errors, :status => :unprocessable_entity }
+			end
+		end
+	end
+
+	# PUT /${1/./\l$0/}s/1
+	# PUT /${1/./\l$0/}s/1.xml
+	def update
+		respond_to do |wants|
+			if @${1/./\l$0/}.update_attributes(params[:${1/./\l$0/}])
+				flash[:notice] = '${1:Model} was successfully updated.'
+				wants.html { redirect_to(@${1/./\l$0/}) }
+				wants.xml  { head :ok }
+			else
+				wants.html { render :action => "edit" }
+				wants.xml  { render :xml => @${1/./\l$0/}.errors, :status => :unprocessable_entity }
+			end
+		end
+	end
+
+	# DELETE /${1/./\l$0/}s/1
+	# DELETE /${1/./\l$0/}s/1.xml
+	def destroy
+		@${1/./\l$0/}.destroy
+
+		respond_to do |wants|
+			wants.html { redirect_to(${1/./\l$0/}s_url) }
+			wants.xml  { head :ok }
+		end
+	end
+
+	private
+		def find_${1/./\l$0/}
+			@${1/./\l$0/} = ${1:Model}.find(params[:id])
+		end
 
 end
 
@@ -227,31 +225,31 @@ assert_response :${1:success}, @response.body$0
 endsnippet
 
 snippet aftc "after_create"
-after_create 
+after_create $0
 endsnippet
 
 snippet aftd "after_destroy"
-after_destroy 
+after_destroy $0
 endsnippet
 
 snippet afts "after_save"
-after_save 
+after_save $0
 endsnippet
 
 snippet aftu "after_update"
-after_update 
+after_update $0
 endsnippet
 
 snippet aftv "after_validation"
-after_validation 
+after_validation $0
 endsnippet
 
 snippet aftvoc "after_validation_on_create"
-after_validation_on_create 
+after_validation_on_create $0
 endsnippet
 
 snippet aftvou "after_validation_on_update"
-after_validation_on_update 
+after_validation_on_update $0
 endsnippet
 
 snippet asg "assert(var = assigns(:var))"
@@ -261,13 +259,13 @@ endsnippet
 
 snippet asd "assert_difference"
 assert_difference "${1:Model}.${2:count}", ${3:1} do
-  $0
+	$0
 end
 endsnippet
 
 snippet asnd "assert_no_difference"
 assert_no_difference "${1:Model}.${2:count}" do
-  $0
+	$0
 end
 endsnippet
 
@@ -298,27 +296,27 @@ end}
 endsnippet
 
 snippet befc "before_create"
-before_create 
+before_create $0
 endsnippet
 
 snippet befd "before_destroy"
-before_destroy 
+before_destroy $0
 endsnippet
 
 snippet befs "before_save"
-before_save 
+before_save $0
 endsnippet
 
 snippet befu "before_update"
-before_update 
+before_update $0
 endsnippet
 
 snippet befv "before_validation"
-before_validation 
+before_validation $0
 endsnippet
 
 snippet befvoc "before_validation_on_create"
-before_validation_on_create 
+before_validation_on_create $0
 endsnippet
 
 snippet befvou "before_validation_on_update"
@@ -456,13 +454,13 @@ endsnippet
 
 snippet mapr "map.resource"
 ${1:map}.resource :${2:resource}${10: do |${11:$2}|
-  $0
+	$0
 end}
 endsnippet
 
 snippet maprs "map.resources"
 ${1:map}.resources :${2:resource}${10: do |${11:$2}|
-  $0
+	$0
 end}
 endsnippet
 
@@ -605,7 +603,7 @@ endsnippet
 
 snippet resw "respond_with"
 respond_with(${1:@${2:model}})${3: do |format|
-  format.${4:html} { $0 \}
+	format.${4:html} { $0 \}
 end}
 endsnippet
 
@@ -807,32 +805,32 @@ endsnippet
 
 snippet sweeper "Create sweeper class"
 class ${1:Model}Sweeper < ActionController::Caching::Sweeper
-  observe ${1:Model}
+	observe ${1:Model}
 
-  def after_save(${1/./\l$0/})
-    expire_cache(${1/./\l$0/})
-  end
+	def after_save(${1/./\l$0/})
+		expire_cache(${1/./\l$0/})
+	end
 
-  def after_destroy(${1/./\l$0/})
-    expire_cache(${1/./\l$0/})
-  end
+	def after_destroy(${1/./\l$0/})
+		expire_cache(${1/./\l$0/})
+	end
 
-  private
+	private
 
-    def expire_cache(${1/./\l$0/})
-      ${0:expire_page ${1/./\l$0/}s_path 
-      expire_page ${1/./\l$0/}_path(${1/./\l$0/})}
-    end
+		def expire_cache(${1/./\l$0/})
+			${0:expire_page ${1/./\l$0/}s_path
+			expire_page ${1/./\l$0/}_path(${1/./\l$0/})}
+		end
 
 end
 endsnippet
 
 snippet col "collection routes"
 collection do
-  ${1:get :${2:action}}
-  ${3:put :${4:action}}
-  ${5:post :${6:action}}
-  ${7:delete :${8:action}}
+	${1:get :${2:action}}
+	${3:put :${4:action}}
+	${5:post :${6:action}}
+	${7:delete :${8:action}}
 end
 endsnippet
 
@@ -854,16 +852,16 @@ endsnippet
 
 snippet member "member routes"
 member do
-  ${1:get :${2:action}}
-  ${3:put :${4:action}}
-  ${5:post :${6:action}}
-  ${7:delete :${8:action}}
+	${1:get :${2:action}}
+	${3:put :${4:action}}
+	${5:post :${6:action}}
+	${7:delete :${8:action}}
 end
 endsnippet
 
 snippet res "resources"
 resources :${1:posts}${2: do
-  $3
+	$3
 end}
 endsnippet
 
@@ -877,9 +875,9 @@ endsnippet
 
 snippet scopee "scope with extension"
 scope :${1:name}, ${2:where(${3::${4:field} => ${5:'${6:value}'}})} do
-  def ${7:method_name}
-    $0
-  end
+	def ${7:method_name}
+		$0
+	end
 end
 endsnippet
 
@@ -893,13 +891,13 @@ setup do
 end
 endsnippet
 
-snippet trans "Translation snippet" 
+snippet trans "Translation snippet"
 I18n.t('`!v substitute(substitute(substitute(@%, substitute(getcwd() . "/", "\/", "\\\\/", "g"), "", ""), "\\(\\.\\(html\\|js\\)\\.\\(haml\\|erb\\)\\|\\(_controller\\)\\?\\.rb\\)$", "", ""), "/", ".", "g")`.${2:${1/[^\w]/_/g}}${3}', :default => "${1:some_text}"${4})${5:$0}
 endsnippet
 
 snippet route_spec
 it 'routes to #${1:action}' do
-  ${2:get}('/${3:url}').should route_to('`!v substitute(expand('%:t:r'), '_routing_spec$', '', '')`#$1'${4:, ${5:params}})${6}
+	${2:get}('/${3:url}').should route_to('`!v substitute(expand('%:t:r'), '_routing_spec$', '', '')`#$1'${4:, ${5:params}})${6}
 end
 endsnippet
 
diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 88e0caafb..e8aef2b21 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 
+priority -50
+
 ###########################################################################
-#                              General Stuff                              #
+#							   General Stuff							  #
 ###########################################################################
 global !p
 import vim
@@ -12,25 +14,25 @@ from collections import Counter
 
 #http://docutils.sourceforge.net/docs/ref/rst/roles.html
 TEXT_ROLES = ['emphasis','literal','code','math',
-              'pep-reference','rfc-reference',
-              'strong','subscript','superscript',
-              'title-reference','raw'] 
+			  'pep-reference','rfc-reference',
+			  'strong','subscript','superscript',
+			  'title-reference','raw']
 TEXT_ROLES_REGEX = r'\.\.\srole::?\s(w+)'
 
 #http://docutils.sourceforge.net/docs/ref/rst/directives.html#specific-admonitions
-SPECIFIC_ADMONITIONS = ["attention", "caution", "danger", 
-                        "error", "hint", "important", "note", 
-                        "tip", "warning"]
+SPECIFIC_ADMONITIONS = ["attention", "caution", "danger",
+						"error", "hint", "important", "note",
+						"tip", "warning"]
 #http://docutils.sourceforge.net/docs/ref/rst/directives.html
 DIRECTIVES = ['topic','sidebar','math','epigraph',
-              'parsed-literal','code','highlights',
-              'pull-quote','compound','container',
-              'list-table','class','sectnum',
-              'role','default-role','unicode',
-              'raw']
+			  'parsed-literal','code','highlights',
+			  'pull-quote','compound','container',
+			  'list-table','class','sectnum',
+			  'role','default-role','unicode',
+			  'raw']
 
 NONE_CONTENT_DIRECTIVES = ['rubric', 'contents', 'header',
-                           'footer', 'date', 'include', 'title']
+						   'footer', 'date', 'include', 'title']
 
 INCLUDABLE_DIRECTIVES = ['image', 'figure', 'include']
 # CJK chars
@@ -39,115 +41,115 @@ CJK_RE = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-
 
 
 def has_cjk(char):
-    """
-    Detect char contains CJK character
-    
-    :param char: characters needs to be detect 
-    """
-    try:
-        CJK_RE.finditer(char).next()
-    except StopIteration:
-        return False
-    else:
-        return True
+	"""
+	Detect char contains CJK character
+
+	:param char: characters needs to be detect
+	"""
+	try:
+		CJK_RE.finditer(char).next()
+	except StopIteration:
+		return False
+	else:
+		return True
 
 def real_filename(filename):
-    """peal extension name off if possible
-    # i.e. "foo.bar.png will return "foo.bar"
+	"""pealeextension name off if possible
+	# i.e. "foo.bar.png will return "foo.bar"
 	"""
-    return ospath.splitext(filename)[0]
+	return ospath.splitext(filename)[0]
 
 def check_file_exist(rst_path, relative_path):
-    """
-    For RST file, it can just include files as relative path.
-    
-    :param rst_path: absolute path to rst file
-    :param relative_path: path related to rst file
-    :return: relative file's absolute path if file exist
-    """
-    abs_path = ospath.join(ospath.dirname(rst_path), relative_path)
-    if ospath.isfile(abs_path):
-        return abs_path
+	"""
+	For RST file, it can just include files as relative path.
+
+	:param rst_path: absolute path to rst file
+	:param relative_path: path related to rst file
+	:return: relative file's absolute path if file exist
+	"""
+	abs_path = ospath.join(ospath.dirname(rst_path), relative_path)
+	if ospath.isfile(abs_path):
+		return abs_path
 
 
 def rst_char_len(char):
-    """ 
-    return len of string which fit in rst
-    For instance:chinese "我" decode as only one character, 
-    However, the rst interpreter needs 2 "=" instead of 1.
+	"""
+	return len of string which fit in rst
+	For instance:chinese "我" decode as only one character,
+	However, the rst interpreter needs 2 "=" instead of 1.
 
-    :param: char needs to be count
-    """
-    return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
+	:param: char needs to be count
+	"""
+	return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
 
 def	make_items(times, leading='+'):
-    """
-    make lines with leading char multitimes
-    
-    :param: times, how many times you need
-    :param: leading, leading character
-    """
-    times = int(times)
-    if leading == 1:
-        msg = ""
-        for x in xrange(1, times+1):
-            msg += "%s. Item\n" % x
-        return msg
-    else:
-        return ("%s Item\n" % leading) * times
+	"""
+	make lines with leading char multitimes
+
+	:param: times, how many times you need
+	:param: leading, leading character
+	"""
+	times = int(times)
+	if leading == 1:
+		msg = ""
+		for x in xrange(1, times+1):
+			msg += "%s. Item\n" % x
+		return msg
+	else:
+		return ("%s Item\n" % leading) * times
 
 
 def look_up_directives(regex, fpath):
-    """
-    find all directive args in given file
-    :param: regex, the regex that needs to match
-    :param: path, to path to rst file
+	"""
+	find all directive args in given file
+	:param: regex, the regex that needs to match
+	:param: path, to path to rst file
 
-    :return: list, empty list if nothing match
-    """
-    try:
-        with open(fpath) as source:
-            match = re.findall(regex, source.read())
-    except IOError:
-        match = []
-    return match
+	:return: list, empty list if nothing match
+	"""
+	try:
+		with open(fpath) as source:
+			match = re.findall(regex, source.read())
+	except IOError:
+		match = []
+	return match
 
 
 def get_popular_code_type():
-    """
-    find most popular code type in the given rst
-
-    :param path: file to detect
-
-    :return: string, most popular code type in file
-    """
-    buf = "".join(vim.current.buffer)
-    types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', buf)
-    try:
-        popular_type = Counter(types).most_common()[0][0]
-    except IndexError:
-        popular_type = "lua" # Don't break default
-    return popular_type
- 
+	"""
+	find most popular code type in the given rst
+
+	:param path: file to detect
+
+	:return: string, most popular code type in file
+	"""
+	buf = "".join(vim.current.buffer)
+	types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', buf)
+	try:
+		popular_type = Counter(types).most_common()[0][0]
+	except IndexError:
+		popular_type = "lua" # Don't break default
+	return popular_type
+
 
 def complete(t, opts):
-    """
-    get options that start with t
+	"""
+	get options that start with t
 
-    :param t: query string
-    :param opts: list that needs to be completed
+	:param t: query string
+	:param opts: list that needs to be completed
 
-    :return: a string that start with t
-    """
-    msg = "({0})"
-    if t:
-        opts = [ m[len(t):] for m in opts if m.startswith(t) ]
-    if len(opts) == 1:
-        return opts[0]
+	:return: a string that start with t
+	"""
+	msg = "({0})"
+	if t:
+		opts = [ m[len(t):] for m in opts if m.startswith(t) ]
+	if len(opts) == 1:
+		return opts[0]
 
-    if not len(opts):
-        msg = "{0}"
-    return msg.format("|".join(opts))
+	if not len(opts):
+		msg = "{0}"
+	return msg.format("|".join(opts))
 
 endglobal
 
@@ -199,22 +201,22 @@ snippet em "Emphasize string" i
 `!p
 # dirty but works with CJK charactor detection
 if has_cjk(vim.current.line):
-    snip.rv ="\ "`*${1:${VISUAL:Em}}*`!p
-if has_cjk(vim.current.line): 
-    snip.rv ="\ "
+	snip.rv ="\ "`*${1:${VISUAL:Em}}*`!p
+if has_cjk(vim.current.line):
+	snip.rv ="\ "
 else:
-    snip.rv = " "
+	snip.rv = " "
 `$0
 endsnippet
 
 snippet st "Strong string" i
-`!p 
+`!p
 if has_cjk(vim.current.line):
-    snip.rv ="\ "`**${1:${VISUAL:Strong}}**`!p
-if has_cjk(vim.current.line): 
-    snip.rv ="\ "
+	snip.rv ="\ "`**${1:${VISUAL:Strong}}**`!p
+if has_cjk(vim.current.line):
+	snip.rv ="\ "
 else:
-    snip.rv = " "
+	snip.rv = " "
 `$0
 endsnippet
 
@@ -236,12 +238,12 @@ snip.rv = make_items(match.groupdict()['num'], 1)
 `
 endsnippet
 ###########################################################################
-#                         More Specialized Stuff.                         #
+#						  More Specialized Stuff.						  #
 ###########################################################################
 snippet cb "Code Block" b
 .. code-block:: ${1:`!p snip.rv = get_popular_code_type()`}
 
-   ${2:code}
+	${2:code}
 
 $0
 endsnippet
@@ -249,7 +251,7 @@ endsnippet
 # match snippets :
 # img, inc, fig
 snippet id "Includable Directives" b
-`!p 
+`!p
 real_name=real_filename(ospath.basename(t[2]))
 di=t[1][:2]
 
@@ -257,28 +259,28 @@ link=""
 content=""
 
 if di == 'im':
-    link = "|{0}|".format(real_name)
+	link = "|{0}|".format(real_name)
 
 if di == 'fi':
-    content="""
-    :alt: {0}
-    {0}""".format(real_name)
+	content="""
+	:alt: {0}
+	{0}""".format(real_name)
 `
 ..`!p snip.rv = " %s" % link if link else ""` $1`!p snip.rv=complete(t[1], INCLUDABLE_DIRECTIVES)`:: ${2:file}`!p if content:
-    snip.rv +="    "+content`
+	snip.rv +="    "+content`
 `!p
 # Tip of whether file is exist in comment type
 if not check_file_exist(path, t[2]):
-    snip.rv='.. FILE {0} does not exist'.format(t[2])
+	snip.rv='.. FILE {0} does not exist'.format(t[2])
 else:
-    snip.rv=""
+	snip.rv=""
 `$0
 endsnippet
 
 snippet di "Directives" b
 .. $1`!p snip.rv=complete(t[1], DIRECTIVES)`:: $2
 
-    ${3:Content}
+	${3:Content}
 $0
 endsnippet
 
@@ -289,8 +291,8 @@ endsnippet
 
 snippet sa "Specific Admonitions" b
 .. $1`!p snip.rv =complete(t[1], SPECIFIC_ADMONITIONS)`::
-    
-    ${2:Content}
+
+	${2:Content}
 
 $0
 endsnippet
@@ -298,8 +300,8 @@ endsnippet
 #it will be trigger at start of line or after a word
 snippet ro "Text Roles" w
 \ :$1`!p snip.rv=complete(t[1],
-                          TEXT_ROLES+look_up_directives(TEXT_ROLES_REGEX,
-                                                        path))`:\`$2\`\ 
+						  TEXT_ROLES+look_up_directives(TEXT_ROLES_REGEX,
+														path))`:\`$2\`\
 endsnippet
 
 ############
@@ -309,6 +311,6 @@ endsnippet
 snippet sid "SideBar" b
 .. sidebar:: ${1:SideBar Title}
 
-    ${2:SideBar Content}
+	${2:SideBar Content}
 endsnippet
 # vim:ft=snippets:
diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index 90001b1a4..09a114f6c 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 snippet "^#!" "#!/usr/bin/env ruby" r
 #!/usr/bin/env ruby
 $0
@@ -25,7 +27,7 @@ endsnippet
 
 snippet if "if <condition> ... end"
 if ${1:condition}
-	${2}
+	${2:# TODO}
 end
 endsnippet
 
@@ -33,9 +35,9 @@ endsnippet
 
 snippet ife "if <condition> ... else ... end"
 if ${1:condition}
-	${2}
+	${2:# TODO}
 else
-	${3}
+	${3:# TODO}
 end
 endsnippet
 
@@ -43,11 +45,11 @@ endsnippet
 
 snippet ifee "if <condition> ... elseif <condition> ... else ... end"
 if ${1:condition}
-	${2}
+	${2:# TODO}
 elsif ${3:condition}
-	${4}
+	${4:# TODO}
 else
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -55,7 +57,7 @@ endsnippet
 
 snippet unless "unless <condition> ... end"
 unless ${1:condition}
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -63,9 +65,9 @@ endsnippet
 
 snippet unlesse "unless <condition> ... else ... end"
 unless ${1:condition}
-	${2}
+	${2:# TODO}
 else
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -73,11 +75,11 @@ endsnippet
 
 snippet unlesee "unless <condition> ... elseif <condition> ... else ... end"
 unless ${1:condition}
-	${2}
+	${2:# TODO}
 elsif ${3:condition}
-	${4}
+	${4:# TODO}
 else
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -85,7 +87,7 @@ endsnippet
 
 snippet "\b(de)?f" "def <name>..." r
 def ${1:function_name}${2: ${3:*args}}
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -93,7 +95,7 @@ endsnippet
 
 snippet defi "def initialize ..."
 def initialize${1: ${2:*args}}
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -101,23 +103,23 @@ endsnippet
 
 snippet defr "def <name> ... rescue ..."
 def ${1:function_name}${2: ${3:*args}}
-	${4}
+	${4:# TODO}
 rescue
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet For "(<from>..<to>).each { |<i>| <block> }"
-(${1:from}..${2:to}).each { |${3:i}| ${4} }
+(${1:from}..${2:to}).each { |${3:i}| ${4:# TODO} }
 endsnippet
 
 
 
 snippet for "(<from>..<to>).each do |<i>| <block> end"
 (${1:from}..${2:to}).each do |${3:i}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -138,42 +140,42 @@ endsnippet
 
 
 snippet "(\S+)\.Del(ete)?_?if" ".delete_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3} }
+`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3:# TODO} }
 endsnippet
 
 
 
 snippet "(\S+)\.del(ete)?_?if" ".delete_if do |<key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.delete_if do |${1:key},${2:value}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Keep_?if" ".keep_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3} }
+`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3:# TODO} }
 endsnippet
 
 
 
 snippet "(\S+)\.keep_?if" ".keep_if do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.keep_if do |${1:key},${2:value}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Reject" ".reject { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3} }
+`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3:# TODO} }
 endsnippet
 
 
 
 snippet "(\S+)\.reject" ".reject do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.reject do |${1:key},${2:value}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -194,71 +196,71 @@ endsnippet
 
 
 snippet "(\S+)\.Sort" ".sort { |<a>,<b>| <block> }" r
-`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3} }
+`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3:# TODO} }
 endsnippet
 
 
 
 snippet "(\S+)\.sort" ".sort do |<a>,<b>| <block> end" r
 `!p snip.rv=match.group(1)`.sort do |${1:a},${2:b}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Each_?k(ey)?" ".each_key { |<key>| <block> }" r
-`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2} }
+`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2:# TODO} }
 endsnippet
 
 
 
 snippet "(\S+)\.each_?k(ey)?" ".each_key do |key| <block> end" r
 `!p snip.rv=match.group(1)`.each_key do |${1:key}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet "(\S+)\.Each_?val(ue)?" ".each_value { |<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2} }
+`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2:# TODO} }
 endsnippet
 
 
 
 snippet "(\S+)\.each_?val(ue)?" ".each_value do |<value>| <block> end" r
 `!p snip.rv=match.group(1)`.each_value do |${1:value}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 snippet Each "<elements>.each { |<element>| <block> }"
-${1:elements}.each { |${2:${1/s$//}}| ${3} }
+${1:elements}.each { |${2:${1/s$//}}| ${3:# TODO} }
 endsnippet
 
 
 
 snippet each "<elements>.each do |<element>| <block> end"
 ${1:elements}.each do |${2:${1/s$//}}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
-snippet each_?s(lice)? "<array>.each_slice(n) do |slice| <block> end"
-each_slice(${1:2}) do |${2:slice}|
-	${0}
+snippet "each_?s(lice)?" "<array>.each_slice(n) do |slice| <block> end" r
+${1:elements}.each_slice(${2:2}) do |${3:slice}|
+	${0:# TODO}
 end
 endsnippet
 
 
 
-snippet Each_?s(lice)? "<array>.each_slice(n) { |slice| <block> }"
-each_slice(${1:2}) { |${2:slice}| ${3} }
+snippet "Each_?s(lice)?" "<array>.each_slice(n) { |slice| <block> }" r
+${1:elements}.each_slice(${2:2}) { |${3:slice}| ${0:# TODO} }
 endsnippet
 
 
@@ -273,7 +275,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2} }
+`}| ${2:# TODO} }
 endsnippet
 
 
@@ -288,7 +290,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -303,7 +305,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2} }
+`}| ${2:# TODO} }
 endsnippet
 
 
@@ -318,7 +320,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -333,7 +335,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2} }
+`}| ${2:# TODO} }
 endsnippet
 
 
@@ -348,14 +350,14 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
 
 
 
-snippet "(\S+)\.Each_w(ith)?_?i(ndex)?" ".each_with_index { |<element>,<i>| <block> }" r
+snippet "(\S+)\.Each_?w(ith)?_?i(ndex)?" ".each_with_index { |<element>,<i>| <block> }" r
 `!p snip.rv=match.group(1)`.each_with_index { |${1:`!p
 element_name = match.group(1).lstrip('$@')
 ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
@@ -364,7 +366,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`},${2:i}| ${3} }$0
+`},${2:i}| ${3:# TODO} }$0
 endsnippet
 
 
@@ -379,7 +381,7 @@ try:
 except:
 	snip.rv = 'element'
 `},${2:i}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -387,14 +389,14 @@ endsnippet
 
 
 snippet "(\S+)\.Each_?p(air)?"  ".each_pair { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3} }
+`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3:# TODO} }
 endsnippet
 
 
 
 snippet "(\S+)\.each_?p(air)?" ".each_pair do |<key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.each_pair do |${1:key},${2:value}|
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -424,24 +426,26 @@ snippet "(\S+)\.Index" ".index do |item| ... end" r
 end
 endsnippet
 
-# comments about do and dov see snippets/ruby.snippets
-snippet do "do ... end" i
-do
+
+
+snippet do "do |<key>| ... end" i
+do |${1:args}|
 	$0
 end
 endsnippet
 
-snippet dov "do |<key>| ... end" i
-do |${1:v}|
-	$2
+
+
+snippet Do "do ... end" i
+do
+	$0
 end
 endsnippet
 
 
-
 snippet until "until <expression> ... end"
 until ${1:expression}
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -449,15 +453,15 @@ endsnippet
 
 snippet Until "begin ... end until <expression>"
 begin
-	${0}
+	${0:# TODO}
 end until ${1:expression}
 endsnippet
 
 
 
-snippet wh "while <expression> ... end"
+snippet while "while <expression> ... end"
 while ${1:expression}
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -465,7 +469,7 @@ endsnippet
 
 snippet While "begin ... end while <expression>"
 begin
-	${0}
+	${0:# TODO}
 end while ${1:expression}
 endsnippet
 
@@ -491,9 +495,9 @@ endsnippet
 
 snippet begin "begin ... rescue ... end"
 begin
-	${1}
+	${1:# TODO}
 rescue
-	${0}
+	${0:# TODO}
 end
 endsnippet
 
@@ -559,7 +563,7 @@ endsnippet
 
 snippet ###
 =begin
-  $0
+	$0
 =end
 endsnippet
 
diff --git a/UltiSnips/scss.snippets b/UltiSnips/scss.snippets
new file mode 100644
index 000000000..70a44a076
--- /dev/null
+++ b/UltiSnips/scss.snippets
@@ -0,0 +1,55 @@
+priority -50
+
+snippet /@?imp/ "@import '...';" br
+@import '${1:file}';
+endsnippet
+
+snippet /@?inc/ "@include mixin(...);" br
+@include ${1:mixin}(${2:arguments});
+endsnippet
+
+snippet /@?ext?/ "@extend %placeholder;" br
+@extend %${1:placeholder};
+endsnippet
+
+snippet /@?mixin/ "@mixin (...) { ... }" br
+@mixin ${1:name}(${2:arguments}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /@?fun/ "@function (...) { ... }" br
+@function ${1:name}(${2:arguments}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /@?if/ "@if (...) { ... }" br
+@if ${1:condition} {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /(} )?@?else/ "@else { ... }" br
+@else ${1:condition} {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /@?for/ "@for loop" br
+@for ${1:$i} from ${2:1} through ${3:3} {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /@?each/ "@each loop" br
+@each ${1:$item} in ${2:item, item, item} {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet /@?while/ "@while loop" br
+@while ${1:$i} ${2:>} ${3:0} {
+	${VISUAL}$0
+}
+endsnippet
diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index cce06ef3d..9cc45779e 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -1,21 +1,25 @@
+priority -50
+
 global !p
 import vim
 
 # Tests for the existence of a variable declared by Vim's filetype detection
 # suggesting the type of shell script of the current file
 def testShell(scope, shell):
-    return vim.eval("exists('" + scope + ":is_" + shell + "')")
+	return vim.eval("exists('" + scope + ":is_" + shell + "')")
 
 # Loops over the possible variables, checking for global variables
 # first since they indicate an override by the user.
 def getShell():
-    for scope in ["g", "b"]:
-        for shell in ["bash", "sh", "kornshell"]:
-            if testShell(scope, shell) == "1":
-                if shell == "kornshell":
-                    return "ksh"
-                return shell
-    return "sh"
+	for scope in ["g", "b"]:
+		for shell in ["bash", "posix", "sh", "kornshell"]:
+			if testShell(scope, shell) == "1":
+				if shell == "kornshell":
+					return "ksh"
+				if shell == "posix":
+					return "sh"
+				return shell
+	return "sh"
 endglobal
 
 ###########################################################################
@@ -79,7 +83,7 @@ until ${2:[[ ${1:condition} ]]}; do
 done
 endsnippet
 
-snippet wh "while ... (done)"
+snippet while "while ... (done)"
 while ${2:[[ ${1:condition} ]]}; do
 	${0:#statements}
 done
diff --git a/UltiSnips/snippets.snippets b/UltiSnips/snippets.snippets
index 414f350ee..ee0c8c766 100644
--- a/UltiSnips/snippets.snippets
+++ b/UltiSnips/snippets.snippets
@@ -1,16 +1,14 @@
-#########################
-# SNIPPETS for SNIPPETS #
-#########################
+priority -50
 
 # We use a little hack so that the snippet is expanded
 # and parsed correctly
-snippet snip "Snippet definition" !
-`!p snip.rv = "snippet"` ${1:Tab_trigger} "${2:Description}" ${3:!b}
+snippet snip "Snippet definition" b
+`!p snip.rv = "snippet"` ${1:Tab_trigger} "${2:Description}" ${3:b}
 $0
 `!p snip.rv = "endsnippet"`
 endsnippet
 
-snippet global "Global snippet" !
+snippet global "Global snippet" b
 `!p snip.rv = "global"` !p
 $0
 `!p snip.rv = "endglobal"`
diff --git a/UltiSnips/tcl.snippets b/UltiSnips/tcl.snippets
index fd53d2652..658491571 100644
--- a/UltiSnips/tcl.snippets
+++ b/UltiSnips/tcl.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ###########################################################################
 #                            TEXTMATE SNIPPETS                            #
 ###########################################################################
@@ -16,14 +18,14 @@ foreach ${1:var} ${2:\$list} {
 endsnippet
 
 snippet if "if... (if)" b
-if {${1}} {
+if {${1:condition}} {
 	${2}
 }
 
 endsnippet
 
 snippet proc "proc... (proc)" b
-proc ${1} {${2}} \
+proc ${1:name} {${2:args}} \
 {
 	${3}
 }
@@ -40,8 +42,8 @@ switch ${1:-exact} -- ${2:\$var} {
 
 endsnippet
 
-snippet wh "while... (while)" b
-while {${1}} {
+snippet while "while... (while)" b
+while {${1:condition}} {
 	${2}
 }
 
diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index db5330709..c32d21f15 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -1,38 +1,28 @@
+priority -50
 
-###########################################################################
-#                             LATEX SNIPPETS                              #
-###########################################################################
+extends texmath
 
-snippet r "\ref{}" w
-\ref{$1}
-endsnippet
-
-###########################################################################
-#                            TEXTMATE SNIPPETS                            #
-###########################################################################
-
-#################
-# GENERAL STUFF #
-#################
 snippet "b(egin)?" "begin{} / end{}" br
 \begin{${1:something}}
 	${0:${VISUAL}}
 \end{$1}
 endsnippet
 
-####################
-# TABULARS, ARRAYS #
-####################
-
 snippet tab
 \begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
 $0${2/((?<=.)c|l|r)|./(?1: & )/g}
 \end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 endsnippet
 
-########################
-# ENUM, DESCR, ITEMIZE #
-########################
+snippet fig "Figure environment" b
+\begin{figure}${2:[htpb]}
+	\centering
+	\includegraphics[width=${3:0.8}\linewidth]{${4:name.ext}}
+	\caption{${4/(\w+)\.\w+/\u$1/}$0}
+	\label{fig:${4/(\w+)\.\w+/$1/}}
+\end{figure}
+endsnippet
+
 snippet enum "Enumerate" b
 \begin{enumerate}
 	\item $0
@@ -51,74 +41,70 @@ snippet desc "Description" b
 \end{description}
 endsnippet
 
-#####################################
-# SECTIONS, CHAPTERS AND THERE LIKE #
-#####################################
+snippet it "Individual item" b
+\item ${1}
+$0
+endsnippet
 
 snippet part "Part" b
 \part{${1:part name}}
-\label{prt:${2:${1/(\w+)|\W+/(?1:\L$0\E:_)/g}}}
+\label{prt:${2:${1/(\w+)|\W+/(?1:\L$0\E:_)/ga}}}
 
 ${0}
-
-% part $2 (end)
 endsnippet
 
 snippet cha "Chapter" b
 \chapter{${1:chapter name}}
-\label{cha:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{cha:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% chapter $2 (end)
 endsnippet
 
 snippet sec "Section" b
 \section{${1:section name}}
-\label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% section $2 (end)
 endsnippet
 
-
 snippet sub "Subsection" b
 \subsection{${1:subsection name}}
-\label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% subsection $2 (end)
 endsnippet
 
 snippet ssub "Subsubsection" b
 \subsubsection{${1:subsubsection name}}
-\label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% subsubsection $2 (end)
-
 endsnippet
 
 snippet par "Paragraph" b
 \paragraph{${1:paragraph name}}
-\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
-
-% paragraph $2 (end)
 endsnippet
 
-
 snippet subp "Subparagraph" b
 \subparagraph{${1:subparagraph name}}
-\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/g}}}
+\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
+endsnippet
 
-% subparagraph $2 (end)
+snippet ni "Non-indented paragraph" b
+\noindent
+${0}
 endsnippet
 
+snippet pac "Package" b
+\usepackage[${1:options}]{${2:package}}$0
+endsnippet
+
+snippet lp "Long parenthesis"
+\left(${1:${VISUAL:contents}}\right)$0
+endsnippet
 # vim:ft=snippets:
diff --git a/UltiSnips/texmath.snippets b/UltiSnips/texmath.snippets
index 03589f0f2..d0a25e9aa 100644
--- a/UltiSnips/texmath.snippets
+++ b/UltiSnips/texmath.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ##############
 # MATH STUFF #
 ##############
diff --git a/UltiSnips/twig.snippets b/UltiSnips/twig.snippets
index 9db43f7d7..156b981b0 100644
--- a/UltiSnips/twig.snippets
+++ b/UltiSnips/twig.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 snippet bl "twig block" b
 {% block ${1} %}
 ${2}
diff --git a/UltiSnips/vim.snippets b/UltiSnips/vim.snippets
index 5655c4b1b..5ff22d2eb 100644
--- a/UltiSnips/vim.snippets
+++ b/UltiSnips/vim.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 ###########################################################################
 #                            SnipMate Snippets                            #
 ###########################################################################
@@ -25,30 +27,30 @@ endsnippet
 
 snippet f
 fun ${1:function_name}(${2})
-	${3}
+	${3:" code}
 endf
 endsnippet
 
 snippet for
-for ${1} in ${2}
-	${3}
+for ${1:needle} in ${2:haystack}
+	${3:" code}
 endfor
 endsnippet
 
 snippet wh
-while ${1}
-	${2}
+while ${1:condition}
+	${2:" code}
 endw
 endsnippet
 
 snippet if
-if ${1}
-	${2}
+if ${1:condition}
+	${2:" code}
 endif
 endsnippet
 
 snippet ife
-if ${1}
+if ${1:condition}
 	${2}
 else
 	${3}
diff --git a/UltiSnips/xhtml.snippets b/UltiSnips/xhtml.snippets
index e69de29bb..a9c5a29ad 100644
--- a/UltiSnips/xhtml.snippets
+++ b/UltiSnips/xhtml.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends html
diff --git a/UltiSnips/xml.snippets b/UltiSnips/xml.snippets
index 80b017cea..92dfb6e1b 100644
--- a/UltiSnips/xml.snippets
+++ b/UltiSnips/xml.snippets
@@ -1,3 +1,10 @@
+priority -50
+
+snippet xml "XML declaration" b
+<?xml version="1.0"?>
+
+endsnippet
+
 snippet t "Simple tag" b
 <${1:tag}>
 	${2:content}
diff --git a/UltiSnips/zsh.snippets b/UltiSnips/zsh.snippets
index 803945970..f7986ea52 100644
--- a/UltiSnips/zsh.snippets
+++ b/UltiSnips/zsh.snippets
@@ -1,9 +1,15 @@
-snippet #! "shebang" !
+priority -50
+
+extends sh
+
+priority -49
+
+snippet #! "shebang" b
 #!/bin/zsh
 
 endsnippet
 
-snippet !env "#!/usr/bin/env (!env)" !
+snippet !env "#!/usr/bin/env (!env)" b
 #!/usr/bin/env zsh
 
 endsnippet

From 26ff066e73c24504d8795e3b7fa9fe0381eb0fbd Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 3 Mar 2014 08:56:08 +0100
Subject: [PATCH 0231/1587] dropping AUTHORS file

reasons:
* maintaining it adds overhead
* git tracks ownership of changes

This is also what SirVer included in his pull request
---
 AUTHORS | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 AUTHORS

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index c5c68c6a7..000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,45 +0,0 @@
-Aaron Broder
-Adam Folmert
-Alberto Pose
-Angel Alonso
-Ben Orenstein
-Bill Casarin
-Christopher Joslyn
-Daniel Hahler
-Elliot Murphy
-Eustaquio Rangel
-Henrik Nyh
-Honza Pokorny
-Iuri Fernandes Queiroz
-Jakub Nawalaniec
-James F. Herdman
-Jon Bernard
-Kozo NISHIDA
-Leandro Pincini
-Marc Weber
-Marcin Kulik
-Marjan.Hratson
-Micah Elliott
-Michael Sanders
-Naveed Massjouni
-Rob Hudson
-Rok Garbas
-Sebastian Schulze
-Srushti Ambekallu
-Stephen Tudor
-Steven Oliver
-Stuart Colville
-Tom Adams
-Zied ABID
-fo60213
-marutanm
-msanders
-Povilas Balzaravičius Pawka
-Dmitry Dementev
-Travis Holton
-Chrisyue
-Erik Westrup
-Matt Deacalion Stevens
-
-TODO: add contributors from github.com/SirVer/Ultisnip having contributed to
-github.com/SirVer/Ultisnip/UltiSnips/* files

From d5ae1f721a9431005b080e7ec41a7420a081ce89 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 4 Mar 2014 09:26:10 +0100
Subject: [PATCH 0232/1587] changes for README from SirVers 32650 (last commit
 of last PR)

---
 README.md | 109 +++++++++++++++++++++---------------------------------
 1 file changed, 43 insertions(+), 66 deletions(-)

diff --git a/README.md b/README.md
index 64733ebcc..fb186b2bf 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-IMPORTANT: comment on: [What about merging with Ultisnip using its engine](https://github.com/garbas/vim-snipmate/issues/114)
-
 Snipmate & UltiSnip Snippets
 ============================
 
@@ -9,51 +7,48 @@ It is community-maintained and many people have contributed snippet files and
 other improvements already.
 
 Contents
-========
+--------
 
-    snippets/*: snippets using snipmate format
-    UltiSnips/*: snippets using UltiSnips format
+- `snippets/*`: snippets using snipmate format
+- `UltiSnips/*`: snippets using UltiSnips format
 
 Snippet engines supporting vim-snippets
-========================================
+----------------------------------------
 
 There are different forks of snippet engines which allow the user to insert
 snippets by typing the name of a snippet hitting the expansion mapping.
 
-    github.com/garbas/vim-snipmate:
-      VimL, snipmate-snippets, engine sometimes behaves strange, supports
-      rewriting snippets on the fly (eg adding a second version with folding
-      markers)
-
-    github.com/MarcWeber/UltiSnips:
-      python, snipmate-snippets and UltiSnips-snippets
-
-    github.com/SirVer/ultisnips:
-      python, UltiSnips-snippets
-
-    github.com/Shougo/neosnippet:
-      viml, has a compatible mode allowing to reuse most snipmate snippets ?
-
-    github.com/drmingdrmer/xptemplate:
-      Totally different syntax, does not read snippets contained in this file,
-      but it is also very powerful. It does not support vim-snippets (just
-      listing it here for completness)
-
-    This tries to be a more comprehensive list (which still is incomplete)
-    http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html
-
-UltiSnips engine has additional features such as "nested snippets".
-
-Which one to use? If you have python give MarcWeber/UltiSnips a try because its
-fast and supports all important features. You can prefer the UltiSnip versions
-of the snippets by setting the "always_use_first_snippet" option to 1.
+- [github.com/SirVer/ultisnips](https://github.com/SirVer/ultisnips):   
+  python, supports all snippets in this repo.
+- [github.com/garbas/vim-snipmate](https://github.com/garbas/vim-snipmate):   
+  VimL, snipmate-snippets, engine sometimes behaves strange. Supports
+  snippets/*
+- [github.com/Shougo/neosnippet](https://github.com/Shougo/neosnippet.vim):   
+  VimL, supports snippets/* with some configuration.
+- [github.com/drmingdrmer/xptemplate](https://github.com/drmingdrmer/xptemplate):
+  Totally different syntax, does not read snippets contained in this file, but
+  it is also very powerful. It does not support vim-snippets (just listing it
+  here for completness)
+ 
+There tries to be a more comprehensive list (which still is incomplete) here:
+http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html
+
+UltiSnips has additional features such as high speed, nesting snippets,
+expanding snippets in snippets and offers powerful transformations on text in
+snippets (like visual selections or placeholder texts).
+
+Which one to use? If you have python give
+[SirVer/ultisnips](https://github.com/SirVer/ultisnips) a try because its fast
+and has the most features.
 
 If you have VimL only (vim without python support) your best option is using
-garbas/vim-snipmate and cope with the minor bugs found in the engine.
+[garbas/vim-snipmate](https://github.com/garbas/vim-snipmate) and cope with the
+minor bugs found in the engine.
 
 
 Installation
-============
+------------
+
 First be aware that there are many options, see "Snippet engines" above.
 Second be aware than there are [tons of plugin managers](http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html)
 which is why Marc Weber thinks that it doesn't make sense to repeat the same
@@ -84,7 +79,8 @@ If you still have trouble getting this to work create a github ticket, ask on
 irc or the mailinglist.
 
 Policies / for contributors
-===========================
+---------------------------
+
 Some snippets are useful for almost all languages, so let's try to have the same
 triggers for them:
 
@@ -96,11 +92,7 @@ el  : else ..
 wh  : while (cond) ...
 ```
 
-If you're not satisfied with these defaults, open a ticket that we implement
-aliasing. Then you can remap "else" to "el" or the like.
-
-
-Don't add stupid placeholder default texts like
+Don't add useless placeholder default texts like
 ```
 if (${1:condition}){
   ${2:some code here}
@@ -127,7 +119,7 @@ Discuss at: https://github.com/honza/vim-snippets/issues/230
 
 
 Related repositories
-====================
+--------------------
 We also encourage people to maintain sets of snippets for particular use cases
 so that all users can benefit from them.  People can list their snippet repositories here:
 
@@ -138,15 +130,15 @@ so that all users can benefit from them.  People can list their snippet reposito
 
 Installation using VAM: "github:rbonvall/snipmate-snippets-bib"
 
-
 Future - ideas - examples
-=========================
+-------------------------
+
 [overview snippet engines](http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html)
 If you have ideas you can add them to that list of "snippet engine features by example".
 
 
 Historical notes
-================
+----------------
 
 [vim-snipmate][1] was originally started by [Michael Sanders][2] who has now
 unfortunately abandoned the project. [Rok Garbas][3] is now maintaining a
@@ -170,14 +162,6 @@ let g:snipMate.scope_aliases = {}
 let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails,ruby-1.9'
 ```
 
-or github.com/MarcWeber/UltiSnips this way:
-
-
-```vim
-let g:UltiSnips = {}
-
-let g:UltiSnips.snipmate_ft_filter = {
-            \ 'default' : {'filetypes': ["FILETYPE"] },
             \ 'ruby'    : {'filetypes': ["ruby", "ruby-rails", "ruby-1.9"] },
 ```
 
@@ -192,16 +176,15 @@ ruby-library-version triplet. Sometimes postfixing a name such as
 
 will do it then if syntax has changed.
 
+
 Language maintainers
 --------------------
 
 No one can really be proficient in all programming languages. If you would like
 to maintain snippets for a language, please get in touch.
 
-Notes: People are interested in snippets - and their interest may stop again
-at will. So its ok if people maintain a language only for a short period of
-time - or jump in and get things done - don't let the flow stop :)
-vim-snippets is not like the "linux kernel".
+Notes: People are interested in snippets - and their interest may wane again.
+This list is kept up-to-date on a best effort basis.
 
 * Python - [honza](http://github.com/honza)
 * Javascript - [honza](http://github.com/honza)
@@ -220,18 +203,13 @@ Until further work is done on `vim-snipmate`, please don't add folding markers
 into snippets. `vim-snipmate` has some comments about how to patch all snippets
 on the fly adding those.
 
-Because MarcWeber/UltiSnips [6] supports also snipmate-snippets there is no
-need to duplicate all snippets - only those snippets who use advanced UltiSnips
-features should be duplicated in UltiSnips (?)
+Because UltiSnips reads snipmate-snippets too there is no need to duplicate all
+snippets - only those snippets who use advanced UltiSnips features should be
+duplicated in UltiSnips.
 
 Currently all snippets from UltiSnips have been put into UltiSnips - some work
 on merging should be done (dropping duplicates etc)
 
-Authors
--------
-
-For a list of authors, please see the `AUTHORS` files.
-
 License
 -------
 
@@ -243,5 +221,4 @@ terms of the MIT license.
 [2]: http://github.com/msanders
 [3]: http://github.com/garbas
 [4]: http://github.com/garbas/vim-snipmate
-[6]: http://github.com/MarcWeber/UltiSnips
 [7]: http://github.com/SirVer/ultisnips

From f723f0d7af3c48c23dd36da10e43ee81ad455210 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Tue, 4 Mar 2014 09:37:15 +0100
Subject: [PATCH 0233/1587] Remove remaining of old block of code in README

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index fb186b2bf..7a94766f8 100644
--- a/README.md
+++ b/README.md
@@ -162,9 +162,6 @@ let g:snipMate.scope_aliases = {}
 let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails,ruby-1.9'
 ```
 
-            \ 'ruby'    : {'filetypes': ["ruby", "ruby-rails", "ruby-1.9"] },
-```
-
 If it happens that you work on a project requiring ruby-1.8 snippets instead,
 consider using vim-addon-local-vimrc and override the filetypes.
 

From 2d63c6a6b07efd02fcb0b95055e3436918ed07af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20L=C3=A9vigne?= <florent.levigne@mailoo.org>
Date: Tue, 4 Mar 2014 15:08:47 +0100
Subject: [PATCH 0234/1587] change default method to post

---
 snippets/html.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index d8892b5bc..eddab8df0 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -361,15 +361,15 @@ snippet footer#
 		${0}
 	</footer>
 snippet form
-	<form action="${1}" method="${2:get}" accept-charset="utf-8">
+	<form action="${1}" method="${2:post}" accept-charset="utf-8">
 		${0}
 	</form>
 snippet form.
-	<form class="${1}" action="${2}" method="${3:get}" accept-charset="utf-8">
+	<form class="${1}" action="${2}" method="${3:post}" accept-charset="utf-8">
 		${0}
 	</form>
 snippet form#
-	<form id="${1}" action="${2}" method="${3:get}" accept-charset="utf-8">
+	<form id="${1}" action="${2}" method="${3:post}" accept-charset="utf-8">
 		${0}
 	</form>
 snippet h1

From a93d2e8d5a3326ed369cf6d2662dcb6e404873d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20L=C3=A9vigne?= <florent.levigne@mailoo.org>
Date: Tue, 4 Mar 2014 15:10:32 +0100
Subject: [PATCH 0235/1587] remove accept-charset attribute from form

---
 snippets/html.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index eddab8df0..567003f71 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -361,15 +361,15 @@ snippet footer#
 		${0}
 	</footer>
 snippet form
-	<form action="${1}" method="${2:post}" accept-charset="utf-8">
+	<form action="${1}" method="${2:post}">
 		${0}
 	</form>
 snippet form.
-	<form class="${1}" action="${2}" method="${3:post}" accept-charset="utf-8">
+	<form class="${1}" action="${2}" method="${3:post}">
 		${0}
 	</form>
 snippet form#
-	<form id="${1}" action="${2}" method="${3:post}" accept-charset="utf-8">
+	<form id="${1}" action="${2}" method="${3:post}">
 		${0}
 	</form>
 snippet h1

From 39fe0b562bd08d3bac7c2fc621c2936c9f609bc2 Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Tue, 4 Mar 2014 17:46:35 +0100
Subject: [PATCH 0236/1587] Adjusted priority.

---
 UltiSnips/all.snippets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 085440a4a..3e136caea 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -1,7 +1,9 @@
 # This file contains snippets that are always defined. I personally
 # have snippets for signatures and often needed texts
 
-priority -50
+# sligthly lower priority than everything else. After all these should
+# overwrite.
+priority -51
 
 ##############
 # NICE BOXES #

From b327c8a8b7488583c86a3505a2d6dded81c42e91 Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Tue, 4 Mar 2014 17:47:04 +0100
Subject: [PATCH 0237/1587] Remove credit line as requested.

---
 UltiSnips/elixir.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/UltiSnips/elixir.snippets b/UltiSnips/elixir.snippets
index 6abcb8c32..1f53edfbb 100644
--- a/UltiSnips/elixir.snippets
+++ b/UltiSnips/elixir.snippets
@@ -1,5 +1,3 @@
-# Credit: @iurifg
-
 priority -50
 
 snippet do

From 215c5674fbdff1edab0eb0844d9bdfff20bf5e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Ro=CC=88der?=
 <no-spam-github@sebastianroeder.de>
Date: Sat, 1 Mar 2014 21:35:27 +0100
Subject: [PATCH 0238/1587] Add back closing curly braces for puppet type
 snippets

This braces got lost when #70 was merged
---
 UltiSnips/puppet.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/UltiSnips/puppet.snippets b/UltiSnips/puppet.snippets
index a8fc1ed8d..1b2cfc574 100644
--- a/UltiSnips/puppet.snippets
+++ b/UltiSnips/puppet.snippets
@@ -75,6 +75,7 @@ snippet file "File resource type" b
 file { '${1:name}':
 	source => "puppet://${2:path}",
 	mode   => ${3:mode},
+}
 endsnippet
 
 snippet File "Defaults for file" b
@@ -88,6 +89,7 @@ snippet group "Group resource type" b
 group { '${1:groupname}':
 	ensure => ${3:present},
 	gid    => ${2:gid},
+}
 endsnippet
 
 snippet mount "Mount resource type" b
@@ -114,6 +116,7 @@ user { '${1:username}':
 	home       => ${6:homedirectory},
 	managehome => false,
 	require    => Group['${7:group'}],
+}
 endsnippet
 
 snippet service "Service resource type" b

From 929aceebb70359d2e1f05056dcf50abe75ac54f0 Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Wed, 5 Mar 2014 06:44:16 +0100
Subject: [PATCH 0239/1587] Adjusted priority again.

---
 UltiSnips/all.snippets | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 3e136caea..532010e7b 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -1,9 +1,10 @@
 # This file contains snippets that are always defined. I personally
 # have snippets for signatures and often needed texts
 
-# sligthly lower priority than everything else. After all these should
-# overwrite.
-priority -51
+# sligthly lower priority than everything else since specialized versions
+# should overwrite. The user needs to adjust her priority in her snippets to
+# ~-55 so that other filetypes will still overwrite.
+priority -60
 
 ##############
 # NICE BOXES #

From 8c1fadfe94eb7b0219645c2d3aa3742ad20482ba Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Wed, 5 Mar 2014 08:52:50 +0100
Subject: [PATCH 0240/1587] fixed a syntax error in vim.snippets.

---
 snippets/vim.snippets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index dd1e65e80..8e8093b9d 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -25,9 +25,8 @@ snippet for
 snippet forkv
 	for [${1},${2}] in items(${3})
 		${0}
-            unlet $1 $2
+		unlet $1 $2
 	endfor
-
 snippet wh
 	while ${1}
 		${0}

From 56324b8d1aba82b209ba5426cf4dd1d2ba61d9dc Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Thu, 6 Mar 2014 15:15:01 +0100
Subject: [PATCH 0241/1587] Added label snippet and added labels to ali and eq

---
 snippets/tex.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index f3c090e68..53abc04de 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -34,6 +34,7 @@ snippet center
 # Align(ed)
 snippet ali
 	\begin{align${1:ed}}
+		\label{eq:${2}}
 		${0}
 	\end{align$1}
 # Gather(ed)
@@ -44,6 +45,7 @@ snippet gat
 # Equation
 snippet eq
 	\begin{equation}
+		\label{eq:${2}}
 		${0}
 	\end{equation}
 # Equation
@@ -61,6 +63,9 @@ snippet eqnarray
 	\begin{eqnarray}
 		${0}
 	\end{eqnarray}
+# Label
+snippet lab
+	\label{${1:eq:}${2:fig:}${3:tab:}${0}}
 # Enumerate
 snippet enum
 	\begin{enumerate}

From 7ce665eeac8d3ca32d80a471f67e9ab5db340c86 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Thu, 6 Mar 2014 16:59:09 +0100
Subject: [PATCH 0242/1587] Fixed citation snippets and added citea and citey

---
 snippets/tex.snippets | 148 ++++++++++++++++++++++--------------------
 1 file changed, 76 insertions(+), 72 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 53abc04de..c5c20028a 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -14,174 +14,178 @@ snippet dmo
 
 #DOCUMENT
 # \begin{}...\end{}
-snippet begin
+	snippet begin
 	\begin{${1:env}}
-		${0}
+	${0}
 	\end{$1}
 # Tabular
-snippet tab
+	snippet tab
 	\begin{${1:tabular}}{${2:c}}
 	${0}
 	\end{$1}
-snippet thm
+	snippet thm
 	\begin[${1:author}]{${2:thm}}
 	${0}
 	\end{$2}
-snippet center
+	snippet center
 	\begin{center}
-		${0}
+	${0}
 	\end{center}
 # Align(ed)
-snippet ali
+	snippet ali
 	\begin{align${1:ed}}
-		\label{eq:${2}}
-		${0}
+	\label{eq:${2}}
+	${0}
 	\end{align$1}
 # Gather(ed)
-snippet gat
+	snippet gat
 	\begin{gather${1:ed}}
-		${0}
+	${0}
 	\end{gather$1}
 # Equation
-snippet eq
+	snippet eq
 	\begin{equation}
-		\label{eq:${2}}
-		${0}
+	\label{eq:${2}}
+	${0}
 	\end{equation}
 # Equation
-snippet eq*
+	snippet eq*
 	\begin{equation*}
-		${0}
+	${0}
 	\end{equation*}
 # Unnumbered Equation
-snippet \
-	\[
+	snippet \
+		\[
 		${0}
-	\]
+		\]
 # Equation array
-snippet eqnarray
-	\begin{eqnarray}
+		snippet eqnarray
+		\begin{eqnarray}
 		${0}
-	\end{eqnarray}
+		\end{eqnarray}
 # Label
-snippet lab
-	\label{${1:eq:}${2:fig:}${3:tab:}${0}}
+		snippet lab
+		\label{${1:eq:}${2:fig:}${3:tab:}${0}}
 # Enumerate
-snippet enum
-	\begin{enumerate}
+		snippet enum
+		\begin{enumerate}
 		\item ${0}
-	\end{enumerate}
+		\end{enumerate}
 # Itemize
-snippet itemize
-	\begin{itemize}
+		snippet itemize
+		\begin{itemize}
 		\item ${0}
-	\end{itemize}
-snippet item
-	\item ${1}
+		\end{itemize}
+		snippet item
+		\item ${1}
 # Description
-snippet desc
-	\begin{description}
+		snippet desc
+		\begin{description}
 		\item[${1}] ${0}
-	\end{description}
+		\end{description}
 # Endless new item
-snippet ]i
-	\item ${1}
-	${0:]i}
+		snippet ]i
+		\item ${1}
+		${0:]i}
 # Matrix
-snippet mat
-	\begin{${1:p/b/v/V/B/small}matrix}
+		snippet mat
+		\begin{${1:p/b/v/V/B/small}matrix}
 		${0}
-	\end{$1matrix}
+		\end{$1matrix}
 # Cases
-snippet cas
-	\begin{cases}
+		snippet cas
+		\begin{cases}
 		${1:equation}, &\text{ if }${2:case}\\
-		${0}
-	\end{cases}
+			${0}
+			\end{cases}
 # Split
-snippet spl
-	\begin{split}
-		${0}
-	\end{split}
+			snippet spl
+			\begin{split}
+			${0}
+			\end{split}
 # Part
-snippet part
-	\part{${1:part name}} % (fold)
+	snippet part
+\part{${1:part name}} % (fold)
 	\label{prt:${2:$1}}
 	${0}
-	% part $2 (end)
+% part $2 (end)
 # Chapter
-snippet cha
+	snippet cha
 	\chapter{${1:chapter name}}
 	\label{cha:${2:$1}}
 	${0}
 # Section
-snippet sec
+	snippet sec
 	\section{${1:section name}}
 	\label{sec:${2:$1}}
 	${0}
 # Section without number
-snippet sec*
+	snippet sec*
 	\section*{${1:section name}}
 	\label{sec:${2:$1}}
 	${0}
 # Sub Section
-snippet sub
+	snippet sub
 	\subsection{${1:subsection name}}
 	\label{sub:${2:$1}}
 	${0}
 # Sub Section without number
-snippet sub*
+	snippet sub*
 	\subsection*{${1:subsection name}}
 	\label{sub:${2:$1}}
 	${0}
 # Sub Sub Section
-snippet subs
+	snippet subs
 	\subsubsection{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
 	${0}
 # Sub Sub Section without number
-snippet subs*
+	snippet subs*
 	\subsubsection*{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
 	${0}
 # Paragraph
-snippet par
+	snippet par
 	\paragraph{${1:paragraph name}}
 	\label{par:${2:$1}}
 	${0}
 # Sub Paragraph
-snippet subp
+	snippet subp
 	\subparagraph{${1:subparagraph name}}
 	\label{subp:${2:$1}}
 	${0}
-snippet ni
+	snippet ni
 	\noindent
 	${0}
 #References
-snippet itd
+	snippet itd
 	\item[${1:description}] ${0:item}
-snippet figure
+	snippet figure
 	${1:Figure}~\ref{${2:fig:}}
-snippet table
+	snippet table
 	${1:Table}~\ref{${2:tab:}}
-snippet listing
+	snippet listing
 	${1:Listing}~\ref{${2:list}}
-snippet section
+	snippet section
 	${1:Section}~\ref{sec:${2}} ${0}
-snippet page
+	snippet page
 	${1:page}~\pageref{${2}} ${0}
-snippet index
+	snippet index
 	\index{${1:index}} ${0}
 #Citations
 snippet citen
-	\cite{$1} ${0}
+	\citen{${1}} ${0}
 # bibtex commands
 snippet citep
-	\citep{$1} ${0}
+	\citep{${1}} ${0}
 snippet citet
-	\citet{$1} ${0}
+	\citet{${1}} ${0}
 snippet cite
 	\cite[${1}]{${2}} ${0}
+snippet citea
+	\citeauthor{${1}} ${0}
+snippet citey
+	\citeyear{${1}} ${0}
 snippet fcite
 	\footcite[${1}]{${2}}${0}
 #Formating text: italic, bold, underline, small capital, emphase ..

From ab0e535cb16527e1532a52b61fde9f3bb3dec9da Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Thu, 6 Mar 2014 17:10:53 +0100
Subject: [PATCH 0243/1587] Fixed indentation issue

---
 snippets/tex.snippets | 138 +++++++++++++++++++++---------------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index c5c20028a..dbb565142 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -14,163 +14,163 @@ snippet dmo
 
 #DOCUMENT
 # \begin{}...\end{}
-	snippet begin
+snippet begin
 	\begin{${1:env}}
-	${0}
+		${0}
 	\end{$1}
 # Tabular
-	snippet tab
+snippet tab
 	\begin{${1:tabular}}{${2:c}}
-	${0}
+		${0}
 	\end{$1}
-	snippet thm
+snippet thm
 	\begin[${1:author}]{${2:thm}}
-	${0}
+		${0}
 	\end{$2}
-	snippet center
+snippet center
 	\begin{center}
-	${0}
+		${0}
 	\end{center}
 # Align(ed)
-	snippet ali
+snippet ali
 	\begin{align${1:ed}}
 	\label{eq:${2}}
-	${0}
+		${0}
 	\end{align$1}
 # Gather(ed)
-	snippet gat
+snippet gat
 	\begin{gather${1:ed}}
-	${0}
+		${0}
 	\end{gather$1}
 # Equation
-	snippet eq
+snippet eq
 	\begin{equation}
 	\label{eq:${2}}
-	${0}
+		${0}
 	\end{equation}
 # Equation
-	snippet eq*
+snippet eq*
 	\begin{equation*}
-	${0}
+		${0}
 	\end{equation*}
 # Unnumbered Equation
-	snippet \
-		\[
+snippet \
+	\[
 		${0}
-		\]
+	\]
 # Equation array
-		snippet eqnarray
-		\begin{eqnarray}
+snippet eqnarray
+	\begin{eqnarray}
 		${0}
-		\end{eqnarray}
+	\end{eqnarray}
 # Label
-		snippet lab
-		\label{${1:eq:}${2:fig:}${3:tab:}${0}}
+snippet lab
+	\label{${1:eq:}${2:fig:}${3:tab:}${0}}
 # Enumerate
-		snippet enum
-		\begin{enumerate}
+snippet enum
+	\begin{enumerate}
 		\item ${0}
-		\end{enumerate}
+	\end{enumerate}
 # Itemize
-		snippet itemize
-		\begin{itemize}
+snippet itemize
+	\begin{itemize}
 		\item ${0}
-		\end{itemize}
-		snippet item
-		\item ${1}
+	\end{itemize}
+snippet item
+	\item ${1}
 # Description
-		snippet desc
-		\begin{description}
+snippet desc
+	\begin{description}
 		\item[${1}] ${0}
-		\end{description}
+	\end{description}
 # Endless new item
-		snippet ]i
-		\item ${1}
+snippet ]i
+	\item ${1}
 		${0:]i}
 # Matrix
-		snippet mat
-		\begin{${1:p/b/v/V/B/small}matrix}
+snippet mat
+	\begin{${1:p/b/v/V/B/small}matrix}
 		${0}
-		\end{$1matrix}
+	\end{$1matrix}
 # Cases
-		snippet cas
-		\begin{cases}
+snippet cas
+	\begin{cases}
 		${1:equation}, &\text{ if }${2:case}\\
-			${0}
-			\end{cases}
+		${0}
+	\end{cases}
 # Split
-			snippet spl
-			\begin{split}
-			${0}
-			\end{split}
+snippet spl
+	\begin{split}
+		${0}
+	\end{split}
 # Part
-	snippet part
-\part{${1:part name}} % (fold)
+snippet part
+	\part{${1:part name}} % (fold)
 	\label{prt:${2:$1}}
 	${0}
-% part $2 (end)
+	% part $2 (end)
 # Chapter
-	snippet cha
+snippet cha
 	\chapter{${1:chapter name}}
 	\label{cha:${2:$1}}
 	${0}
 # Section
-	snippet sec
+snippet sec
 	\section{${1:section name}}
 	\label{sec:${2:$1}}
 	${0}
 # Section without number
-	snippet sec*
+snippet sec*
 	\section*{${1:section name}}
 	\label{sec:${2:$1}}
 	${0}
 # Sub Section
-	snippet sub
+snippet sub
 	\subsection{${1:subsection name}}
 	\label{sub:${2:$1}}
 	${0}
 # Sub Section without number
-	snippet sub*
+snippet sub*
 	\subsection*{${1:subsection name}}
 	\label{sub:${2:$1}}
 	${0}
 # Sub Sub Section
-	snippet subs
+snippet subs
 	\subsubsection{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
 	${0}
 # Sub Sub Section without number
-	snippet subs*
+snippet subs*
 	\subsubsection*{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
 	${0}
 # Paragraph
-	snippet par
+snippet par
 	\paragraph{${1:paragraph name}}
 	\label{par:${2:$1}}
 	${0}
 # Sub Paragraph
-	snippet subp
+snippet subp
 	\subparagraph{${1:subparagraph name}}
 	\label{subp:${2:$1}}
 	${0}
-	snippet ni
+snippet ni
 	\noindent
 	${0}
 #References
-	snippet itd
+snippet itd
 	\item[${1:description}] ${0:item}
-	snippet figure
+snippet figure
 	${1:Figure}~\ref{${2:fig:}}
-	snippet table
+snippet table
 	${1:Table}~\ref{${2:tab:}}
-	snippet listing
+snippet listing
 	${1:Listing}~\ref{${2:list}}
-	snippet section
+snippet section
 	${1:Section}~\ref{sec:${2}} ${0}
-	snippet page
+snippet page
 	${1:page}~\pageref{${2}} ${0}
-	snippet index
+snippet index
 	\index{${1:index}} ${0}
 #Citations
 snippet citen
@@ -212,7 +212,7 @@ snippet ft
 snippet fig
 	\begin{figure}
 	\begin{center}
-	    \includegraphics[scale=${1}]{Figures/${2}}
+		\includegraphics[scale=${1}]{Figures/${2}}
 	\end{center}
 	\caption{${3}}
 	\label{fig:${4}}

From b2a91d1ea38d46be57a89e52a02cb7940e59eea4 Mon Sep 17 00:00:00 2001
From: Ryan Wang <wongyouth@gmail.com>
Date: Wed, 12 Mar 2014 13:04:54 +0800
Subject: [PATCH 0244/1587] add options_for_select

add method `options_for_select` from Rails.
---
 snippets/eruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index 95418350d..bc13fcbb0 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -107,6 +107,8 @@ snippet ntc
 	<%= number_to_currency(${1}) %>
 snippet ofcfs
 	<%= options_from_collection_for_select ${1:collection}, ${2:value_method}, ${3:text_method}, ${0:selected_value} %>
+snippet ofs
+	<%= options_for_select ${1:collection}, ${2:value_method} %>
 snippet rf
 	<%= render :file => "${1:file}"${0} %>
 snippet rt

From 9371c648e18c765abdd811725fa57d73e937de00 Mon Sep 17 00:00:00 2001
From: Ryan Wang <wongyouth@gmail.com>
Date: Wed, 12 Mar 2014 13:35:17 +0800
Subject: [PATCH 0245/1587] add rails callbak methods

---
 snippets/ruby.snippets | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 1798e08bf..e4be7825c 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -749,8 +749,45 @@ snippet mapwo
 	${1:map}.with_options :${2:controller} => '${3:thing}' do |$3|
 		${0}
 	end
+
+# before callback
+snippet mbv
+  before_validation :${0:method}
+snippet mbc
+  before_create :${0:method}
+snippet mbu
+  before_update :${0:method}
 snippet mbs
 	before_save :${0:method}
+snippet mbd
+  before_destroy :${0:method}
+
+# after callback
+snippet mav
+  after_validation :${0:method}
+snippet maf
+  after_find :${0:method}
+snippet mat
+  after_touch :${0:method}
+snippet mac
+  after_create :${0:method}
+snippet mau
+  after_update :${0:method}
+snippet mas
+  after_save :${0:method}
+snippet mad
+  after_destroy :${0:method}
+snippet mrc
+
+# around callback
+  around_create :${0:method}
+snippet mru
+  around_update :${0:method}
+snippet mrs
+  around_save :${0:method}
+snippet mrd
+  around_destroy :${0:method}
+
 snippet mcht
 	change_table :${1:table_name} do |t|
 		${0}

From 7924eee16b4bff6e3ca8745605bfc392e2915af1 Mon Sep 17 00:00:00 2001
From: Ryan Wang <wongyouth@gmail.com>
Date: Fri, 14 Mar 2014 23:00:50 +0800
Subject: [PATCH 0246/1587] change abbreviation to c for controller

---
 snippets/ruby.snippets | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index e4be7825c..4c0757823 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -750,42 +750,46 @@ snippet mapwo
 		${0}
 	end
 
+###########################
+#   controller snippets   #
+###########################
+
 # before callback
-snippet mbv
+snippet cbv
   before_validation :${0:method}
-snippet mbc
+snippet cbc
   before_create :${0:method}
-snippet mbu
+snippet cbu
   before_update :${0:method}
-snippet mbs
+snippet cbs
 	before_save :${0:method}
-snippet mbd
+snippet cbd
   before_destroy :${0:method}
 
 # after callback
-snippet mav
+snippet cav
   after_validation :${0:method}
-snippet maf
+snippet caf
   after_find :${0:method}
-snippet mat
+snippet cat
   after_touch :${0:method}
-snippet mac
+snippet cac
   after_create :${0:method}
-snippet mau
+snippet cau
   after_update :${0:method}
-snippet mas
+snippet cas
   after_save :${0:method}
-snippet mad
+snippet cad
   after_destroy :${0:method}
-snippet mrc
 
 # around callback
+snippet crc
   around_create :${0:method}
-snippet mru
+snippet cru
   around_update :${0:method}
-snippet mrs
+snippet crs
   around_save :${0:method}
-snippet mrd
+snippet crd
   around_destroy :${0:method}
 
 snippet mcht
@@ -933,6 +937,8 @@ snippet mct
 	create_table :${1:table_name} do |t|
 		${0}
 	end
+snippet mdt
+	drop_table :${1:table_name}
 snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
 	class ${1:class_name} < ActiveRecord::Migration
 		def up

From dfc456ea492ef757ed1e593de23fc8339402796e Mon Sep 17 00:00:00 2001
From: Ryan Wang <wongyouth@gmail.com>
Date: Sat, 15 Mar 2014 00:32:23 +0800
Subject: [PATCH 0247/1587] respect the  convention

---
 snippets/ruby.snippets | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 4c0757823..0083ccae8 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -756,41 +756,41 @@ snippet mapwo
 
 # before callback
 snippet cbv
-  before_validation :${0:method}
+	before_validation :${0:method}
 snippet cbc
-  before_create :${0:method}
+	before_create :${0:method}
 snippet cbu
-  before_update :${0:method}
+	before_update :${0:method}
 snippet cbs
 	before_save :${0:method}
 snippet cbd
-  before_destroy :${0:method}
+	before_destroy :${0:method}
 
 # after callback
 snippet cav
-  after_validation :${0:method}
+	after_validation :${0:method}
 snippet caf
-  after_find :${0:method}
+	after_find :${0:method}
 snippet cat
-  after_touch :${0:method}
+	after_touch :${0:method}
 snippet cac
-  after_create :${0:method}
+	after_create :${0:method}
 snippet cau
-  after_update :${0:method}
+	after_update :${0:method}
 snippet cas
-  after_save :${0:method}
+	after_save :${0:method}
 snippet cad
-  after_destroy :${0:method}
+	after_destroy :${0:method}
 
 # around callback
 snippet crc
-  around_create :${0:method}
+	around_create :${0:method}
 snippet cru
-  around_update :${0:method}
+	around_update :${0:method}
 snippet crs
-  around_save :${0:method}
+	around_save :${0:method}
 snippet crd
-  around_destroy :${0:method}
+	around_destroy :${0:method}
 
 snippet mcht
 	change_table :${1:table_name} do |t|

From db3b240783cbc5858dceee6b864fb37758062dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20L=C3=B3pez=20P=C3=A9rez?= <jorge@adobo.org>
Date: Wed, 19 Mar 2014 14:43:08 +0100
Subject: [PATCH 0248/1587] Fix PHP getter and setter UltiSnips snippet

Was broken due to complex regular expressions applied to $1,
which made UltiSnips to complain about not knowing it.

Simplified the snippet using the already working getter and setter snippets.
---
 UltiSnips/php.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 24f6cc527..84003a722 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -120,19 +120,19 @@ endsnippet
 
 snippet gs "PHP Class Getter Setter" b
 /*
- * Getter for ${1/(\w+)\s*;/$1/}
+ * Getter for $1
  */
-public function get${1/(\w+)\s*;/\u$1/}()
+public function get${1/\w+\s*/\u$0/}()
 {
-	return $this->${1/(\w+)\s*;/$1/};$2
+	return $this->$1;$2
 }
 
 /*
- * Setter for ${1/(\w+)\s*;/$1/}
+ * Setter for $1
  */
-public function set${1/(\w+)\s*;/\u$1/}($${1/(\w+)\s*;/$1/})
+public function set${1/\w+\s*/\u$0/}($$1)
 {
-	$this->${1/(\w+)\s*;/$1/} = $${1/(\w+)\s*;/$1/};$3
+	$this->$1 = $$1;$3
 	${4:return $this;}
 }
 $0

From fc50b1584eb5c3d2525814c085186508b1773612 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Fri, 21 Mar 2014 14:21:33 +0100
Subject: [PATCH 0249/1587] Syntax changes in accordance with Google.

---
 snippets/r.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/r.snippets b/snippets/r.snippets
index c7ca5acae..bcc673360 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -25,7 +25,7 @@ snippet ei
 
 # functions
 snippet fun
-	${1:name} = function (${2:variables}) {
+	${1:name} <- function (${2:variables}) {
 		${0}
 	}
 snippet ret
@@ -39,7 +39,7 @@ snippet c
 snippet li
 	list(${0:items})
 snippet mat
-	matrix(${1:data}, nrow=${2:rows}, ncol=${0:cols})
+	matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
 
 # apply functions
 snippet apply
@@ -100,7 +100,7 @@ snippet pl
 snippet ggp
 	ggplot(${1:data}, aes(${0:aesthetics}))
 snippet img
-	${1:(jpeg,bmp,png,tiff)}(filename="${2:filename}", width=${3}, height=${4}, unit="${5}")
+	${1:(jpeg,bmp,png,tiff)}(filename = '${2:filename}', width = ${3}, height = ${4}, unit = '${5}')
 	${0:plot}
 	dev.off()
 

From 391d4fea4725df2067bf6bbd0af65c3fc004bf7b Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Sat, 22 Mar 2014 15:03:16 -0400
Subject: [PATCH 0250/1587] Add python google style docstrings.

---
 UltiSnips/python.snippets | 54 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 357d01d3b..dea562d82 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -34,13 +34,30 @@ global !p
 NORMAL  = 0x1
 DOXYGEN = 0x2
 SPHINX  = 0x3
+GOOGLE  = 0x4
 
 SINGLE_QUOTES = 0x1
 DOUBLE_QUOTES = 0x2
 
+
+class Arg(object):
+	def __init__(self, arg):
+		self.arg = arg
+		self.name = arg.split('=')[0].strip()
+
+	def __str__(self):
+		return self.name
+	
+	def __unicode__(self):
+		return self.name
+	
+	def is_kwarg(self):
+		return '=' in self.arg
+
+
 def get_args(arglist):
-	args = [arg.split('=')[0].strip() for arg in arglist.split(',') if arg]
-	args = [arg for arg in args if arg and arg != "self"]
+	args = [Arg(arg) for arg in arglist.split(',') if arg]
+	args = [arg for arg in args if arg.name != 'self']
 
 	return args
 
@@ -61,6 +78,7 @@ def get_style(snip):
 
 	if    style == "doxygen": return DOXYGEN
 	elif  style == "sphinx": return SPHINX
+	elif  style == "google": return GOOGLE
 	else: return NORMAL
 
 
@@ -71,6 +89,8 @@ def format_arg(arg, style):
 		return ":param %s: @todo" % arg
 	elif style == NORMAL:
 		return ":%s: @todo" % arg
+	elif style == GOOGLE:
+		return "%s (@todo): @todo" % arg
 
 
 def format_return(style):
@@ -78,6 +98,8 @@ def format_return(style):
 		return "@return: @todo"
 	elif style in (NORMAL, SPHINX):
 		return ":returns: @todo"
+	elif style == GOOGLE:
+		return "Returns: @todo"
 
 
 def write_docstring_args(args, snip):
@@ -89,8 +111,32 @@ def write_docstring_args(args, snip):
 
 	style = get_style(snip)
 
-	for arg in args:
-		snip += format_arg(arg, style)
+	if style == GOOGLE:
+		write_google_docstring_args(args, snip)
+	else:
+		for arg in args:
+			snip += format_arg(arg, style)
+
+
+def write_google_docstring_args(args, snip):
+	kwargs = [arg for arg in args if arg.is_kwarg()]
+	args = [arg for arg in args if not arg.is_kwarg()]
+
+	if args:
+		snip += "Args:"
+		snip.shift()
+		for arg in args:
+			snip += format_arg(arg, GOOGLE)
+		snip.unshift()
+		snip.rv += '\n' + snip.mkline('', indent='')
+
+	if kwargs:
+		snip += "Kwargs:"
+		snip.shift()
+		for kwarg in kwargs:
+			snip += format_arg(kwarg, GOOGLE)
+		snip.unshift()
+		snip.rv += '\n' + snip.mkline('', indent='')
 
 
 def write_init_body(args, parents, snip):

From 16630a5c8e99de906d6cb623332441db66ea0adb Mon Sep 17 00:00:00 2001
From: gfixler <gfixler@gmail.com>
Date: Sat, 22 Mar 2014 22:33:17 -0700
Subject: [PATCH 0251/1587] Fix spelling throughout UltiSnips/python.snippets

---
 UltiSnips/python.snippets | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index dea562d82..64b5cfd2c 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -68,7 +68,7 @@ def get_quoting_style(snip):
 		return SINGLE_QUOTES
 	return DOUBLE_QUOTES
 
-def tripple_quotes(snip):
+def triple_quotes(snip):
 	if get_quoting_style(snip) == SINGLE_QUOTES:
 		return "'''"
 	return '"""'
@@ -104,7 +104,7 @@ def format_return(style):
 
 def write_docstring_args(args, snip):
 	if not args:
-		snip.rv += ' {0}'.format(tripple_quotes(snip))
+		snip.rv += ' {0}'.format(triple_quotes(snip))
 		return
 
 	snip.rv += '\n' + snip.mkline('', indent='')
@@ -166,10 +166,10 @@ endglobal
 snippet class "class with docstrings" b
 class ${1:MyClass}(${2:object}):
 
-	`!p snip.rv = tripple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = tripple_quotes(snip)`
+	`!p snip.rv = triple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = triple_quotes(snip)`
 
 	def __init__(self$4):
-		`!p snip.rv = tripple_quotes(snip)`${5:@todo: to be defined1.}`!p
+		`!p snip.rv = triple_quotes(snip)`${5:@todo: to be defined1.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -178,7 +178,7 @@ args = get_args(t[4])
 write_docstring_args(args, snip)
 if args:
 	snip.rv += '\n' + snip.mkline('', indent='')
-	snip += '{0}'.format(tripple_quotes(snip))
+	snip += '{0}'.format(triple_quotes(snip))
 
 write_init_body(args, t[2], snip)
 `
@@ -189,7 +189,7 @@ endsnippet
 snippet slotclass "class with slots and docstrings" b
 class ${1:MyClass}(${2:object}):
 
-	`!p snip.rv = tripple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = tripple_quotes(snip)`
+	`!p snip.rv = triple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = triple_quotes(snip)`
 `!p
 snip >> 1
 args = get_args(t[4])
@@ -197,7 +197,7 @@ write_slots_args(args, snip)
 `
 
 	def __init__(self$4):
-		`!p snip.rv = tripple_quotes(snip)`${5:@todo: to be defined.}`!p
+		`!p snip.rv = triple_quotes(snip)`${5:@todo: to be defined.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -206,7 +206,7 @@ args = get_args(t[4])
 write_docstring_args(args, snip)
 if args:
 	snip.rv += '\n' + snip.mkline('', indent='')
-	snip += tripple_quotes(snip)
+	snip += triple_quotes(snip)
 
 write_init_body(args, t[2], snip)
 `
@@ -399,7 +399,7 @@ snippet def "function with docstrings" b
 def ${1:function}(`!p
 if snip.indent:
 	snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
-	`!p snip.rv = tripple_quotes(snip)`${4:@todo: Docstring for $1.}`!p
+	`!p snip.rv = triple_quotes(snip)`${4:@todo: Docstring for $1.}`!p
 snip.rv = ""
 snip >> 1
 
@@ -410,7 +410,7 @@ if args:
 style = get_style(snip)
 snip += format_return(style)
 snip.rv += '\n' + snip.mkline('', indent='')
-snip += tripple_quotes(snip) `
+snip += triple_quotes(snip) `
 	${0:pass}
 endsnippet
 
@@ -436,7 +436,7 @@ endsnippet
 
 snippet rwprop "Read write property" b
 def ${1:name}():
-	`!p snip.rv = tripple_quotes(snip) if t[2] else ''
+	`!p snip.rv = triple_quotes(snip) if t[2] else ''
 `${2:@todo: Docstring for $1.}`!p
 if t[2]:
 	snip >> 1
@@ -445,7 +445,7 @@ if t[2]:
 	snip.rv += '\n' + snip.mkline('', indent='')
 	snip += format_return(style)
 	snip.rv += '\n' + snip.mkline('', indent='')
-	snip += tripple_quotes(snip)
+	snip += triple_quotes(snip)
 else:
 	snip.rv = ""`
 	def fget(self):
@@ -564,7 +564,7 @@ endsnippet
 snippet testcase "pyunit testcase" b
 class Test${1:Class}(${2:unittest.TestCase}):
 
-	`!p snip.rv = tripple_quotes(snip)`${3:Test case docstring.}`!p snip.rv = tripple_quotes(snip)`
+	`!p snip.rv = triple_quotes(snip)`${3:Test case docstring.}`!p snip.rv = triple_quotes(snip)`
 
 	def setUp(self):
 		${4:pass}

From 1ffdf752b647afd921bc8b094e221de9be0d8ea9 Mon Sep 17 00:00:00 2001
From: Piotr Yordanov <piotr.yordanov@gmail.com>
Date: Mon, 24 Mar 2014 03:29:41 +0000
Subject: [PATCH 0252/1587] Added Jade templates

---
 snippets/jade.snippets | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 snippets/jade.snippets

diff --git a/snippets/jade.snippets b/snippets/jade.snippets
new file mode 100644
index 000000000..55f0af7bf
--- /dev/null
+++ b/snippets/jade.snippets
@@ -0,0 +1,18 @@
+# Angular HTML
+snippet rep
+	div(ng-repeat='${1} in ${2}')
+
+snippet repf
+	div(ng-repeat='${1} in ${2}' | ${3})
+
+snippet repi
+	div(ng-repeat='${1} in ${2}' track by $index)
+
+snippet hide
+	div(ng-hide='${1}')
+
+snippet show
+	div(ng-show='${1}')
+
+snippet if
+	div(ng-if='${1}')

From 88cd206a193a3488b01a77137254eb18b0d34017 Mon Sep 17 00:00:00 2001
From: Danny Navarro <j@dannynavarro.net>
Date: Mon, 24 Mar 2014 09:46:51 +0100
Subject: [PATCH 0253/1587] Add `OPTIONS_HADDOCK` snippet

---
 snippets/haskell.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index f5f159845..ddb89d9ab 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -1,5 +1,7 @@
 snippet lang
 	{-# LANGUAGE ${0:OverloadedStrings} #-}
+snippet haddock
+	{-# OPTIONS_HADDOCK ${0:hide} #-}
 snippet info
 	-- |
 	-- Module      :  ${1:Module.Namespace}

From fc65844236629e26428dd2f2b4b8aece3e1c3c62 Mon Sep 17 00:00:00 2001
From: Ryan Wang <wongyouth@gmail.com>
Date: Mon, 24 Mar 2014 17:51:34 +0800
Subject: [PATCH 0254/1587] use m as prefix and fix conflicts with other
 snippets

---
 snippets/ruby.snippets | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 0083ccae8..95eca9dca 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -750,46 +750,46 @@ snippet mapwo
 		${0}
 	end
 
-###########################
-#   controller snippets   #
-###########################
+###############################
+#   model callback snippets   #
+###############################
 
 # before callback
-snippet cbv
+snippet mbv
 	before_validation :${0:method}
-snippet cbc
+snippet mbc
 	before_create :${0:method}
-snippet cbu
+snippet mbu
 	before_update :${0:method}
-snippet cbs
+snippet mbs
 	before_save :${0:method}
-snippet cbd
+snippet mbd
 	before_destroy :${0:method}
 
 # after callback
-snippet cav
+snippet mav
 	after_validation :${0:method}
-snippet caf
+snippet maf
 	after_find :${0:method}
-snippet cat
+snippet mat
 	after_touch :${0:method}
-snippet cac
+snippet macr
 	after_create :${0:method}
-snippet cau
+snippet mau
 	after_update :${0:method}
-snippet cas
+snippet mas
 	after_save :${0:method}
-snippet cad
+snippet mad
 	after_destroy :${0:method}
 
 # around callback
-snippet crc
+snippet marc
 	around_create :${0:method}
-snippet cru
+snippet maru
 	around_update :${0:method}
-snippet crs
+snippet mars
 	around_save :${0:method}
-snippet crd
+snippet mard
 	around_destroy :${0:method}
 
 snippet mcht
@@ -937,8 +937,6 @@ snippet mct
 	create_table :${1:table_name} do |t|
 		${0}
 	end
-snippet mdt
-	drop_table :${1:table_name}
 snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
 	class ${1:class_name} < ActiveRecord::Migration
 		def up

From 1d41c715e23a62174cb4ad92ca9a7956e9966c82 Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Wed, 26 Mar 2014 15:39:47 -0400
Subject: [PATCH 0255/1587] Allow java else/elif to be expanded mid line.

---
 UltiSnips/java.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 96cc7a9ee..de15572e6 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -173,13 +173,13 @@ default:
 	$0
 endsnippet
 
-snippet elif "else if" b
+snippet elif "else if"
 else if ($1)`!p nl(snip)`{
 	$0
 }
 endsnippet
 
-snippet /el(se)?/ "else" br
+snippet /el(se)?/ "else" r
 else`!p nl(snip)`{
 	$0
 }

From 0b673c3e59d7e61589d8ddca9875ab3c232815a5 Mon Sep 17 00:00:00 2001
From: Ches Martin <ches@whiskeyandgrits.net>
Date: Thu, 27 Mar 2014 05:37:14 +0700
Subject: [PATCH 0256/1587] Scala snippets fix

---
 snippets/scala.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index 5eddb2c3c..09d69ad3a 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -194,8 +194,9 @@ snippet mhmap
 snippet as
 	${1:name}.asInstanceOf[${2:T}]
 #isInstanceOf[]
+snippet is
 	${1:name}.isInstanceOf[${2:T}]
-#end
+
 #collections methods
 
 #scope() with one arg

From ba94750df1627790ac8fbc7577f1f765cc02da75 Mon Sep 17 00:00:00 2001
From: Muhammad Hallaj Subery <hallaj@users.noreply.github.com>
Date: Thu, 27 Mar 2014 12:08:39 +0800
Subject: [PATCH 0257/1587] Update python.snippets

adding code encoding.
---
 snippets/python.snippets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index d38df5b1a..a7bb708fd 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -1,5 +1,6 @@
 snippet #!
 	#!/usr/bin/env python
+	# -*- coding: utf-8 -*-
 snippet imp
 	import ${0:module}
 snippet uni

From ad8883ddcaf27414e96dfc521aba9260cfc48e8c Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Fri, 28 Mar 2014 12:10:19 -0400
Subject: [PATCH 0258/1587] Fix java setter method param case, remove return.

The paramater was keeping the case of the setter name.  It should
have been lowercased.  The other uses of the paramter were already
lowercased correctly.

There should also not be a return statement in a void method.
---
 UltiSnips/java.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index de15572e6..18746b4f5 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -343,8 +343,8 @@ public ${1:String} get${2:Name}() {
 endsnippet
 
 snippet /set(ter)?/ "setter" br
-public void set${1:Name}(${2:String} $1) {
-	return this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+public void set${1:Name}(${2:String} `!p snip.rv = t[1].lower()`) {
+	this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
 }
 endsnippet
 

From e5f3d6bdf55ebd2dc6e129cb58bf4c8faac289f0 Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Fri, 28 Mar 2014 15:32:39 -0400
Subject: [PATCH 0259/1587] Change java set/get snippets to use mixedCase.

The java setter and getter snippets were incorrectly formatting the
set/get name as all lowercase.  It should be mixed case, as per java's
coding standard.

A new function was made (mixedCase) to handle that.
---
 UltiSnips/java.snippets | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 18746b4f5..a9aa55fa0 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -27,6 +27,9 @@ def getArgs(group):
 def camel(word):
 	return word[0].upper() + word[1:]
 
+def mixedCase(word):
+	return word[0].lower() + word[1:]
+
 endglobal
 
 snippet sleep "try sleep catch" b
@@ -338,23 +341,23 @@ endsnippet
 
 snippet /get(ter)?/ "getter" br
 public ${1:String} get${2:Name}() {
-	return `!p snip.rv = t[2].lower()`;
+	return `!p snip.rv = mixedCase(t[2])`;
 }
 endsnippet
 
 snippet /set(ter)?/ "setter" br
-public void set${1:Name}(${2:String} `!p snip.rv = t[1].lower()`) {
-	this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+public void set${1:Name}(${2:String} `!p snip.rv = mixedCase(t[1])`) {
+	this.`!p snip.rv = mixedCase(t[1])` = `!p snip.rv = mixedCase(t[1])`;
 }
 endsnippet
 
 snippet /se?tge?t|ge?tse?t|gs/ "setter and getter" br
-public void set${1:Name}(${2:String} `!p snip.rv = t[1].lower()`) {
-	this.`!p snip.rv = t[1].lower()` = `!p snip.rv = t[1].lower()`;
+public void set${1:Name}(${2:String} `!p snip.rv = mixedCase(t[1])`) {
+	this.`!p snip.rv = mixedCase(t[1])` = `!p snip.rv = mixedCase(t[1])`;
 }
 
 public $2 get$1() {
-	return `!p snip.rv = t[1].lower()`;
+	return `!p snip.rv = mixedCase(t[1])`;
 }
 endsnippet
 

From 6541994397033efe43e53b66984806667680fbfb Mon Sep 17 00:00:00 2001
From: Brandon Hilkert <brandonhilkert@gmail.com>
Date: Fri, 28 Mar 2014 19:45:20 -0400
Subject: [PATCH 0260/1587] Add asi => assert_includes

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 95eca9dca..6ee11d4b9 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -479,6 +479,8 @@ snippet asne
 	assert_not_equal ${1:unexpected}, ${2:actual}
 snippet asid
 	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2 ** -20}
+snippet asi
+	assert_includes ${1:collection}, ${2:object}
 snippet asio
 	assert_instance_of ${1:ExpectedClass}, ${2:actual_instance}
 snippet asko

From 77bc9bdf8012281d580f12c0d727dc85e7dabee8 Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sat, 29 Mar 2014 16:28:00 -0500
Subject: [PATCH 0261/1587] Add support for rnoweb filetype

Rnoweb is a filetype that combines LaTeX and R. It's used by systems like Sweave and Knitr.
---
 UltiSnips/rnoweb.snippets | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 UltiSnips/rnoweb.snippets

diff --git a/UltiSnips/rnoweb.snippets b/UltiSnips/rnoweb.snippets
new file mode 100644
index 000000000..37eece620
--- /dev/null
+++ b/UltiSnips/rnoweb.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends tex

From 53f8dd5a7ad3acc4f3e7a6c87e9936a1905a3890 Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sat, 29 Mar 2014 16:46:23 -0500
Subject: [PATCH 0262/1587] Add in r.snippets file

I converted these over from the snipMate r.snippets in the snippets/ directory and removed some ones.
---
 UltiSnips/r.snippets | 136 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 UltiSnips/r.snippets

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
new file mode 100644
index 000000000..bbfbaaa68
--- /dev/null
+++ b/UltiSnips/r.snippets
@@ -0,0 +1,136 @@
+snippet #! "Hashbang for Rscript"
+#!/usr/bin/env Rscript
+endsnippet
+
+# includes
+snippet lib "Import a library"
+library(${0:package})
+endsnippet
+
+snippet req "Require a file"
+require(${0:package})
+endsnippet
+
+snippet source "Source a file"
+source('${0:file}')
+endsnippet
+
+# conditionals
+snippet if "If statement"
+if (${1:condition}) {
+	${0}
+}
+endsnippet
+
+snippet el "Else statement"
+else {
+	${0}
+}
+endsnippet
+
+snippet ei "Else-If statement"
+else if (${1:condition}) {
+	${0}
+}
+endsnippet
+
+# functions
+snippet fun "Function definition"
+${1:name} = function (${2:variables}) {
+	${0}
+}
+endsnippet
+
+snippet ret "Return call"
+return(${0})
+endsnippet
+
+# dataframes, lists, etc
+snippet df "Data frame"
+${1:name}[${2:rows}, ${0:cols}]
+endsnippet
+
+snippet c "C function"
+c(${0:items})
+endsnippet
+
+snippet li "List function"
+list(${0:items})
+endsnippet
+
+snippet mat "Matrix function"
+matrix(${1:data}, nrow=${2:rows}, ncol=${0:cols})
+endsnippet
+
+# apply functions
+snippet apply "Apply function"
+apply(${1:array}, ${2:margin}, ${0:function})
+endsnippet
+
+snippet lapply "lapply function"
+lapply(${1:list}, ${0:function})
+endsnippet
+
+snippet sapply "sapply function"
+lapply(${1:list}, ${0:function})
+endsnippet
+
+snippet vapply "vapply function"
+vapply(${1:list}, ${2:function}, ${0:type})
+endsnippet
+
+snippet mapply "mapply function"
+mapply(${1:function}, ${0:...})
+endsnippet
+
+snippet tapply "tapply function"
+tapply(${1:vector}, ${2:index}, ${0:function})
+endsnippet
+
+snippet rapply "rapply function"
+rapply(${1:list}, ${0:function})
+endsnippet
+
+# plot functions
+snippet pl "Plot function"
+plot(${1:x}, ${0:y})
+endsnippet
+
+snippet ggp "ggplot2 plot"
+ggplot(${1:data}, aes(${0:aesthetics}))
+endsnippet
+
+snippet img "Output an image"
+${1:(jpeg,bmp,png,tiff)}(filename="${2:filename}", width=${3}, height=${4}, unit="${5}")
+${0:plot}
+dev.off()
+endsnippet
+
+# statistical test functions
+snippet fis "Fisher test"
+fisher.test(${1:x}, ${0:y})
+endsnippet
+
+snippet chi "Chi Squared test"
+chisq.test(${1:x}, ${0:y})
+endsnippet
+
+snippet tt "t-test"
+t.test(${1:x}, ${0:y})
+endsnippet
+
+snippet wil "Wilcox test"
+wilcox.test(${1:x}, ${0:y})
+endsnippet
+
+snippet cor "Correlation test"
+cor.test(${1:x}, ${0:y})
+endsnippet
+
+snippet fte "FTE test"
+var.test(${1:x}, ${0:y})
+endsnippet
+
+snippet kvt "KV test"
+kv.test(${1:x}, ${0:y})
+endsnippet

From 55887f0db48c5f44afdcd76841aaf246b169a75e Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sat, 29 Mar 2014 16:52:21 -0500
Subject: [PATCH 0263/1587] Add R snippets to Rnoweb

---
 UltiSnips/rnoweb.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/rnoweb.snippets b/UltiSnips/rnoweb.snippets
index 37eece620..773b9aa9d 100644
--- a/UltiSnips/rnoweb.snippets
+++ b/UltiSnips/rnoweb.snippets
@@ -1,3 +1,3 @@
 priority -50
 
-extends tex
+extends tex, r

From 87ea532f410551cb3609d0d62262696702363dea Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Sat, 29 Mar 2014 20:39:14 -0400
Subject: [PATCH 0264/1587] Bug fix for java case coercion helpers.

If an empty tab stop was used with either of the java case coercion
helper functions then they would blow up.  Fixed by returning an empty
string if the word passed to them is falsey.
---
 UltiSnips/java.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index a9aa55fa0..21be6bef9 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -25,9 +25,11 @@ def getArgs(group):
 	return [i.split(" ") for i in word.findall(group) ]
 
 def camel(word):
+	if not word: return ''
 	return word[0].upper() + word[1:]
 
 def mixedCase(word):
+	if not word: return ''
 	return word[0].lower() + word[1:]
 
 endglobal

From bd8ef3d11053562632dde8804f7b4d0ac65929db Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sun, 30 Mar 2014 01:04:00 -0500
Subject: [PATCH 0265/1587] Tidy up some parts of r.snippets

---
 UltiSnips/r.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index bbfbaaa68..5fafb3c06 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -36,7 +36,7 @@ endsnippet
 
 # functions
 snippet fun "Function definition"
-${1:name} = function (${2:variables}) {
+${1:name} <- function (${2:variables}) {
 	${0}
 }
 endsnippet
@@ -59,7 +59,7 @@ list(${0:items})
 endsnippet
 
 snippet mat "Matrix function"
-matrix(${1:data}, nrow=${2:rows}, ncol=${0:cols})
+matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
 endsnippet
 
 # apply functions
@@ -88,8 +88,8 @@ tapply(${1:vector}, ${2:index}, ${0:function})
 endsnippet
 
 snippet rapply "rapply function"
-rapply(${1:list}, ${0:function})
 endsnippet
+rapply(${1:list}, ${0:function})
 
 # plot functions
 snippet pl "Plot function"
@@ -101,7 +101,7 @@ ggplot(${1:data}, aes(${0:aesthetics}))
 endsnippet
 
 snippet img "Output an image"
-${1:(jpeg,bmp,png,tiff)}(filename="${2:filename}", width=${3}, height=${4}, unit="${5}")
+${1:(jpeg,bmp,png,tiff)}(filename = "${2:filename}", width = ${3}, height = ${4}, unit = "${5}")
 ${0:plot}
 dev.off()
 endsnippet

From d1f23164d514b095f1a090b742c48efc9405091d Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sun, 30 Mar 2014 11:39:03 -0500
Subject: [PATCH 0266/1587] Add a few more snippets, fix errors as per #332

Hopefully this looks better, @SirVer!
---
 UltiSnips/r.snippets | 92 +++++++++++++++++++++++++-------------------
 1 file changed, 53 insertions(+), 39 deletions(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index 5fafb3c06..625ed642e 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -1,69 +1,91 @@
-snippet #! "Hashbang for Rscript"
+priority -50
+
+snippet #! "Hashbang for Rscript (#!)" b
 #!/usr/bin/env Rscript
 endsnippet
 
-# includes
-snippet lib "Import a library"
+snippet lib "Import a library (lib)"
 library(${0:package})
 endsnippet
 
-snippet req "Require a file"
+snippet req "Require a file (req)"
 require(${0:package})
 endsnippet
 
-snippet source "Source a file"
+snippet source "Source a file (source)"
 source('${0:file}')
 endsnippet
 
-# conditionals
-snippet if "If statement"
-if (${1:condition}) {
+snippet if "If statement (if)"
+if (${1}) {
 	${0}
 }
 endsnippet
 
-snippet el "Else statement"
+snippet eif "Else-If statement (eif)"
+else if (${1}) {
+	${0}
+}
+
+snippet el "Else statement (el)"
 else {
 	${0}
 }
 endsnippet
 
-snippet ei "Else-If statement"
-else if (${1:condition}) {
+snippet eif "Else-If statement (eif)"
+else if (${1}) {
 	${0}
 }
 endsnippet
 
-# functions
-snippet fun "Function definition"
-${1:name} <- function (${2:variables}) {
+snippet ife "if .. else (ife)"
+if (${1}) {
+	${2}
+} else {
+	${3}
+}
+endsnippet
+
+snippet wh "while loop (wh)"
+while(${1}) {
+	${2}
+}
+endsnippet
+
+snippet for "for loop (for)"
+for ({${1:item} in ${2:list}) {
+	${3}
+}
+endsnippet
+
+snippet fun "Function definition (fun)"
+${1:name} <- function (${2}) {
 	${0}
 }
 endsnippet
 
-snippet ret "Return call"
+snippet ret "Return call (ret)"
 return(${0})
 endsnippet
 
-# dataframes, lists, etc
-snippet df "Data frame"
+snippet df "Data frame (df)"
 ${1:name}[${2:rows}, ${0:cols}]
 endsnippet
 
-snippet c "C function"
+snippet c "c function (c)"
 c(${0:items})
 endsnippet
 
-snippet li "List function"
+snippet li "list function (li)"
 list(${0:items})
 endsnippet
 
-snippet mat "Matrix function"
+snippet mat "matrix function (mat)"
 matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
 endsnippet
 
-# apply functions
-snippet apply "Apply function"
+snippet apply "apply function"
 apply(${1:array}, ${2:margin}, ${0:function})
 endsnippet
 
@@ -91,46 +113,38 @@ snippet rapply "rapply function"
 endsnippet
 rapply(${1:list}, ${0:function})
 
-# plot functions
-snippet pl "Plot function"
+snippet pl "Plot function (pl)"
 plot(${1:x}, ${0:y})
 endsnippet
 
-snippet ggp "ggplot2 plot"
+snippet ggp "ggplot2 plot (ggp)"
 ggplot(${1:data}, aes(${0:aesthetics}))
 endsnippet
 
-snippet img "Output an image"
-${1:(jpeg,bmp,png,tiff)}(filename = "${2:filename}", width = ${3}, height = ${4}, unit = "${5}")
-${0:plot}
-dev.off()
-endsnippet
-
-# statistical test functions
-snippet fis "Fisher test"
+snippet fis "Fisher test (fis)"
 fisher.test(${1:x}, ${0:y})
 endsnippet
 
-snippet chi "Chi Squared test"
+snippet chi "Chi Squared test (chi)"
 chisq.test(${1:x}, ${0:y})
 endsnippet
 
-snippet tt "t-test"
+snippet tt "t-test (tt)"
 t.test(${1:x}, ${0:y})
 endsnippet
 
-snippet wil "Wilcox test"
+snippet wil "Wilcox test (wil)"
 wilcox.test(${1:x}, ${0:y})
 endsnippet
 
-snippet cor "Correlation test"
+snippet cor "Correlation test (cor)"
 cor.test(${1:x}, ${0:y})
 endsnippet
 
-snippet fte "FTE test"
+snippet fte "FTE test (fte)"
 var.test(${1:x}, ${0:y})
 endsnippet
 
-snippet kvt "KV test"
+snippet kvt "KV test (kvt)"
 kv.test(${1:x}, ${0:y})
 endsnippet

From 6b5d7d3377bd464676387ae28c59d80cfee6e7f0 Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Sun, 30 Mar 2014 15:32:13 -0500
Subject: [PATCH 0267/1587] Remove duplicate snippet

---
 UltiSnips/r.snippets | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index 625ed642e..ec8ee91bf 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -33,12 +33,6 @@ else {
 }
 endsnippet
 
-snippet eif "Else-If statement (eif)"
-else if (${1}) {
-	${0}
-}
-endsnippet
-
 snippet ife "if .. else (ife)"
 if (${1}) {
 	${2}

From 8c7bb5d4aa5c4c4f5e7ca9c2d7e3ba07a9837bec Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Mon, 31 Mar 2014 21:11:47 -0500
Subject: [PATCH 0268/1587] Remove trigger from the end of the description

---
 UltiSnips/r.snippets | 48 ++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index ec8ee91bf..771450f75 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -4,36 +4,36 @@ snippet #! "Hashbang for Rscript (#!)" b
 #!/usr/bin/env Rscript
 endsnippet
 
-snippet lib "Import a library (lib)"
+snippet lib "Import a library"
 library(${0:package})
 endsnippet
 
-snippet req "Require a file (req)"
+snippet req "Require a file"
 require(${0:package})
 endsnippet
 
-snippet source "Source a file (source)"
+snippet source "Source a file"
 source('${0:file}')
 endsnippet
 
-snippet if "If statement (if)"
+snippet if "If statement"
 if (${1}) {
 	${0}
 }
 endsnippet
 
-snippet eif "Else-If statement (eif)"
+snippet eif "Else-If statement"
 else if (${1}) {
 	${0}
 }
 
-snippet el "Else statement (el)"
+snippet el "Else statement"
 else {
 	${0}
 }
 endsnippet
 
-snippet ife "if .. else (ife)"
+snippet ife "if .. else"
 if (${1}) {
 	${2}
 } else {
@@ -41,41 +41,41 @@ if (${1}) {
 }
 endsnippet
 
-snippet wh "while loop (wh)"
+snippet wh "while loop"
 while(${1}) {
 	${2}
 }
 endsnippet
 
-snippet for "for loop (for)"
+snippet for "for loop"
 for ({${1:item} in ${2:list}) {
 	${3}
 }
 endsnippet
 
-snippet fun "Function definition (fun)"
+snippet fun "Function definition"
 ${1:name} <- function (${2}) {
 	${0}
 }
 endsnippet
 
-snippet ret "Return call (ret)"
+snippet ret "Return call"
 return(${0})
 endsnippet
 
-snippet df "Data frame (df)"
+snippet df "Data frame"
 ${1:name}[${2:rows}, ${0:cols}]
 endsnippet
 
-snippet c "c function (c)"
+snippet c "c function"
 c(${0:items})
 endsnippet
 
-snippet li "list function (li)"
+snippet li "list function"
 list(${0:items})
 endsnippet
 
-snippet mat "matrix function (mat)"
+snippet mat "matrix function"
 matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
 endsnippet
 
@@ -107,38 +107,38 @@ snippet rapply "rapply function"
 endsnippet
 rapply(${1:list}, ${0:function})
 
-snippet pl "Plot function (pl)"
+snippet pl "Plot function"
 plot(${1:x}, ${0:y})
 endsnippet
 
-snippet ggp "ggplot2 plot (ggp)"
+snippet ggp "ggplot2 plot"
 ggplot(${1:data}, aes(${0:aesthetics}))
 endsnippet
 
-snippet fis "Fisher test (fis)"
+snippet fis "Fisher test"
 fisher.test(${1:x}, ${0:y})
 endsnippet
 
-snippet chi "Chi Squared test (chi)"
+snippet chi "Chi Squared test"
 chisq.test(${1:x}, ${0:y})
 endsnippet
 
-snippet tt "t-test (tt)"
+snippet tt "t-test"
 t.test(${1:x}, ${0:y})
 endsnippet
 
-snippet wil "Wilcox test (wil)"
+snippet wil "Wilcox test"
 wilcox.test(${1:x}, ${0:y})
 endsnippet
 
-snippet cor "Correlation test (cor)"
+snippet cor "Correlation test"
 cor.test(${1:x}, ${0:y})
 endsnippet
 
-snippet fte "FTE test (fte)"
+snippet fte "FTE test"
 var.test(${1:x}, ${0:y})
 endsnippet
 
-snippet kvt "KV test (kvt)"
+snippet kvt "KV test"
 kv.test(${1:x}, ${0:y})
 endsnippet

From 653a814deac45c522b51ed27519fcb1eab186615 Mon Sep 17 00:00:00 2001
From: Josh Davis <josh@joshldavis.com>
Date: Mon, 31 Mar 2014 23:59:21 -0500
Subject: [PATCH 0269/1587] Fix snippets syntax error

---
 UltiSnips/r.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index 771450f75..d78a1d720 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -104,8 +104,8 @@ tapply(${1:vector}, ${2:index}, ${0:function})
 endsnippet
 
 snippet rapply "rapply function"
-endsnippet
 rapply(${1:list}, ${0:function})
+endsnippet
 
 snippet pl "Plot function"
 plot(${1:x}, ${0:y})

From fcce90db9baf9327c1c076a09821eee264b30b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Szymczyszyn?=
 <radoslaw.szymczyszyn@erlang-solutions.com>
Date: Tue, 1 Apr 2014 14:33:47 +0200
Subject: [PATCH 0270/1587] Reindent gen_server export list

---
 snippets/erlang.snippets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index 884587036..3a8cf90c8 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -120,8 +120,12 @@ snippet gen_server
 	        ]).
 
 	%% gen_server callbacks
-	-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	         terminate/2, code_change/3]).
+	-export([init/1,
+	         handle_call/3,
+	         handle_cast/2,
+	         handle_info/2,
+	         terminate/2,
+	         code_change/3]).
 
 	-define(SERVER, ?MODULE).
 

From 8f9a7e3dc916a5020af7638a590901dd0f877193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Szymczyszyn?=
 <radoslaw.szymczyszyn@erlang-solutions.com>
Date: Tue, 1 Apr 2014 14:35:02 +0200
Subject: [PATCH 0271/1587] Add gen_fsm and gen_event imported from vimerl

---
 snippets/erlang.snippets | 314 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 314 insertions(+)

diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index 3a8cf90c8..2a0d1a4c3 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -161,6 +161,320 @@ snippet gen_server
 	code_change(_OldVsn, State, _Extra) ->
 	    {ok, State}.
 
+	%%%===================================================================
+	%%% Internal functions
+	%%%===================================================================
+# OTP gen_fsm
+snippet gen_fsm
+	-module(${0:`vim_snippets#Filename('', 'my')`}).
+
+	-behaviour(gen_fsm).
+
+	%% API
+	-export([start_link/0]).
+
+	%% gen_fsm callbacks
+	-export([init/1,
+			 state_name/2,
+			 state_name/3,
+			 handle_event/3,
+			 handle_sync_event/4,
+			 handle_info/3,
+			 terminate/3,
+			 code_change/4]).
+
+	-record(state, {}).
+
+	%%%===================================================================
+	%%% API
+	%%%===================================================================
+
+	%%--------------------------------------------------------------------
+	%% @doc
+	%% Creates a gen_fsm process which calls Module:init/1 to
+	%% initialize. To ensure a synchronized start-up procedure, this
+	%% function does not return until Module:init/1 has returned.
+	%%
+	%% @spec start_link() -> {ok, Pid} | ignore | {error, Error}
+	%% @end
+	%%--------------------------------------------------------------------
+	start_link() ->
+		gen_fsm:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+	%%%===================================================================
+	%%% gen_fsm callbacks
+	%%%===================================================================
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever a gen_fsm is started using gen_fsm:start/[3,4] or
+	%% gen_fsm:start_link/[3,4], this function is called by the new
+	%% process to initialize.
+	%%
+	%% @spec init(Args) -> {ok, StateName, State} |
+	%%                     {ok, StateName, State, Timeout} |
+	%%                     ignore |
+	%%                     {stop, StopReason}
+	%% @end
+	%%--------------------------------------------------------------------
+	init([]) ->
+		{ok, state_name, #state{}}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% There should be one instance of this function for each possible
+	%% state name. Whenever a gen_fsm receives an event sent using
+	%% gen_fsm:send_event/2, the instance of this function with the same
+	%% name as the current state name StateName is called to handle
+	%% the event. It is also called if a timeout occurs.
+	%%
+	%% @spec state_name(Event, State) ->
+	%%                   {next_state, NextStateName, NextState} |
+	%%                   {next_state, NextStateName, NextState, Timeout} |
+	%%                   {stop, Reason, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	state_name(_Event, State) ->
+		{next_state, state_name, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% There should be one instance of this function for each possible
+	%% state name. Whenever a gen_fsm receives an event sent using
+	%% gen_fsm:sync_send_event/[2,3], the instance of this function with
+	%% the same name as the current state name StateName is called to
+	%% handle the event.
+	%%
+	%% @spec state_name(Event, From, State) ->
+	%%                   {next_state, NextStateName, NextState} |
+	%%                   {next_state, NextStateName, NextState, Timeout} |
+	%%                   {reply, Reply, NextStateName, NextState} |
+	%%                   {reply, Reply, NextStateName, NextState, Timeout} |
+	%%                   {stop, Reason, NewState} |
+	%%                   {stop, Reason, Reply, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	state_name(_Event, _From, State) ->
+		Reply = ok,
+		{reply, Reply, state_name, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever a gen_fsm receives an event sent using
+	%% gen_fsm:send_all_state_event/2, this function is called to handle
+	%% the event.
+	%%
+	%% @spec handle_event(Event, StateName, State) ->
+	%%                   {next_state, NextStateName, NextState} |
+	%%                   {next_state, NextStateName, NextState, Timeout} |
+	%%                   {stop, Reason, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_event(_Event, StateName, State) ->
+		{next_state, StateName, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever a gen_fsm receives an event sent using
+	%% gen_fsm:sync_send_all_state_event/[2,3], this function is called
+	%% to handle the event.
+	%%
+	%% @spec handle_sync_event(Event, From, StateName, State) ->
+	%%                   {next_state, NextStateName, NextState} |
+	%%                   {next_state, NextStateName, NextState, Timeout} |
+	%%                   {reply, Reply, NextStateName, NextState} |
+	%%                   {reply, Reply, NextStateName, NextState, Timeout} |
+	%%                   {stop, Reason, NewState} |
+	%%                   {stop, Reason, Reply, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_sync_event(_Event, _From, StateName, State) ->
+		Reply = ok,
+		{reply, Reply, StateName, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% This function is called by a gen_fsm when it receives any
+	%% message other than a synchronous or asynchronous event
+	%% (or a system message).
+	%%
+	%% @spec handle_info(Info,StateName,State)->
+	%%                   {next_state, NextStateName, NextState} |
+	%%                   {next_state, NextStateName, NextState, Timeout} |
+	%%                   {stop, Reason, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_info(_Info, StateName, State) ->
+		{next_state, StateName, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% This function is called by a gen_fsm when it is about to
+	%% terminate. It should be the opposite of Module:init/1 and do any
+	%% necessary cleaning up. When it returns, the gen_fsm terminates with
+	%% Reason. The return value is ignored.
+	%%
+	%% @spec terminate(Reason, StateName, State) -> void()
+	%% @end
+	%%--------------------------------------------------------------------
+	terminate(_Reason, _StateName, _State) ->
+		ok.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Convert process state when code is changed
+	%%
+	%% @spec code_change(OldVsn, StateName, State, Extra) ->
+	%%                   {ok, StateName, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	code_change(_OldVsn, StateName, State, _Extra) ->
+		{ok, StateName, State}.
+
+	%%%===================================================================
+	%%% Internal functions
+	%%%===================================================================
+# OTP gen_event
+snippet gen_event
+	-module(${0:`vim_snippets#Filename('', 'my')`}).
+
+	-behaviour(gen_event).
+
+	%% API
+	-export([start_link/0,
+			 add_handler/2]).
+
+	%% gen_event callbacks
+	-export([init/1,
+			 handle_event/2,
+			 handle_call/2,
+			 handle_info/2,
+			 terminate/2,
+			 code_change/3]).
+
+	-record(state, {}).
+
+	%%%===================================================================
+	%%% gen_event callbacks
+	%%%===================================================================
+
+	%%--------------------------------------------------------------------
+	%% @doc
+	%% Creates an event manager
+	%%
+	%% @spec start_link() -> {ok, Pid} | {error, Error}
+	%% @end
+	%%--------------------------------------------------------------------
+	start_link() ->
+		gen_event:start_link({local, ?MODULE}).
+
+	%%--------------------------------------------------------------------
+	%% @doc
+	%% Adds an event handler
+	%%
+	%% @spec add_handler(Handler, Args) -> ok | {'EXIT', Reason} | term()
+	%% @end
+	%%--------------------------------------------------------------------
+	add_handler(Handler, Args) ->
+		gen_event:add_handler(?MODULE, Handler, Args).
+
+	%%%===================================================================
+	%%% gen_event callbacks
+	%%%===================================================================
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever a new event handler is added to an event manager,
+	%% this function is called to initialize the event handler.
+	%%
+	%% @spec init(Args) -> {ok, State}
+	%% @end
+	%%--------------------------------------------------------------------
+	init([]) ->
+		{ok, #state{}}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever an event manager receives an event sent using
+	%% gen_event:notify/2 or gen_event:sync_notify/2, this function is
+	%% called for each installed event handler to handle the event.
+	%%
+	%% @spec handle_event(Event, State) ->
+	%%                          {ok, State} |
+	%%                          {swap_handler, Args1, State1, Mod2, Args2} |
+	%%                          remove_handler
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_event(_Event, State) ->
+		{ok, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever an event manager receives a request sent using
+	%% gen_event:call/3,4, this function is called for the specified
+	%% event handler to handle the request.
+	%%
+	%% @spec handle_call(Request, State) ->
+	%%                   {ok, Reply, State} |
+	%%                   {swap_handler, Reply, Args1, State1, Mod2, Args2} |
+	%%                   {remove_handler, Reply}
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_call(_Request, State) ->
+		Reply = ok,
+		{ok, Reply, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% This function is called for each installed event handler when
+	%% an event manager receives any other message than an event or a
+	%% synchronous request (or a system message).
+	%%
+	%% @spec handle_info(Info, State) ->
+	%%                         {ok, State} |
+	%%                         {swap_handler, Args1, State1, Mod2, Args2} |
+	%%                         remove_handler
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_info(_Info, State) ->
+		{ok, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever an event handler is deleted from an event manager, this
+	%% function is called. It should be the opposite of Module:init/1 and
+	%% do any necessary cleaning up.
+	%%
+	%% @spec terminate(Reason, State) -> void()
+	%% @end
+	%%--------------------------------------------------------------------
+	terminate(_Reason, _State) ->
+		ok.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Convert process state when code is changed
+	%%
+	%% @spec code_change(OldVsn, State, Extra) -> {ok, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	code_change(_OldVsn, State, _Extra) ->
+		{ok, State}.
+
 	%%%===================================================================
 	%%% Internal functions
 	%%%===================================================================

From 40f1db97d9b6a3e4f25e6e34e1a07914dc555367 Mon Sep 17 00:00:00 2001
From: Maximiliano Robaina <maxirobaina@gmail.com>
Date: Mon, 7 Apr 2014 13:41:38 -0300
Subject: [PATCH 0272/1587] Added new django fields types

---
 snippets/django.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/django.snippets b/snippets/django.snippets
index cad80eb24..0e9164d1e 100644
--- a/snippets/django.snippets
+++ b/snippets/django.snippets
@@ -10,6 +10,10 @@
 
 snippet auto
 	${1:FIELDNAME} = models.AutoField(${0})
+snippet bigint
+	${1:FIELDNAME} = models.BigIntegerField(${0})
+snippet binary
+	${1:FIELDNAME} = models.BinaryField(${0})
 snippet bool
 	${1:FIELDNAME} = models.BooleanField(${0:default=True})
 snippet char

From 0c4960aa84987713aded5daf999d8831eaa3ca29 Mon Sep 17 00:00:00 2001
From: Maximiliano Robaina <maxirobaina@gmail.com>
Date: Tue, 8 Apr 2014 09:35:15 -0300
Subject: [PATCH 0273/1587] Fixed #335 - django snippet fix model save method

---
 snippets/django.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/django.snippets b/snippets/django.snippets
index 0e9164d1e..e2a8d6d09 100644
--- a/snippets/django.snippets
+++ b/snippets/django.snippets
@@ -84,7 +84,7 @@ snippet model
 		def __unicode__(self):
 			${5}
 
-		def save(self, force_insert=False, force_update=False):
+		def save(self, *args, **kwargs):
 			${6}
 
 		@models.permalink

From 513fad93b103d0c3c633e4c071c5e8c7647ec588 Mon Sep 17 00:00:00 2001
From: "David C. Bishop" <david@davidbishop.org>
Date: Wed, 9 Apr 2014 00:18:29 +1000
Subject: [PATCH 0274/1587] Add rust.snippets

---
 UltiSnips/rust.snippets | 215 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 215 insertions(+)
 create mode 100644 UltiSnips/rust.snippets

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
new file mode 100644
index 000000000..98a371ffd
--- /dev/null
+++ b/UltiSnips/rust.snippets
@@ -0,0 +1,215 @@
+#######################################################################
+#                            Rust Snippets                            #
+#######################################################################
+
+###############
+#  Functions  #
+###############
+snippet fn "A function, optionally with arguments and return type."
+fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet test "Test function"
+#[test]
+fn ${1:test_function_name}() {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet new "A new function"
+pub fn new(${2}) -> ${1:Name} {
+	${VISUAL}${0}return $1 { ${3} };
+}
+endsnippet
+
+snippet main "The main function"
+pub fn main() {
+	${VISUAL}${0}
+}
+endsnippet
+
+
+
+snippet let "A let statement"
+let ${1:name}${3} = ${VISUAL}${2};
+endsnippet
+
+snippet pln "println!(..)" b
+println!("${1}"${2/..*/, /}${2});
+endsnippet
+
+
+
+snippet ec "extern crate ..." b
+extern crate ${1:sync};
+endsnippet
+
+snippet ecl "...extern crate log;" b
+#![feature(phase)]
+#[phase(syntax, link)] extern crate log;
+endsnippet
+
+snippet mod	 "A mod." b
+mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+} /* $1 */
+endsnippet
+
+snippet crate "Create header information" b
+// Crate ID
+#![crate_id = "${1:crate_name}#${2:0.0.1}"]
+
+// Additional metadata attributes
+#![desc = "${3:Descrption.}"]
+#![license = "${4:BSD}"]
+#![comment = "${5:Comment.}"]
+
+// Specify the output type
+#![crate_type = "${6:lib}"]
+endsnippet
+
+snippet allow "#[allow(..)]" b
+#[allow(${1:unused_variable})]
+endsnippet
+
+snippet feat "#![feature(..)]" b
+#![feature(${1:macro_rules})]
+endsnippet
+
+
+##################
+#  Common types  #
+##################
+snippet opt "Option<..>"
+Option<${1:int}>
+endsnippet
+
+snippet res "Result<.., ..>"
+Result<${1:~str}, ${2:()}>
+endsnippet
+
+
+
+
+snippet if "if .. (if)" b
+if ${1:/* condition */} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet mat "match"
+match ${1} {
+	${2} => ${3},
+}
+endsnippet
+
+snippet while "while .. {}" b
+while ${1:condition} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet for "for .. in .." b
+for ${1:i} in ${2:range(0u, 10)} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet spawn "spawn(proc() { .. });" b
+spawn(proc() {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+});
+endsnippet
+
+snippet chan "A channel" b
+let (${1:tx}, ${2:rx}): (Sender<${3:int}>, Receiver<${4:int}>) = channel();
+endsnippet
+
+snippet duplex "Duplex stream" b
+let (${1:from_child}, ${2:to_child}) = sync::duplex();
+endsnippet
+
+#####################
+#  TODO commenting  #
+#####################
+snippet todo "A Todo comment"
+// [TODO]: ${1:Description} - `!v strftime("%Y-%m-%d %I:%M%P")`
+endsnippet
+
+
+############
+#  Struct  #
+############
+snippet st "Struct" b
+struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet stn "Struct with new constructor." b
+pub struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
+	${3:/* code */}
+}
+
+impl $1 {
+	pub fn new(${2}) -> $1 {
+		${4}return $1 {
+			${5}
+		};
+	}
+}
+endsnippet
+
+
+##########
+#  Enum  #
+##########
+snippet enum "An enum" b
+enum ${1:enum_name} {
+	${VISUAL}${0},
+}
+endsnippet
+
+
+##########
+#  Impl  #
+##########
+snippet imp "An impl" b
+impl ${1:Name} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet drop "Drop implementation" b
+impl Drop for ${1:Name} {
+	fn drop(&mut self) {
+		${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+	}
+}
+endsnippet
+
+
+############
+#  Traits  #
+############
+snippet trait "Trait block" b
+trait ${1:Name} {
+	${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+
+#############
+#  Statics  #
+#############
+snippet ss "A static string."
+static ${1}: &'static str = "${VISUAL}${0}";
+endsnippet
+
+snippet stat "A static variable."
+static ${1}: ${2:uint} = ${VISUAL}${0};
+endsnippet
+
+# vim:ft=snippets:

From fa6d71e49e3ab109b5a56f5bcb99805a6f30b221 Mon Sep 17 00:00:00 2001
From: Steeve <mo0ofier@gmail.com>
Date: Wed, 9 Apr 2014 12:27:32 +0200
Subject: [PATCH 0275/1587] add def overloading methode (dol)

I add it because I use it many times a day -not only for the `__init__` method-

this snippet is very useful to me, no need to call super and handle all args and kwargs, and no more typo errors :D
---
 snippets/python.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index a7bb708fd..ac9573bc9 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -201,3 +201,6 @@ snippet epydoc
 
 	@raise e: ${0: Description}
 	"""
+snippet dol
+	def ${1:__init__}(self, *args, **kwargs):
+	    super(${0:ClassName}, self).$1(*args, **kwargs)

From 039a1c0801ff94c4cd1ed02bb2885ad2a44f963a Mon Sep 17 00:00:00 2001
From: Gilad Peleg <giladp007@gmail.com>
Date: Thu, 10 Apr 2014 12:13:17 +0300
Subject: [PATCH 0276/1587] update meta charset in html

---
 UltiSnips/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 31f7cc34d..5746feb65 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -194,7 +194,7 @@ endsnippet
 
 snippet head "XHTML <head>"
 <head>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8"`!p x(snip)`>
+	<meta charset="utf-8">
 	<title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
 	$0
 </head>

From fea2ddc0044a136f55a024ef5a4c10dee88f1993 Mon Sep 17 00:00:00 2001
From: Steeve <mo0ofier@gmail.com>
Date: Thu, 10 Apr 2014 11:17:29 +0200
Subject: [PATCH 0277/1587] key word argument get (kwg)

a common usage -especially when overloading class- is to use `*args` array and `**kwargs` dictionary to handle method's arguments

this snippet is usefull to quickly get the argument value from the keyword arguments dictionary -kwargs- or setting a default value
---
 snippets/python.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index ac9573bc9..799e061cf 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -204,3 +204,5 @@ snippet epydoc
 snippet dol
 	def ${1:__init__}(self, *args, **kwargs):
 	    super(${0:ClassName}, self).$1(*args, **kwargs)
+snippet kwg
+	self.${1:var_name} = kwargs.get('$1', ${2:None})${0:}

From 76a4d7eae9c60b091a59aa85c7a2fc3a4fcfbe59 Mon Sep 17 00:00:00 2001
From: David Barnett <davidbarnett2@gmail.com>
Date: Fri, 11 Apr 2014 21:49:14 -0700
Subject: [PATCH 0278/1587] Add message and field snippets for proto filetype

---
 UltiSnips/proto.snippets | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 UltiSnips/proto.snippets

diff --git a/UltiSnips/proto.snippets b/UltiSnips/proto.snippets
new file mode 100644
index 000000000..079fbb4a4
--- /dev/null
+++ b/UltiSnips/proto.snippets
@@ -0,0 +1,30 @@
+priority -50
+
+snippet mess "Proto message" b
+// ${2:TODO(`whoami`): Describe this message.}
+message ${1:Name} {
+
+	// Next available id: 1
+}
+endsnippet
+
+snippet reqf "Required field" b
+// ${4:TODO(`whoami`): Describe this field.}
+optional ${1:type} ${2:name} = ${3:1};  // Required
+endsnippet
+
+snippet optf "Optional field" b
+// ${4:TODO(`whoami`): Describe this field.}
+optional ${1:type} ${2:name} = ${3:1};
+endsnippet
+
+snippet repf "Repeated field" b
+// ${4:TODO(`whoami`): Describe this field.}
+repeated ${1:type} ${2:name} = ${3:1};
+endsnippet
+
+snippet enum "Enumeration" b
+// ${2:TODO(`whoami`): Describe this enum.}
+enum ${1:Name} {
+}
+endsnippet

From 4b9f18c53139a2dfe616850146d95f49c343c7bf Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Sun, 13 Apr 2014 10:24:56 +0200
Subject: [PATCH 0279/1587] Add a common pythonx directory containing helper
 methods for snippets.

---
 UltiSnips/rst.snippets | 23 ++---------------------
 plugin/vimsnippets.vim | 37 +++++++++++++++++++++++++++++++++++++
 pythonx/vimsnippets.py | 20 ++++++++++++++++++++
 3 files changed, 59 insertions(+), 21 deletions(-)
 create mode 100644 plugin/vimsnippets.vim
 create mode 100644 pythonx/vimsnippets.py

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index e8aef2b21..3763a95e9 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -12,6 +12,8 @@ from string import Template
 import re
 from collections import Counter
 
+from vimsnippets import complete
+
 #http://docutils.sourceforge.net/docs/ref/rst/roles.html
 TEXT_ROLES = ['emphasis','literal','code','math',
 			  'pep-reference','rfc-reference',
@@ -130,27 +132,6 @@ def get_popular_code_type():
 	except IndexError:
 		popular_type = "lua" # Don't break default
 	return popular_type
-
-
-def complete(t, opts):
-	"""
-	get options that start with t
-
-	:param t: query string
-	:param opts: list that needs to be completed
-
-	:return: a string that start with t
-	"""
-	msg = "({0})"
-	if t:
-		opts = [ m[len(t):] for m in opts if m.startswith(t) ]
-	if len(opts) == 1:
-		return opts[0]
-
-	if not len(opts):
-		msg = "{0}"
-	return msg.format("|".join(opts))
-
 endglobal
 
 snippet part "Part" b
diff --git a/plugin/vimsnippets.vim b/plugin/vimsnippets.vim
new file mode 100644
index 000000000..3c3ecf923
--- /dev/null
+++ b/plugin/vimsnippets.vim
@@ -0,0 +1,37 @@
+if exists("b:done_vimsnippets")
+   finish
+endif
+let b:done_vimsnippets = 1
+
+" Expanding the path is not needed on Vim 7.4
+if &cp || version >= 704
+    finish
+endif
+
+" Add pythonx to the python search path if needed (i.e. <= Vim 7.3).
+if !has("python") && !has("python3")
+   finish
+end
+
+" This will fail if UltiSnips is not installed.
+try
+   call UltiSnips#bootstrap#Bootstrap()
+catch /E117/
+   finish
+endtry
+
+
+" This should have been set by UltiSnips, otherwise something is wrong.
+if !exists("g:_uspy")
+   finish
+end
+
+
+" Expand our path
+let s:SourcedFile=expand("<sfile>")
+exec g:_uspy "import vim, os, sys"
+exec g:_uspy "sourced_file = vim.eval('s:SourcedFile')"
+exec g:_uspy "while not os.path.exists(os.path.join(sourced_file, 'pythonx')):
+   \ sourced_file = os.path.dirname(sourced_file)"
+exec g:_uspy "module_path = os.path.join(sourced_file, 'pythonx')"
+exec g:_uspy "sys.path.append(module_path)"
diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
new file mode 100644
index 000000000..b00edb150
--- /dev/null
+++ b/pythonx/vimsnippets.py
@@ -0,0 +1,20 @@
+"""Helper methods used in UltiSnips snippets."""
+
+def complete(tab, opts):
+    """
+    get options that start with tab
+
+    :param tab: query string
+    :param opts: list that needs to be completed
+
+    :return: a string that start with tab
+    """
+    msg = "({0})"
+    if tab:
+        opts = [m[len(tab):] for m in opts if m.startswith(tab)]
+    if len(opts) == 1:
+        return opts[0]
+
+    if not len(opts):
+        msg = "{0}"
+    return msg.format("|".join(opts))

From e3c6399f8c4406105ce2d70641b111f99c16e5a1 Mon Sep 17 00:00:00 2001
From: David Barnett <davidbarnett2@gmail.com>
Date: Sun, 13 Apr 2014 09:11:58 -0700
Subject: [PATCH 0280/1587] Add type completions

---
 UltiSnips/proto.snippets | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/proto.snippets b/UltiSnips/proto.snippets
index 079fbb4a4..973e91164 100644
--- a/UltiSnips/proto.snippets
+++ b/UltiSnips/proto.snippets
@@ -1,5 +1,28 @@
 priority -50
 
+global !p
+
+from vimsnippets import complete
+
+FIELD_TYPES = [
+	'double',
+	'float',
+	'int32',
+	'int64',
+	'uint32',
+	'uint64',
+	'sint32',
+	'sint64',
+	'fixed32',
+	'fixed64',
+	'sfixed32',
+	'sfixed64',
+	'bool',
+	'string',
+	'bytes']
+
+endglobal
+
 snippet mess "Proto message" b
 // ${2:TODO(`whoami`): Describe this message.}
 message ${1:Name} {
@@ -10,17 +33,17 @@ endsnippet
 
 snippet reqf "Required field" b
 // ${4:TODO(`whoami`): Describe this field.}
-optional ${1:type} ${2:name} = ${3:1};  // Required
+optional ${1:type}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};  // Required
 endsnippet
 
 snippet optf "Optional field" b
 // ${4:TODO(`whoami`): Describe this field.}
-optional ${1:type} ${2:name} = ${3:1};
+optional ${1:type}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
 endsnippet
 
 snippet repf "Repeated field" b
 // ${4:TODO(`whoami`): Describe this field.}
-repeated ${1:type} ${2:name} = ${3:1};
+repeated ${1:type}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
 endsnippet
 
 snippet enum "Enumeration" b

From 3f3b2d561c87fc7db388270b3831853d43922998 Mon Sep 17 00:00:00 2001
From: David Barnett <davidbarnett2@gmail.com>
Date: Sun, 13 Apr 2014 09:17:57 -0700
Subject: [PATCH 0281/1587] Add tabstop for message body

---
 UltiSnips/proto.snippets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UltiSnips/proto.snippets b/UltiSnips/proto.snippets
index 973e91164..b09c4e6ba 100644
--- a/UltiSnips/proto.snippets
+++ b/UltiSnips/proto.snippets
@@ -26,6 +26,7 @@ endglobal
 snippet mess "Proto message" b
 // ${2:TODO(`whoami`): Describe this message.}
 message ${1:Name} {
+	$0
 
 	// Next available id: 1
 }

From cf39d41acc6bb2fae78d03d8cdc502256a2ca6ae Mon Sep 17 00:00:00 2001
From: David Barnett <davidbarnett2@gmail.com>
Date: Sun, 13 Apr 2014 22:58:20 -0700
Subject: [PATCH 0282/1587] rm unnecessary empty lines

---
 UltiSnips/proto.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/UltiSnips/proto.snippets b/UltiSnips/proto.snippets
index b09c4e6ba..adc5310c5 100644
--- a/UltiSnips/proto.snippets
+++ b/UltiSnips/proto.snippets
@@ -1,7 +1,6 @@
 priority -50
 
 global !p
-
 from vimsnippets import complete
 
 FIELD_TYPES = [
@@ -20,7 +19,6 @@ FIELD_TYPES = [
 	'bool',
 	'string',
 	'bytes']
-
 endglobal
 
 snippet mess "Proto message" b

From 7f65658f47f18b2cf4669a898244c0bbef805d01 Mon Sep 17 00:00:00 2001
From: Steeve <mo0ofier@gmail.com>
Date: Mon, 14 Apr 2014 12:28:03 +0200
Subject: [PATCH 0283/1587] remove useless $0

---
 snippets/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 799e061cf..1ac0dd440 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -205,4 +205,4 @@ snippet dol
 	def ${1:__init__}(self, *args, **kwargs):
 	    super(${0:ClassName}, self).$1(*args, **kwargs)
 snippet kwg
-	self.${1:var_name} = kwargs.get('$1', ${2:None})${0:}
+	self.${1:var_name} = kwargs.get('$1', ${2:None})

From 593a3b79dff5ae60b2a18dd2930bd0669c92bd9e Mon Sep 17 00:00:00 2001
From: Steeve <mo0ofier@gmail.com>
Date: Mon, 14 Apr 2014 12:30:29 +0200
Subject: [PATCH 0284/1587] lkwg LocalKeyWordargumentGet

---
 snippets/python.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 1ac0dd440..c221f466e 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -206,3 +206,5 @@ snippet dol
 	    super(${0:ClassName}, self).$1(*args, **kwargs)
 snippet kwg
 	self.${1:var_name} = kwargs.get('$1', ${2:None})
+snippet lkwg
+	${1:var_name} = kwargs.get('$1', ${2:None})

From 0b8a04fee06804889233cc7672ffbb2f08b868c8 Mon Sep 17 00:00:00 2001
From: David Barnett <davidbarnett2@gmail.com>
Date: Mon, 14 Apr 2014 20:57:59 -0700
Subject: [PATCH 0285/1587] Add snippets for soy filetype (a.k.a. closure
 templates)

---
 UltiSnips/soy.snippets | 61 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 UltiSnips/soy.snippets

diff --git a/UltiSnips/soy.snippets b/UltiSnips/soy.snippets
new file mode 100644
index 000000000..579e1fe83
--- /dev/null
+++ b/UltiSnips/soy.snippets
@@ -0,0 +1,61 @@
+extends html
+
+snippet ns "Namespace" b
+{namespace ${1:name}}
+endsnippet
+
+snippet tmpl "Template" b
+/**
+ * ${2:TODO(`whoami`): Describe this template.}
+ */
+{template .${1:name}}
+	$0
+{/template}
+endsnippet
+
+snippet msg "Message" b
+{msg desc="${1:description}"}
+	$0
+{/msg}
+endsnippet
+
+snippet let "let command" b
+{let $${1:identifier}: ${2:expression} /}
+endsnippet
+
+snippet if "if .. (if)" b
+{if ${1:expression}}
+	$0
+{/if}
+endsnippet
+
+snippet ife "if .. else (ife)" b
+{if ${1:expression}}
+	$2
+{else}
+	$0
+{/if}
+endsnippet
+
+snippet eli "else if .. (eli)" b
+{elif ${1:expression}}
+	$0
+endsnippet
+
+snippet fore "foreach command" b
+{foreach $${1:var} in ${2:ref}}
+	$0
+{/foreach}
+endsnippet
+
+snippet for "for command" b
+{for $${1:var} in range(${2:rangeexpr})}
+	$0
+{/for}
+endsnippet
+
+snippet call "template call" b
+{call ${1:tmpl}}
+	$0
+{/call}
+endsnippet

From 00231357c890fbe4808f3c69ce213877993ffe1d Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Wed, 16 Apr 2014 08:19:50 +0200
Subject: [PATCH 0286/1587] Remove placeholder text in proto snippets.

---
 UltiSnips/proto.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/proto.snippets b/UltiSnips/proto.snippets
index adc5310c5..923be5786 100644
--- a/UltiSnips/proto.snippets
+++ b/UltiSnips/proto.snippets
@@ -32,17 +32,17 @@ endsnippet
 
 snippet reqf "Required field" b
 // ${4:TODO(`whoami`): Describe this field.}
-optional ${1:type}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};  // Required
+optional ${1}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};  // Required
 endsnippet
 
 snippet optf "Optional field" b
 // ${4:TODO(`whoami`): Describe this field.}
-optional ${1:type}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
+optional ${1}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
 endsnippet
 
 snippet repf "Repeated field" b
 // ${4:TODO(`whoami`): Describe this field.}
-repeated ${1:type}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
+repeated ${1}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
 endsnippet
 
 snippet enum "Enumeration" b

From aefcab679da99811a7f180d6b201eec8ba75e155 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Wed, 16 Apr 2014 14:50:14 +0200
Subject: [PATCH 0287/1587] Changed frame snippet

---
 snippets/tex.snippets | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index dbb565142..d72bdaa24 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -239,9 +239,7 @@ snippet sum
 snippet lim
 	\lim_{${1:x \to +\infty}} ${0}
 snippet frame
-	\begin{frame}[<+->]
-		\frametitle{${1:title}}
-
+	\begin{frame}[${1:t}]{${2:title}}
 		${0}
 	\end{frame}
 snippet block

From f770dab87dd0edf82f7a6d44152bdb44377ce5dc Mon Sep 17 00:00:00 2001
From: David Barnett <davidbarnett2@gmail.com>
Date: Wed, 16 Apr 2014 09:03:41 -0700
Subject: [PATCH 0288/1587] Add "priority -50" to UltiSnips/soy.snippets

---
 UltiSnips/soy.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UltiSnips/soy.snippets b/UltiSnips/soy.snippets
index 579e1fe83..9a22a57ce 100644
--- a/UltiSnips/soy.snippets
+++ b/UltiSnips/soy.snippets
@@ -1,3 +1,5 @@
+priority -50
+
 extends html
 
 snippet ns "Namespace" b

From dba38fc3824cb01a5858120eea8b668db1f0e885 Mon Sep 17 00:00:00 2001
From: "David C. Bishop" <david@davidbishop.org>
Date: Fri, 18 Apr 2014 18:02:36 +1000
Subject: [PATCH 0289/1587] 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 98a371ffd..71ea845b1 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" <david@davidbishop.org>
Date: Fri, 18 Apr 2014 18:04:17 +1000
Subject: [PATCH 0290/1587] 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 71ea845b1..b4b03e205 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" <david@davidbishop.org>
Date: Fri, 18 Apr 2014 18:08:13 +1000
Subject: [PATCH 0291/1587] 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 b4b03e205..99852266f 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" <david@davidbishop.org>
Date: Fri, 18 Apr 2014 18:10:50 +1000
Subject: [PATCH 0292/1587] 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 5b8eae848..21dd87b0d 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 3d79a64e4..c2cb3d033 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 99da292e3..264c9d50b 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
 

From ec973080f47fe038f076db97eeff44bc46d3e54b Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Mon, 21 Apr 2014 14:07:28 -0400
Subject: [PATCH 0293/1587] Add angular snippets.

Add two jasmine snippets for use with angular that prepoulate the
"it" and "before" functions with "inject".  Add an angular config
snippet.
---
 UltiSnips/javascript_angular.snippets | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 UltiSnips/javascript_angular.snippets

diff --git a/UltiSnips/javascript_angular.snippets b/UltiSnips/javascript_angular.snippets
new file mode 100644
index 000000000..23b93e3fe
--- /dev/null
+++ b/UltiSnips/javascript_angular.snippets
@@ -0,0 +1,19 @@
+priority -50
+
+snippet iti "it (js, inject)" b
+it('${1:description}', inject(function($2) {
+	$0
+}));
+endsnippet
+
+snippet befi "before each (js, inject)" b
+beforeEach(inject(function($1) {
+	$0
+}));
+endsnippet
+
+snippet acon "angular config" i
+config(function($1) {
+	$0
+});
+endsnippet

From b1af469ff76e5cfee0b809f89f6976ee5738950e Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Mon, 21 Apr 2014 14:12:28 -0400
Subject: [PATCH 0294/1587] Rename angular config. Add angular controller.

---
 UltiSnips/javascript_angular.snippets | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/javascript_angular.snippets b/UltiSnips/javascript_angular.snippets
index 23b93e3fe..76e9ca1da 100644
--- a/UltiSnips/javascript_angular.snippets
+++ b/UltiSnips/javascript_angular.snippets
@@ -12,8 +12,14 @@ beforeEach(inject(function($1) {
 }));
 endsnippet
 
-snippet acon "angular config" i
+snippet aconf "angular config" i
 config(function($1) {
 	$0
 });
 endsnippet
+
+snippet acont "angular controller" i
+controller('${1:name}', function($2) {
+	$0
+});
+endsnippet

From ed8c39bc1f79d0992e3892172f057f8e8b278243 Mon Sep 17 00:00:00 2001
From: Alexandre de Oliveira <chavedomundo@gmail.com>
Date: Wed, 23 Apr 2014 17:59:28 -0300
Subject: [PATCH 0295/1587] Adds brackets to RSpec's let()

---
 snippets/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 6ee11d4b9..5d9c01ea3 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -1030,9 +1030,9 @@ snippet aft
 		${0}
 	end
 snippet let
-	let(:${1:object}) ${0}
+	let(:${1:object}) { ${0} }
 snippet let!
-	let!(:${1:object}) ${0}
+	let!(:${1:object}) { ${0} }
 snippet subj
 	subject { ${0} }
 snippet s.

From 5edbfec78655c606e595d0db94080de7fe58c4d0 Mon Sep 17 00:00:00 2001
From: r4d2 <patrick.flick@gmail.com>
Date: Thu, 24 Apr 2014 21:14:31 -0400
Subject: [PATCH 0296/1587] Fix syntax in R for loop

---
 UltiSnips/r.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index d78a1d720..2d6759402 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -48,7 +48,7 @@ while(${1}) {
 endsnippet
 
 snippet for "for loop"
-for ({${1:item} in ${2:list}) {
+for (${1:item} in ${2:list}) {
 	${3}
 }
 endsnippet

From 74ef5cbd446216995d94f1ddcd2b84619f1125ef Mon Sep 17 00:00:00 2001
From: r4d2 <patrick.flick@gmail.com>
Date: Thu, 24 Apr 2014 21:14:50 -0400
Subject: [PATCH 0297/1587] Add R for and while snippets

---
 snippets/r.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/snippets/r.snippets b/snippets/r.snippets
index c7ca5acae..d9b210f46 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -23,6 +23,16 @@ snippet ei
 		${0}
 	}
 
+# loops
+snippet wh
+while(${1}) {
+	${2}
+}
+snippet for
+for (${1:item} in ${2:list}) {
+	${3}
+}
+
 # functions
 snippet fun
 	${1:name} = function (${2:variables}) {

From 8fe86059fb2a2d5c85aeb2a8787a9bcd8dd68602 Mon Sep 17 00:00:00 2001
From: tinyladi <ladislas@weareleka.com>
Date: Mon, 28 Apr 2014 12:36:54 +0200
Subject: [PATCH 0298/1587] create pandoc.snippets & extend markdown.snippets

---
 UltiSnips/pandoc.snippets | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 UltiSnips/pandoc.snippets

diff --git a/UltiSnips/pandoc.snippets b/UltiSnips/pandoc.snippets
new file mode 100644
index 000000000..c94e53432
--- /dev/null
+++ b/UltiSnips/pandoc.snippets
@@ -0,0 +1 @@
+extends markdown

From a34551bdd9af52018a92279a40f6b9385c1109f9 Mon Sep 17 00:00:00 2001
From: tinyladi <ladislas@weareleka.com>
Date: Mon, 28 Apr 2014 12:48:59 +0200
Subject: [PATCH 0299/1587] add codeblock and inline code snippets to
 markdown.snippets

---
 UltiSnips/markdown.snippets | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index fa708ab88..046f6b732 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -39,4 +39,15 @@ snippet img "Image"
 ![${1:pic alt}](${2:path}${3/.+/ "/}${3:opt title}${3/.+/"/})$0
 endsnippet
 
+snippet ilc "Inline Code"
+\`$1\`$0
+endsnippet
+
+snippet cbl "Codeblock" b
+\`\`\`
+$1
+\`\`\`
+$0
+endsnippet
+
 # vim:ft=snippets:

From 1d5adc300faffd9672cf2d6fc3b4f37fb7ad5e18 Mon Sep 17 00:00:00 2001
From: tinyladi <ladislas@weareleka.com>
Date: Mon, 28 Apr 2014 14:40:10 +0200
Subject: [PATCH 0300/1587] add priority and inword option

---
 UltiSnips/markdown.snippets | 2 +-
 UltiSnips/pandoc.snippets   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index 046f6b732..0720cbfce 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -39,7 +39,7 @@ snippet img "Image"
 ![${1:pic alt}](${2:path}${3/.+/ "/}${3:opt title}${3/.+/"/})$0
 endsnippet
 
-snippet ilc "Inline Code"
+snippet ilc "Inline Code" i
 \`$1\`$0
 endsnippet
 
diff --git a/UltiSnips/pandoc.snippets b/UltiSnips/pandoc.snippets
index c94e53432..157c9ef06 100644
--- a/UltiSnips/pandoc.snippets
+++ b/UltiSnips/pandoc.snippets
@@ -1 +1,3 @@
+priority -49
+
 extends markdown

From 0561ba640a5fa03a450e043d010721ca07d45077 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Wed, 30 Apr 2014 10:14:30 +0200
Subject: [PATCH 0301/1587] Fixed sapply snippet

---
 UltiSnips/r.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index 2d6759402..74ecc1d73 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -88,7 +88,7 @@ lapply(${1:list}, ${0:function})
 endsnippet
 
 snippet sapply "sapply function"
-lapply(${1:list}, ${0:function})
+sapply(${1:list}, ${0:function})
 endsnippet
 
 snippet vapply "vapply function"

From 18d24cbdf85b86e29833bf8640ec93b74652a926 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Wed, 30 Apr 2014 10:14:49 +0200
Subject: [PATCH 0302/1587] Indenting label in align environment

---
 snippets/tex.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index d72bdaa24..8304953f7 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -34,7 +34,7 @@ snippet center
 # Align(ed)
 snippet ali
 	\begin{align${1:ed}}
-	\label{eq:${2}}
+		\label{eq:${2}}
 		${0}
 	\end{align$1}
 # Gather(ed)
@@ -175,7 +175,7 @@ snippet index
 #Citations
 snippet citen
 	\citen{${1}} ${0}
-# bibtex commands
+# natbib citations
 snippet citep
 	\citep{${1}} ${0}
 snippet citet

From 519c3beb5fb7a41ce5b70be10435471ad9961ff8 Mon Sep 17 00:00:00 2001
From: dhilipsiva <dhilipsiva@gmail.com>
Date: Thu, 1 May 2014 11:45:06 +0530
Subject: [PATCH 0303/1587] Add Scheme snippets

---
 snippets/scheme.snippets | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 snippets/scheme.snippets

diff --git a/snippets/scheme.snippets b/snippets/scheme.snippets
new file mode 100644
index 000000000..035d53483
--- /dev/null
+++ b/snippets/scheme.snippets
@@ -0,0 +1,36 @@
+snippet +
+	(+	${1}
+		${0})
+
+snippet -
+	(-	${1}
+		${0})
+
+snippet /
+	(/	${1}
+		${0})
+
+snippet *
+	(*	${1}
+		${0})
+
+# Definition
+snippet def
+	(define (${1:name})
+			(${0:definition}))
+
+# Definition with lambda
+snippet defl
+	(define ${1:name}
+			(lambda (x)(${0:definition})))
+
+# Condition
+snippet cond
+	(cond	((${1:predicate}) (${2:action}))
+			((${3:predicate}) (${0:action})))
+
+# If statement
+snippet if
+	(if (${1:predicate})
+		(${2:true-action})
+		(${0:false-action}))

From 2f9bb967c0b4113d203253fecb0dbefb76b4d955 Mon Sep 17 00:00:00 2001
From: Henrik Kjelsberg <hkjels@me.com>
Date: Thu, 1 May 2014 14:34:30 +0200
Subject: [PATCH 0304/1587] Replaced charset property to the html5 equivalent

Also, most html5 style-guides do not use ending slashes with
self-closing tags.
---
 snippets/html.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 567003f71..d4b5d3f81 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -449,7 +449,8 @@ snippet html5
 	<!DOCTYPE html>
 	<html>
 		<head>
-			<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width">
 			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${2:meta}
 		</head>

From 8aea9060c1d78440161656dd83245b6dd8152c78 Mon Sep 17 00:00:00 2001
From: Louis <louis@lpil.co.uk>
Date: Thu, 1 May 2014 21:05:39 +0100
Subject: [PATCH 0305/1587] Correct readme link formatting

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7a94766f8..3af6cf8ad 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ About how to install snipate see [snipmate@garbas](https://github.com/garbas/vim
 
 (Bundle, Pathogen, git clone - keywords to make people find this link by ctrl-f search)
 I know that I should be reading the docs of the snippet engine, just let me copy paste into my .vmirc:
-(See this pull request)[https://github.com/honza/vim-snippets/pull/307/files].
+[See this pull request](https://github.com/honza/vim-snippets/pull/307/files).
 
 TROUBLE
 =======

From ae246619284755adca23f76382eaae784faef8b5 Mon Sep 17 00:00:00 2001
From: Louis <lpil@users.noreply.github.com>
Date: Thu, 1 May 2014 23:34:52 +0100
Subject: [PATCH 0306/1587] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3af6cf8ad..9f3509348 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ Is the place to discuss plugin managers and repository resources.
 About how to install snipate see [snipmate@garbas](https://github.com/garbas/vim-snipmate)
 
 (Bundle, Pathogen, git clone - keywords to make people find this link by ctrl-f search)
-I know that I should be reading the docs of the snippet engine, just let me copy paste into my .vmirc:
+I know that I should be reading the docs of the snippet engine, just let me copy paste into my .vimrc:
 [See this pull request](https://github.com/honza/vim-snippets/pull/307/files).
 
 TROUBLE

From 5eec8a16342aea09e8f8190e68b6583acebf8c8f Mon Sep 17 00:00:00 2001
From: "Mayeu (Cast)" <Mayeu@users.noreply.github.com>
Date: Fri, 2 May 2014 20:03:59 +0200
Subject: [PATCH 0307/1587] Fix the "fun" snippet definition

At line 96, the definition for the snippet "fun" was using spaces instead of tabs
---
 snippets/elixir.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index bd84cd965..303c29e40 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -93,9 +93,9 @@ snippet fn
 	fn(${1:args}) -> ${0} end
 
 snippet fun
-        function do
-        	${0}
-        end
+	function do
+		${0}
+	end
 
 snippet mdoc
 	@moduledoc """

From 8d619ac165f76e7394e3cdd16dee0545dbec031a Mon Sep 17 00:00:00 2001
From: dhilipsiva <dhilipsiva@gmail.com>
Date: Mon, 5 May 2014 20:12:02 +0530
Subject: [PATCH 0308/1587] Indentation missing.

---
 snippets/r.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/snippets/r.snippets b/snippets/r.snippets
index adb6b3a93..7bdeeec05 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -25,13 +25,13 @@ snippet ei
 
 # loops
 snippet wh
-while(${1}) {
-	${2}
-}
+	while(${1}) {
+		${2}
+	}
 snippet for
-for (${1:item} in ${2:list}) {
-	${3}
-}
+	for (${1:item} in ${2:list}) {
+		${3}
+	}
 
 # functions
 snippet fun

From a066d608fed696ebb4191382451b87eefd4658ed Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 5 May 2014 17:44:05 +0200
Subject: [PATCH 0309/1587] document vs snipmate should be deprecated: not yet

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 9f3509348..d90dbe9e4 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,17 @@ If you have VimL only (vim without python support) your best option is using
 minor bugs found in the engine.
 
 
+Q: Should "snipmate be deprecated in favour of UltiSnips"?
+
+A: No, because snimpate is VimL, and UltiSnips requires Python.
+Some people want to use snippets without having to install Vim with Python
+support. Yes - this sucks. 
+
+One solution would be: Use snippets if they are good enough, but allow overriding them
+in UltiSnips. This would avoid most duplication while still serving most users.
+AFAIK there is a nested-placeholder branch for snipmate too. snipmate is still
+improved by Adnan Zafar. So maybe time is not ready to make a final decision yet.
+
 Installation
 ------------
 

From 9d8a666fb9bcd6d5e037a89eefa4e6215ce74328 Mon Sep 17 00:00:00 2001
From: Louis <louis@lpil.co.uk>
Date: Thu, 1 May 2014 19:49:00 +0100
Subject: [PATCH 0310/1587] Add snipmate style rust snippets

---
 snippets/rust.snippets | 125 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 snippets/rust.snippets

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
new file mode 100644
index 000000000..d4b9264d9
--- /dev/null
+++ b/snippets/rust.snippets
@@ -0,0 +1,125 @@
+#################
+# Rust Snippets #
+#################
+
+# Functions
+snippet fn
+	fn ${1:function_name}(${2}) {
+		${0}
+	}
+snippet fn-
+	fn ${1:function_name}(${2}) -> ${3} {
+		${0}
+	}
+snippet test
+	#[test]
+	fn ${1:test_function_name}() {
+		${0}
+	}
+snippet new
+	pub fn new(${2}) -> ${1:Name} {
+		${0}return $1 { ${3} };
+	}
+snippet main
+	pub fn main() {
+		${0}
+	}
+snippet let
+	let ${1:name}${3} = ${2};
+snippet pln
+	println!("${1}");
+snippet pln,
+	println!("${1}", ${2});
+snippet ec
+	extern crate ${1:sync};
+snippet ecl
+	#![feature(phase)]
+	#[phase(syntax, link)] extern crate log;
+snippet mod
+	mod ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+		${0}
+	} /* $1 */
+snippet crate
+	// Crate ID
+	#![crate_id = "${1:crate_name}#${2:0.0.1}"]
+	// Additional metadata attributes
+	#![desc = "${3:Descrption.}"]
+	#![license = "${4:BSD}"]
+	#![comment = "${5:Comment.}"]
+	// Specify the output type
+	#![crate_type = "${6:lib}"]
+snippet allow
+	#[allow(${1:unused_variable})]
+snippet feat
+	#![feature(${1:macro_rules})]
+# Common types
+snippet opt
+	Option<${1:int}>
+snippet res
+	Result<${1:~str}, ${2:()}>
+snippet if
+	if ${1:/* condition */} {
+		${0}
+	}
+snippet mat
+	match ${1} {
+		${2} => ${3},
+	}
+snippet while
+	while ${1:condition} {
+		${0}
+	}
+snippet for
+	for ${1:i} in ${2:range(0u, 10)} {
+		${0}
+	}
+snippet spawn
+	spawn(proc() {
+		${0}
+	});
+snippet chan
+	let (${1:tx}, ${2:rx}): (Sender<${3:int}>, Receiver<${4:int}>) = channel();
+snippet duplex
+	let (${1:from_child}, ${2:to_child}) = sync::duplex();
+# TODO commenting
+snippet todo
+	// [TODO]: ${1:Description}
+# Struct
+snippet st
+	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+		${0}
+	}
+
+	impl $1 {
+		pub fn new(${2}) -> $1 {
+			${4}return $1 {
+				${5}
+			};
+		}
+	}
+# Enum
+snippet enum
+	enum ${1:enum_name} {
+		${0},
+	}
+# Impl
+snippet imp
+	impl ${1:Name} {
+		${0}
+	}
+snippet drop
+	impl Drop for ${1:Name} {
+		fn drop(&mut self) {
+			${0}
+		}
+	}
+# Traits
+snippet trait
+	trait ${1:Name} {
+		${0}
+	}
+# Statics
+snippet ss
+	static ${1}: &'static str = "${0}";
+snippet stat
+	static ${1}: ${2:uint} = ${0};

From 71ac9c80e519dd19a8708d4d6bd1ce719ec3a88a Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <l-m-h@web.de>
Date: Tue, 6 May 2014 09:19:30 +0200
Subject: [PATCH 0311/1587] update vim snippet for plugin definition with
 Vundle.vim

Vundle has changed it's public API.  The Bundle command is deprecated.  See
https://github.com/gmarik/Vundle.vim/blob/v0.10/doc/vundle.txt#L372
---
 snippets/vim.snippets | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index 8e8093b9d..c1b802a5e 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -46,5 +46,7 @@ snippet au
 		" this one is which you're most likely to use?
 		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${0}
 	augroup end
-snippet bun
-	Bundle '${0}'
+snippet bun Vundle.vim Plugin definition
+	Plugin '${0}'
+snippet plug Vundle.vim Plugin definition
+	Plugin '${0}'

From 7011d0f9d5da3b0414613ab2e9f99d6dcd72f49f Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <l-m-h@web.de>
Date: Tue, 6 May 2014 11:31:43 +0200
Subject: [PATCH 0312/1587] remove some duplicates

Remove some snippets from the Ultisnips/ directory which are present in the
snippets/ directory.
---
 UltiSnips/vim.snippets | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/UltiSnips/vim.snippets b/UltiSnips/vim.snippets
index 5ff22d2eb..2e25ffd78 100644
--- a/UltiSnips/vim.snippets
+++ b/UltiSnips/vim.snippets
@@ -3,15 +3,6 @@ priority -50
 ###########################################################################
 #                            SnipMate Snippets                            #
 ###########################################################################
-snippet header
-" File: ${1:`!v expand('%:t')`}
-" Author: ${2:`!v g:snips_author`}
-" Description: ${3}
-${4:" Last Modified: `!v strftime("%B %d, %Y")`}
-
-$0
-endsnippet
-
 snippet gvar "Global / configuration variable"
 if !exists("g:${1:MyUltraImportantVar}")
 	let g:$1 = ${2:"${3:<tab>}"}
@@ -30,31 +21,4 @@ fun ${1:function_name}(${2})
 	${3:" code}
 endf
 endsnippet
-
-snippet for
-for ${1:needle} in ${2:haystack}
-	${3:" code}
-endfor
-endsnippet
-
-snippet wh
-while ${1:condition}
-	${2:" code}
-endw
-endsnippet
-
-snippet if
-if ${1:condition}
-	${2:" code}
-endif
-endsnippet
-
-snippet ife
-if ${1:condition}
-	${2}
-else
-	${3}
-endif
-endsnippet
-
 # vim:ft=snippets:

From 08afc0ea66163c64cf8e51cbaac5c1c69cea3f5d Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 6 May 2014 12:22:24 +0200
Subject: [PATCH 0313/1587] allow discussing UltiSnips & snipmate snippets

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index d90dbe9e4..d1da9f310 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,8 @@ in UltiSnips. This would avoid most duplication while still serving most users.
 AFAIK there is a nested-placeholder branch for snipmate too. snipmate is still
 improved by Adnan Zafar. So maybe time is not ready to make a final decision yet.
 
+[https://github.com/honza/vim-snippets/issues/363](github issue/discussion)
+
 Installation
 ------------
 

From 2f5e1dace47932c0279d50f5691bd756bed27092 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 6 May 2014 13:09:47 +0200
Subject: [PATCH 0314/1587] fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d1da9f310..ed1824eb9 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ in UltiSnips. This would avoid most duplication while still serving most users.
 AFAIK there is a nested-placeholder branch for snipmate too. snipmate is still
 improved by Adnan Zafar. So maybe time is not ready to make a final decision yet.
 
-[https://github.com/honza/vim-snippets/issues/363](github issue/discussion)
+[github issue/discussion](https://github.com/honza/vim-snippets/issues/363)
 
 Installation
 ------------

From 9376b6ea35fece581aa7ad3f1255e9193dad8af9 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 6 May 2014 13:13:44 +0200
Subject: [PATCH 0315/1587] merging "contributing notes" into "Policies for
 contributors" - thanks lucc

---
 README.md | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index ed1824eb9..bf8b3346d 100644
--- a/README.md
+++ b/README.md
@@ -130,6 +130,13 @@ What about one line if ee then .. else .. vs if \n .. then \n ... \n else \n ..
 Which additional policies to add?
 Discuss at: https://github.com/honza/vim-snippets/issues/230
 
+*folding markers*:
+Until further work is done on `vim-snipmate`, please don't add folding markers
+into snippets. `vim-snipmate` has some comments about how to patch all snippets
+on the fly adding those.
+
+Currently all snippets from UltiSnips have been put into UltiSnips - some work
+on merging should be done (dropping duplicates etc). Also see engines section above.
 
 Related repositories
 --------------------
@@ -206,20 +213,6 @@ This list is kept up-to-date on a best effort basis.
 * Falcon - [steveno](https://github.com/steveno)
 * Elixir - [iurifq](https://github.com/iurifq)
 
-Contributing notes
-------------------
-
-Until further work is done on `vim-snipmate`, please don't add folding markers
-into snippets. `vim-snipmate` has some comments about how to patch all snippets
-on the fly adding those.
-
-Because UltiSnips reads snipmate-snippets too there is no need to duplicate all
-snippets - only those snippets who use advanced UltiSnips features should be
-duplicated in UltiSnips.
-
-Currently all snippets from UltiSnips have been put into UltiSnips - some work
-on merging should be done (dropping duplicates etc)
-
 License
 -------
 

From 85004a6c6008067bf1f86d9a411c7d68114bafd6 Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <l-m-h@web.de>
Date: Tue, 6 May 2014 08:41:56 +0200
Subject: [PATCH 0316/1587] add snippet descriptions

---
 UltiSnips/tex.snippets | 2 +-
 UltiSnips/vim.snippets | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index c32d21f15..9ce807e15 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -8,7 +8,7 @@ snippet "b(egin)?" "begin{} / end{}" br
 \end{$1}
 endsnippet
 
-snippet tab
+snippet tab "tabular / array environment"
 \begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
 $0${2/((?<=.)c|l|r)|./(?1: & )/g}
 \end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
diff --git a/UltiSnips/vim.snippets b/UltiSnips/vim.snippets
index 2e25ffd78..29a684ade 100644
--- a/UltiSnips/vim.snippets
+++ b/UltiSnips/vim.snippets
@@ -9,14 +9,14 @@ if !exists("g:${1:MyUltraImportantVar}")
 endif
 endsnippet
 
-snippet guard
+snippet guard "script reload guard"
 if exists('${1:did_`!p snip.rv = snip.fn.replace('.','_')`}') || &cp${2: || version < 700}
 	finish
 endif
 let $1 = 1${3}
 endsnippet
 
-snippet f
+snippet f function
 fun ${1:function_name}(${2})
 	${3:" code}
 endf

From da157ef0793435ac3026cc6cbfa3ea7f595687e7 Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <l-m-h@web.de>
Date: Tue, 6 May 2014 09:16:15 +0200
Subject: [PATCH 0317/1587] add snippet descriptions

---
 snippets/tex.snippets | 136 +++++++++++++++++++++---------------------
 snippets/vim.snippets |  20 +++----
 2 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 8304953f7..37fcc91b6 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -1,215 +1,215 @@
 #PREAMBLE
 #newcommand
-snippet nc
+snippet nc \newcommand
 	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
 #usepackage
-snippet up
+snippet up \usepackage
 	\usepackage[${1:options}]{${2:package}} ${0}
 #newunicodechar
-snippet nuc
+snippet nuc \newunicodechar
 	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${0}
 #DeclareMathOperator
-snippet dmo
+snippet dmo \DeclareMathOperator
 	\DeclareMathOperator{${1}}{${2}} ${0}
 
 #DOCUMENT
 # \begin{}...\end{}
-snippet begin
+snippet begin \begin{} ... \end{} block
 	\begin{${1:env}}
 		${0}
 	\end{$1}
 # Tabular
-snippet tab
+snippet tab tabular (or arbitrary) environment
 	\begin{${1:tabular}}{${2:c}}
 		${0}
 	\end{$1}
-snippet thm
+snippet thm thm (or arbitrary) environment with optional argument
 	\begin[${1:author}]{${2:thm}}
 		${0}
 	\end{$2}
-snippet center
+snippet center center environment
 	\begin{center}
 		${0}
 	\end{center}
 # Align(ed)
-snippet ali
+snippet ali align(ed) environment
 	\begin{align${1:ed}}
 		\label{eq:${2}}
 		${0}
 	\end{align$1}
 # Gather(ed)
-snippet gat
+snippet gat gather(ed) environment
 	\begin{gather${1:ed}}
 		${0}
 	\end{gather$1}
 # Equation
-snippet eq
+snippet eq equation environment
 	\begin{equation}
 	\label{eq:${2}}
 		${0}
 	\end{equation}
 # Equation
-snippet eq*
+snippet eq* unnumbered equation environment
 	\begin{equation*}
 		${0}
 	\end{equation*}
 # Unnumbered Equation
-snippet \
+snippet \ unnumbered equation: \[ ... \]
 	\[
 		${0}
 	\]
 # Equation array
-snippet eqnarray
+snippet eqnarray eqnarray environment
 	\begin{eqnarray}
 		${0}
 	\end{eqnarray}
 # Label
-snippet lab
+snippet lab \label
 	\label{${1:eq:}${2:fig:}${3:tab:}${0}}
 # Enumerate
-snippet enum
+snippet enum enumerate environment
 	\begin{enumerate}
 		\item ${0}
 	\end{enumerate}
 # Itemize
-snippet itemize
+snippet itemize itemize environment
 	\begin{itemize}
 		\item ${0}
 	\end{itemize}
-snippet item
+snippet item \item
 	\item ${1}
 # Description
-snippet desc
+snippet desc description environment
 	\begin{description}
 		\item[${1}] ${0}
 	\end{description}
 # Endless new item
-snippet ]i
+snippet ]i \item (recursive)
 	\item ${1}
 		${0:]i}
 # Matrix
-snippet mat
+snippet mat smart matrix environment
 	\begin{${1:p/b/v/V/B/small}matrix}
 		${0}
 	\end{$1matrix}
 # Cases
-snippet cas
+snippet cas cases environment
 	\begin{cases}
 		${1:equation}, &\text{ if }${2:case}\\
 		${0}
 	\end{cases}
 # Split
-snippet spl
+snippet spl split environment
 	\begin{split}
 		${0}
 	\end{split}
 # Part
-snippet part
+snippet part document \part
 	\part{${1:part name}} % (fold)
 	\label{prt:${2:$1}}
 	${0}
 	% part $2 (end)
 # Chapter
-snippet cha
+snippet cha \chapter
 	\chapter{${1:chapter name}}
 	\label{cha:${2:$1}}
 	${0}
 # Section
-snippet sec
+snippet sec \section
 	\section{${1:section name}}
 	\label{sec:${2:$1}}
 	${0}
 # Section without number
-snippet sec*
+snippet sec* \section*
 	\section*{${1:section name}}
 	\label{sec:${2:$1}}
 	${0}
 # Sub Section
-snippet sub
+snippet sub \subsection
 	\subsection{${1:subsection name}}
 	\label{sub:${2:$1}}
 	${0}
 # Sub Section without number
-snippet sub*
+snippet sub* \subsection*
 	\subsection*{${1:subsection name}}
 	\label{sub:${2:$1}}
 	${0}
 # Sub Sub Section
-snippet subs
+snippet subs \subsubsection
 	\subsubsection{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
 	${0}
 # Sub Sub Section without number
-snippet subs*
+snippet subs* \subsubsection*
 	\subsubsection*{${1:subsubsection name}}
 	\label{ssub:${2:$1}}
 	${0}
 # Paragraph
-snippet par
+snippet par \paragraph
 	\paragraph{${1:paragraph name}}
 	\label{par:${2:$1}}
 	${0}
 # Sub Paragraph
-snippet subp
+snippet subp \subparagraph
 	\subparagraph{${1:subparagraph name}}
 	\label{subp:${2:$1}}
 	${0}
-snippet ni
+snippet ni \noindent
 	\noindent
 	${0}
 #References
-snippet itd
+snippet itd description \item
 	\item[${1:description}] ${0:item}
-snippet figure
+snippet figure reference to a figure
 	${1:Figure}~\ref{${2:fig:}}
-snippet table
+snippet table reference to a table
 	${1:Table}~\ref{${2:tab:}}
-snippet listing
+snippet listing reference to a listing
 	${1:Listing}~\ref{${2:list}}
-snippet section
+snippet section reference to a section
 	${1:Section}~\ref{sec:${2}} ${0}
-snippet page
+snippet page reference to a page
 	${1:page}~\pageref{${2}} ${0}
-snippet index
+snippet index \index
 	\index{${1:index}} ${0}
 #Citations
-snippet citen
+snippet citen \citen
 	\citen{${1}} ${0}
 # natbib citations
-snippet citep
+snippet citep \citep
 	\citep{${1}} ${0}
-snippet citet
+snippet citet \citet
 	\citet{${1}} ${0}
-snippet cite
+snippet cite \cite[]{}
 	\cite[${1}]{${2}} ${0}
-snippet citea
+snippet citea \citeauthor
 	\citeauthor{${1}} ${0}
-snippet citey
+snippet citey \citeyear
 	\citeyear{${1}} ${0}
-snippet fcite
+snippet fcite \footcite[]{}
 	\footcite[${1}]{${2}}${0}
 #Formating text: italic, bold, underline, small capital, emphase ..
-snippet it
+snippet it italic text
 	\textit{${0:text}}
-snippet bf
+snippet bf bold face text
 	\textbf{${0:text}}
-snippet under
+snippet under underline text
 	\underline{${0:text}}
-snippet emp
+snippet emp emphasize text
 	\emph{${0:text}}
-snippet sc
+snippet sc small caps text
 	\textsc{${0:text}}
 #Choosing font
-snippet sf
+snippet sf sans serife text
 	\textsf{${0:text}}
-snippet rm
+snippet rm roman font text
 	\textrm{${0:text}}
-snippet tt
+snippet tt typewriter (monospace) text
 	\texttt{${0:text}}
 #misc
-snippet ft
+snippet ft \footnote
 	\footnote{${0:text}}
-snippet fig
+snippet fig figure environment (includegraphics)
 	\begin{figure}
 	\begin{center}
 		\includegraphics[scale=${1}]{Figures/${2}}
@@ -218,7 +218,7 @@ snippet fig
 	\label{fig:${4}}
 	\end{figure}
 	${0}
-snippet tikz
+snippet tikz figure environment (tikzpicture)
 	\begin{figure}
 	\begin{center}
 	\begin{tikzpicture}[scale=${1:1}]
@@ -230,31 +230,31 @@ snippet tikz
 	\end{figure}
 	${0}
 #math
-snippet stackrel
+snippet stackrel \stackrel{}{}
 	\stackrel{${1:above}}{${2:below}} ${0}
-snippet frac
+snippet frac \frac{}{}
 	\frac{${1:num}}{${2:denom}} ${0}
-snippet sum
+snippet sum \sum^{}_{}
 	\sum^{${1:n}}_{${2:i=1}} ${0}
-snippet lim
+snippet lim \lim_{}
 	\lim_{${1:x \to +\infty}} ${0}
-snippet frame
+snippet frame frame environment
 	\begin{frame}[${1:t}]{${2:title}}
 		${0}
 	\end{frame}
-snippet block
+snippet block block environment
 	\begin{block}{${1:title}}
 	${0}
 	\end{block}
-snippet alert
+snippet alert alertblock environment
 	\begin{alertblock}{${1:title}}
 	${0}
 	\end{alertblock}
-snippet example
+snippet example exampleblock environment
 	\begin{exampleblock}{${1:title}}
 	${0}
 	\end{exampleblock}
-snippet col2
+snippet col2 two-column environment
 	\begin{columns}
 		\begin{column}{0.5\textwidth}
 			${1}
diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index c1b802a5e..b299f5121 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -1,47 +1,47 @@
-snippet header
+snippet header standard Vim script file header
 	" File: ${1:`expand('%:t')`}
 	" Author: ${2:`g:snips_author`}
 	" Description: ${3}
 	${0:" Last Modified: `strftime("%B %d, %Y")`}
-snippet guard
+snippet guard script reload guard
 	if exists('${1:did_`vim_snippets#Filename()`}') || &cp${2: || version < 700}
 		finish
 	endif
 	let $1 = 1${0}
-snippet f
+snippet f function
 	fun! ${1:`expand('%') =~ 'autoload' ? substitute(matchstr(expand('%:p'),'autoload/\zs.*\ze.vim'),'[/\\]','#','g').'#' : ''`}${2:function_name}(${3})
 		${0}
 	endf
-snippet t
+snippet t try ... catch statement
 	try
 		${1}
 	catch ${2}
 		${0}
 	endtry
-snippet for
+snippet for for ... in loop
 	for ${1} in ${2}
 		${0}
 	endfor
-snippet forkv
+snippet forkv for [key, value] in loop
 	for [${1},${2}] in items(${3})
 		${0}
 		unlet $1 $2
 	endfor
-snippet wh
+snippet wh while loop
 	while ${1}
 		${0}
 	endw
-snippet if
+snippet if if statement
 	if ${1}
 		${0}
 	endif
-snippet ife
+snippet ife if ... else statement
 	if ${1}
 		${2}
 	else
 		${0}
 	endif
-snippet au
+snippet au augroup ... autocmd block
 	augroup ${1:AU_NAME}
 		" this one is which you're most likely to use?
 		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${0}

From 27c2c2ba7beb2ee8ac861eb34206599fa016f5b5 Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <l-m-h@web.de>
Date: Tue, 6 May 2014 14:52:35 +0200
Subject: [PATCH 0318/1587] add quotation marks

---
 UltiSnips/vim.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/vim.snippets b/UltiSnips/vim.snippets
index 29a684ade..fc8f9e1f6 100644
--- a/UltiSnips/vim.snippets
+++ b/UltiSnips/vim.snippets
@@ -16,7 +16,7 @@ endif
 let $1 = 1${3}
 endsnippet
 
-snippet f function
+snippet f "function"
 fun ${1:function_name}(${2})
 	${3:" code}
 endf

From 2672bde2fb1d9846ead1fa3285f451f0d71957c6 Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <l-m-h@web.de>
Date: Tue, 6 May 2014 14:53:52 +0200
Subject: [PATCH 0319/1587] add snippet options to some snippets

---
 UltiSnips/tex.snippets | 2 +-
 UltiSnips/vim.snippets | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 9ce807e15..ede9090d9 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -8,7 +8,7 @@ snippet "b(egin)?" "begin{} / end{}" br
 \end{$1}
 endsnippet
 
-snippet tab "tabular / array environment"
+snippet tab "tabular / array environment" b
 \begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
 $0${2/((?<=.)c|l|r)|./(?1: & )/g}
 \end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
diff --git a/UltiSnips/vim.snippets b/UltiSnips/vim.snippets
index fc8f9e1f6..dbb2396db 100644
--- a/UltiSnips/vim.snippets
+++ b/UltiSnips/vim.snippets
@@ -3,20 +3,20 @@ priority -50
 ###########################################################################
 #                            SnipMate Snippets                            #
 ###########################################################################
-snippet gvar "Global / configuration variable"
+snippet gvar "Global / configuration variable" b
 if !exists("g:${1:MyUltraImportantVar}")
 	let g:$1 = ${2:"${3:<tab>}"}
 endif
 endsnippet
 
-snippet guard "script reload guard"
+snippet guard "script reload guard" b
 if exists('${1:did_`!p snip.rv = snip.fn.replace('.','_')`}') || &cp${2: || version < 700}
 	finish
 endif
 let $1 = 1${3}
 endsnippet
 
-snippet f "function"
+snippet f "function" b
 fun ${1:function_name}(${2})
 	${3:" code}
 endf

From d0d1e59ad081497dad61f4ab403fe3e0bb067b03 Mon Sep 17 00:00:00 2001
From: Gilad Peleg <giladp007@gmail.com>
Date: Wed, 7 May 2014 10:19:01 +0300
Subject: [PATCH 0320/1587] Add useful javascript snippets

---
 UltiSnips/javascript.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index f8d4790e4..bdc72167d 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -79,6 +79,14 @@ setTimeout(function() {
 }${2:.bind(${3:this})}, ${1:10});
 endsnippet
 
+snippet fi "for prop in obj using hasOwnProperty"
+for (${1:prop} in ${2:obj}){
+	if ($2.hasOwnProperty($1)) {
+		${0:// body...}
+	}
+}
+endsnippet
+
 # Snippets for Console Debug Output
 
 snippet ca "console.assert" b
@@ -121,6 +129,10 @@ snippet cl "console.log" b
 console.log(${1:"${2:value}"});
 endsnippet
 
+snippet cd "console.debug" b
+console.debug(${1:"${2:value}"});
+endsnippet
+
 snippet cprof "console.profile" b
 console.profile("${1:label}");
 ${VISUAL}$0

From 98b1b48d926fb31e76bd137ab43c1bd5c21ce317 Mon Sep 17 00:00:00 2001
From: Gilad Peleg <giladp007@gmail.com>
Date: Wed, 7 May 2014 15:09:41 +0300
Subject: [PATCH 0321/1587] add b flag and edit placeholder

---
 UltiSnips/javascript.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index bdc72167d..f8dabf174 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -79,10 +79,10 @@ setTimeout(function() {
 }${2:.bind(${3:this})}, ${1:10});
 endsnippet
 
-snippet fi "for prop in obj using hasOwnProperty"
+snippet fi "for prop in obj using hasOwnProperty" b
 for (${1:prop} in ${2:obj}){
 	if ($2.hasOwnProperty($1)) {
-		${0:// body...}
+		$0
 	}
 }
 endsnippet

From e7f047b666dad4b0413d634d1c8d67131fe6c450 Mon Sep 17 00:00:00 2001
From: Gilad Peleg <giladp007@gmail.com>
Date: Wed, 7 May 2014 15:10:33 +0300
Subject: [PATCH 0322/1587] Update javascript.snippets

---
 UltiSnips/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index f8dabf174..5889e0591 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -82,7 +82,7 @@ endsnippet
 snippet fi "for prop in obj using hasOwnProperty" b
 for (${1:prop} in ${2:obj}){
 	if ($2.hasOwnProperty($1)) {
-		$0
+		${VISUAL}$0
 	}
 }
 endsnippet

From 24388213403098463b9c58a3023202e3a2b6b310 Mon Sep 17 00:00:00 2001
From: Josh Wainwright <wainwright.ja@gmail.com>
Date: Wed, 7 May 2014 22:45:53 +0100
Subject: [PATCH 0323/1587] Added semi-colons to end of lines where missing.

---
 UltiSnips/java.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 21be6bef9..ab27a6ae5 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -141,7 +141,7 @@ if len(args) > 0:
 	public `!p snip.rv = snip.basename or "unknown"`($1) { `!p
 args = getArgs(t[1])
 for i in args:
-	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1]
+	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1] + ";"
 if len(args) == 0:
 	snip.rv += "\n"`
 	}
@@ -224,7 +224,7 @@ $0
 endsnippet
 
 snippet im "import"  b
-import ${1:java}.${2:util}.$0
+import ${1:java}.${2:util}.$0;
 endsnippet
 
 snippet in "interface" b
@@ -269,7 +269,7 @@ if len(args) > 0:
 public `!p snip.rv = snip.basename or "unknown"`($1) { `!p
 args = getArgs(t[1])
 for i in args:
-	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1]
+	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1] + ";"
 if len(args) == 0:
 	snip.rv += "\n"`
 }

From 33830aea0c3122a3fe9f52ecbe9a8638f1106a4c Mon Sep 17 00:00:00 2001
From: Josh Wainwright <wainwright.ja@gmail.com>
Date: Wed, 7 May 2014 22:46:43 +0100
Subject: [PATCH 0324/1587] Added couple of $0 anchors where missing.

---
 UltiSnips/java.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index ab27a6ae5..36655f857 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -64,7 +64,7 @@ assert ${1:test}${2/(.+)/(?1: \: ")/}${2:Failure message}${2/(.+)/(?1:")/};$0
 endsnippet
 
 snippet at "assert true" b
-assertTrue(${1:actual});
+assertTrue(${1:actual});$0
 endsnippet
 
 snippet af "assert false" b
@@ -72,7 +72,7 @@ assertFalse(${1:actual});$0
 endsnippet
 
 snippet ae "assert equals" b
-assertEquals(${1:expected}, ${2:actual});
+assertEquals(${1:expected}, ${2:actual});$0
 endsnippet
 
 snippet br "break"

From 3cb138312fa235ccac0ab9a813aff57be79a95df Mon Sep 17 00:00:00 2001
From: Josh Wainwright <wainwright.ja@gmail.com>
Date: Thu, 8 May 2014 08:47:05 +0100
Subject: [PATCH 0325/1587] Removed implicit $0 at end of snippent

---
 UltiSnips/java.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 36655f857..045eebeda 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -60,19 +60,19 @@ abstract $0
 endsnippet
 
 snippet as "assert" b
-assert ${1:test}${2/(.+)/(?1: \: ")/}${2:Failure message}${2/(.+)/(?1:")/};$0
+assert ${1:test}${2/(.+)/(?1: \: ")/}${2:Failure message}${2/(.+)/(?1:")/};
 endsnippet
 
 snippet at "assert true" b
-assertTrue(${1:actual});$0
+assertTrue(${1:actual});
 endsnippet
 
 snippet af "assert false" b
-assertFalse(${1:actual});$0
+assertFalse(${1:actual});
 endsnippet
 
 snippet ae "assert equals" b
-assertEquals(${1:expected}, ${2:actual});$0
+assertEquals(${1:expected}, ${2:actual});
 endsnippet
 
 snippet br "break"

From 0326b5ba97f69d493c426a7986752b37394a706b Mon Sep 17 00:00:00 2001
From: Josh Wainwright <wainwright.ja@gmail.com>
Date: Thu, 8 May 2014 08:48:09 +0100
Subject: [PATCH 0326/1587] Use more readable format for snippets including
 ending semi-colon.

---
 UltiSnips/java.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 045eebeda..02b95e1e2 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -141,7 +141,7 @@ if len(args) > 0:
 	public `!p snip.rv = snip.basename or "unknown"`($1) { `!p
 args = getArgs(t[1])
 for i in args:
-	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1] + ";"
+	snip.rv += "\n\t\tthis.%s = %s;" % (i[1], i[1])
 if len(args) == 0:
 	snip.rv += "\n"`
 	}
@@ -269,7 +269,7 @@ if len(args) > 0:
 public `!p snip.rv = snip.basename or "unknown"`($1) { `!p
 args = getArgs(t[1])
 for i in args:
-	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1] + ";"
+	snip.rv += "\n\t\tthis.%s = %s;" % (i[1], i[1])
 if len(args) == 0:
 	snip.rv += "\n"`
 }

From 84d9764fb5ad305317e2b95b002cea25a0e4a3be Mon Sep 17 00:00:00 2001
From: Miki Tebeka <miki.tebeka@gmail.com>
Date: Sat, 17 May 2014 07:11:35 +0300
Subject: [PATCH 0327/1587] Snippets for Go test and benchmark functions

---
 snippets/go.snippets | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 0239a3fbc..9d51e335b 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -230,3 +230,17 @@ snippet ga
 	go func(${1} ${2:type}) {
 		${3:/* code */}
 	}(${0})
+# test function
+snippet tst
+	func Test${1:name}(t *testing.T) {
+		${2}
+	}
+	${0}
+# benchmark function
+snippet bnch
+	func Benchmark${1:name}(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			${2}
+		}
+	}
+	${0}

From fb0a6fc758b3950948708aea68c6778628790e12 Mon Sep 17 00:00:00 2001
From: Miki Tebeka <miki.tebeka@gmail.com>
Date: Sun, 18 May 2014 07:49:08 +0300
Subject: [PATCH 0328/1587] Better name

---
 snippets/go.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 9d51e335b..86be14025 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -231,13 +231,13 @@ snippet ga
 		${3:/* code */}
 	}(${0})
 # test function
-snippet tst
+snippet test
 	func Test${1:name}(t *testing.T) {
 		${2}
 	}
 	${0}
 # benchmark function
-snippet bnch
+snippet bench
 	func Benchmark${1:name}(b *testing.B) {
 		for i := 0; i < b.N; i++ {
 			${2}

From 954853816a225f0e3afb5a6404ba8684a53aa811 Mon Sep 17 00:00:00 2001
From: Miki Tebeka <miki.tebeka@gmail.com>
Date: Sun, 18 May 2014 12:57:53 +0300
Subject: [PATCH 0329/1587] description after trigger

---
 snippets/go.snippets | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 86be14025..8623eda28 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -230,14 +230,12 @@ snippet ga
 	go func(${1} ${2:type}) {
 		${3:/* code */}
 	}(${0})
-# test function
-snippet test
+snippet test test function
 	func Test${1:name}(t *testing.T) {
 		${2}
 	}
 	${0}
-# benchmark function
-snippet bench
+snippet bench benchmark function
 	func Benchmark${1:name}(b *testing.B) {
 		for i := 0; i < b.N; i++ {
 			${2}

From d5e0cc53ba65792bcdd77f0103ce4214e5031fa6 Mon Sep 17 00:00:00 2001
From: Nico Suhl <nico@overninethousand.de>
Date: Thu, 22 May 2014 15:09:58 +0200
Subject: [PATCH 0330/1587] Add escaping of $

    without escaping the snippet can not be expanded
---
 snippets/sh.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 6bf7089cc..c9c6ebc3c 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -81,7 +81,7 @@ snippet getopt
 	done
 	shift $(($OPTIND-1))
 snippet root
-	if [ $(id -u) -ne 0 ]; then exec sudo $0; fi
+	if [ \$(id -u) -ne 0 ]; then exec sudo \$0; fi
 snippet fun
 	${1:function_name}() {
 		${0:#function_body}

From 8c2dd2be62ccde6791861ba37dc3006f8d69402b Mon Sep 17 00:00:00 2001
From: majjoha <mathias@mjj.io>
Date: Thu, 22 May 2014 15:30:56 +0200
Subject: [PATCH 0331/1587] Remove line breaks after snippets.

---
 snippets/elixir.snippets | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 303c29e40..077cf0310 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -6,122 +6,95 @@ snippet if if .. do .. end
 	if ${1} do
 		${0}
 	end
-
 snippet if if .. do: ..
 	if ${1:condition}, do: ${0}
-
 snippet ife if .. do .. else .. end
 	if ${1:condition} do
 		${2}
 	else
 		${0}
 	end
-
 snippet ife if .. do: .. else:
 	if ${1:condition}, do: ${2}, else: ${0}
-
 snippet unless unless .. do .. end
 	unless ${1} do
 		${0}
 	end
-
 snippet unless unless .. do: ..
 	unless ${1:condition}, do: ${0}
-
 snippet unlesse unless .. do .. else .. end
 	unless ${1:condition} do
 		${2}
 	else
 		${0}
 	end
-
 snippet unlesse unless .. do: .. else:
 	unless ${1:condition}, do: ${2}, else: ${0}
-
 snippet cond
 	cond do
 	${1} ->
 		${0}
 	end
-
 snippet case
 	case ${1} do
 	${2} ->
 		${0}
 	end
-
 snippet df
 	def ${1:name}, do: ${2}
-
 snippet def
 	def ${1:name} do
 		${0}
 	end
-
 snippet defim
 	defimpl ${1:protocol_name}, for: ${2:data_type} do
 		${0}
 	end
-
 snippet defma
 	defmacro ${1:name} do
 		${0}
 	end
-
 snippet defmo
 	defmodule ${1:module_name} do
 		${0}
 	end
-
 snippet defp
 	defp ${1:name} do
 		${0}
 	end
-
 snippet defpr
 	defprotocol ${1:name}, [${0:function}]
-
 snippet defr
 	defrecord ${1:record_name}, ${0:fields}
-
 snippet doc
 	@doc """
 	${0}
 	"""
-
 snippet fn
 	fn(${1:args}) -> ${0} end
-
 snippet fun
 	function do
 		${0}
 	end
-
 snippet mdoc
 	@moduledoc """
 	${0}
 	"""
-
 snippet rec
 	receive do
 	${1} ->
 		${0}
 	end
-
 snippet req
 	require ${0:module_name}
-
 snippet imp
 	import ${0:module_name}
-
 snippet ali
 	alias ${0:module_name}
-
 snippet test
 	test "${1:test_name}" do
 		${0}
 	end
-
 snippet try try .. rescue .. end
 	try do
 		${1}

From 0100f9c7eaf0da91a006731015081c7c43fbaeaf Mon Sep 17 00:00:00 2001
From: rsw0x <avoret@debian.c720>
Date: Wed, 28 May 2014 06:48:18 -0400
Subject: [PATCH 0332/1587] Fixed final switch in the UltiSnippets snippet

---
 UltiSnips/d.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/d.snippets b/UltiSnips/d.snippets
index 264c9d50b..9ce275130 100644
--- a/UltiSnips/d.snippets
+++ b/UltiSnips/d.snippets
@@ -151,7 +151,7 @@ switch(${1:/*var*/})
 endsnippet
 
 snippet fsw "final switch (fsw)"
-switch(${1:/*var*/})
+final switch(${1:/*var*/})
 {
 	case ${2:/*value*/}:
 		${3}

From c80c2812199c2304e8049a7195f342c88a6f937c Mon Sep 17 00:00:00 2001
From: Piotr Jawniak <sawyer47@gmail.com>
Date: Sat, 31 May 2014 13:40:59 +0200
Subject: [PATCH 0333/1587] New snippets and cleanup for Rust

---
 UltiSnips/rust.snippets | 111 +++++++++++++++++++++++++---------------
 1 file changed, 71 insertions(+), 40 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 99852266f..425833f52 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -4,9 +4,6 @@
 
 priority -50
 
-###############
-#  Functions  #
-###############
 snippet fn "A function, optionally with arguments and return type." b
 fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
 	${VISUAL}${0}
@@ -20,6 +17,16 @@ fn ${1:test_function_name}() {
 }
 endsnippet
 
+
+snippet bench "Bench function" b
+#[bench]
+fn ${1:bench_function_name}(b: &mut test::Bencher) {
+	b.iter(|| {
+		${VISUAL}${0}
+	})
+}
+endsnippet
+
 snippet new "A new function" b
 pub fn new(${2}) -> ${1:Name} {
 	${VISUAL}${0}return $1 { ${3} };
@@ -32,17 +39,33 @@ pub fn main() {
 }
 endsnippet
 
-
-
 snippet let "A let statement" b
 let ${1:name}${3} = ${VISUAL}${2};
 endsnippet
 
+snippet lmut "let mut = .." b
+let mut ${1:name}${3} = ${VISUAL}${2};
+endsnippet
+
+snippet pri "print!(..)" b
+print!("${1}"${2/..*/, /}${2});
+endsnippet
+
 snippet pln "println!(..)" b
 println!("${1}"${2/..*/, /}${2});
 endsnippet
 
+snippet fmt "format!(..)"
+format!("${1}"${2/..*/, /}${2});
+endsnippet
 
+snippet macro "macro_rules!" b
+macro_rules! ${1:name} (
+	(${2:matcher}) => (
+		${3}
+	)
+)
+endsnippet
 
 snippet ec "extern crate ..." b
 extern crate ${1:sync};
@@ -53,10 +76,10 @@ snippet ecl "...extern crate log;" b
 #[phase(syntax, link)] extern crate log;
 endsnippet
 
-snippet mod	 "A mod." b
+snippet mod	 "A module" b
 mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
 	${VISUAL}${0}
-} /* $1 */
+}
 endsnippet
 
 snippet crate "Create header information" b
@@ -80,35 +103,58 @@ snippet feat "#![feature(..)]" b
 #![feature(${1:macro_rules})]
 endsnippet
 
+snippet der "#![deriving(..)]" b
+#![deriving(${1:Show})]
+endsnippet
 
-##################
-#  Common types  #
-##################
 snippet opt "Option<..>"
 Option<${1:int}>
 endsnippet
 
 snippet res "Result<.., ..>"
-Result<${1:~str}, ${2:()}>
+Result<${1:int}, ${2:()}>
 endsnippet
 
+snippet if "if .. (if)" b
+if ${1} {
+	${VISUAL}${0}
+}
+endsnippet
 
+snippet el "else .. (el)"
+else {
+	${VISUAL}${0}
+}
+endsnippet
 
-
-snippet if "if .. (if)" b
-if ${1:/* condition */} {
+snippet eli "else if .. (eli)"
+else if ${1} {
 	${VISUAL}${0}
 }
 endsnippet
 
+snippet ife "if .. else (ife)"
+if ${1} {
+	${2}
+} else {
+	${3}
+}
+endsnippet
+
 snippet mat "match"
 match ${1} {
 	${2} => ${3},
 }
 endsnippet
 
+snippet loop "loop {}" b
+loop {
+	${VISUAL}${0}
+}
+endsnippet
+
 snippet while "while .. {}" b
-while ${1:condition} {
+while ${1} {
 	${VISUAL}${0}
 }
 endsnippet
@@ -133,25 +179,22 @@ snippet duplex "Duplex stream" b
 let (${1:from_child}, ${2:to_child}) = sync::duplex();
 endsnippet
 
-#####################
-#  TODO commenting  #
-#####################
 snippet todo "A Todo comment"
 // [TODO]: ${1:Description} - `!v strftime("%Y-%m-%d %I:%M%P")`
 endsnippet
 
+snippet fixme "FIXME comment"
+// FIXME: ${1}
+endsnippet
 
-############
-#  Struct  #
-############
 snippet st "Struct" b
-struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
+struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
 	${VISUAL}${0}
 }
 endsnippet
 
 snippet stn "Struct with new constructor." b
-pub struct ${1:`!p snip.rv = snip.basename.title() or "name"`} {
+pub struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
 	${3}
 }
 
@@ -164,20 +207,16 @@ impl $1 {
 }
 endsnippet
 
-
-##########
-#  Enum  #
-##########
 snippet enum "An enum" b
-enum ${1:enum_name} {
+enum ${1:Name} {
 	${VISUAL}${0},
 }
 endsnippet
 
+snippet type "A type" b
+type ${1:NewName} = ${VISUAL}${0};
+endsnippet
 
-##########
-#  Impl  #
-##########
 snippet imp "An impl" b
 impl ${1:Name} {
 	${VISUAL}${0}
@@ -192,20 +231,12 @@ impl Drop for ${1:Name} {
 }
 endsnippet
 
-
-############
-#  Traits  #
-############
-snippet trait "Trait block" b
+snippet trait "Trait definition" b
 trait ${1:Name} {
 	${VISUAL}${0}
 }
 endsnippet
 
-
-#############
-#  Statics  #
-#############
 snippet ss "A static string."
 static ${1}: &'static str = "${VISUAL}${0}";
 endsnippet

From b0733edacc606de180a3cb083212ef013ae1f136 Mon Sep 17 00:00:00 2001
From: Piotr Jawniak <sawyer47@gmail.com>
Date: Sun, 1 Jun 2014 10:12:07 +0200
Subject: [PATCH 0334/1587] One new snippet and one small fix for Rust

---
 UltiSnips/rust.snippets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 425833f52..d7f0047c0 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -103,8 +103,12 @@ snippet feat "#![feature(..)]" b
 #![feature(${1:macro_rules})]
 endsnippet
 
-snippet der "#![deriving(..)]" b
-#![deriving(${1:Show})]
+snippet der "#[deriving(..)]" b
+#[deriving(${1:Show})]
+endsnippet
+
+snippet attr "#[..]" b
+#[${1:inline}]
 endsnippet
 
 snippet opt "Option<..>"

From a973f6bc4692fd5e15a55f2ab922629d5a9aec5b Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Thu, 5 Jun 2014 17:41:17 +0200
Subject: [PATCH 0335/1587] Initial commit

---
 snippets/julia.snippets | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 snippets/julia.snippets

diff --git a/snippets/julia.snippets b/snippets/julia.snippets
new file mode 100644
index 000000000..b92c8c423
--- /dev/null
+++ b/snippets/julia.snippets
@@ -0,0 +1,36 @@
+snippet fun
+        function ${1:functionname}(${2:parameters})
+          ${0}
+        end
+
+# For loop iterating over iterable container
+snippet forin
+        for ${1} in ${2}
+          ${0}
+        end
+
+# Standard for loop
+snippet for
+        for ${1} = ${2}
+          ${0}
+        end
+
+# Nested for loop
+snippet fornest
+        for ${1} = ${2}, ${3} = ${4}
+          ${0}
+        end
+
+# While loop
+snippet while
+        while ${1} ${2:<=} ${3}
+          ${0}
+        end
+
+# Try catch
+snippet try
+        try
+          ${1}
+        catch ${2}
+          ${0}
+        end

From 1eeef032d35b3ebb9c61f984320fa5999f08a110 Mon Sep 17 00:00:00 2001
From: Vorzard <vorzard@betterjapanese.org>
Date: Sun, 8 Jun 2014 17:18:29 +0200
Subject: [PATCH 0336/1587] Add AGPL3

---
 snippets/_.snippets | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index 6a3d8b280..47917bbab 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -84,6 +84,24 @@ snippet LGPL3
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
 
+	${0}
+snippet AGPL3
+	${1:one line to give the program's name and a brief description.}
+	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 	${0}
 snippet BSD2
 	${1:one line to give the program's name and a brief description}

From ee3900ab7be5afddb8f0e90d4d69ad968a4ff70f Mon Sep 17 00:00:00 2001
From: Minjong Chung <mjipeo@gmail.com>
Date: Mon, 9 Jun 2014 14:42:09 +0900
Subject: [PATCH 0337/1587] Replace spaces with tabs to avoid Python syntax
 error

---
 snippets/_.snippets | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index 47917bbab..856160181 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -89,18 +89,18 @@ snippet AGPL3
 	${1:one line to give the program's name and a brief description.}
 	Copyright (C) `strftime("%Y")` ${2:copyright holder}
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as
+	published by the Free Software Foundation, either version 3 of the
+	License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 	${0}
 snippet BSD2

From b76fe5e8ef8dabf5a5eb3aae447b0bbb93169a5c Mon Sep 17 00:00:00 2001
From: emzap79 <kaktuuus@gmx.de>
Date: Mon, 9 Jun 2014 10:31:58 +0200
Subject: [PATCH 0338/1587] add cleaned-up snippets for R

---
 UltiSnips/r.snippets | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index 74ecc1d73..10c818c01 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -1,9 +1,42 @@
 priority -50
 
+global !p
+import os
+from vimsnippets import complete
+
+FIELD_TYPES = [
+'character',
+'data.frame',
+'integer',
+'list',
+'logical',
+'matrix',
+'numeric',
+'vector']
+endglobal
+
 snippet #! "Hashbang for Rscript (#!)" b
 #!/usr/bin/env Rscript
 endsnippet
 
+snippet setwd "Set workingdir" b
+setwd("${1:`!p snip.rv = os.getcwd()`}")
+endsnippet
+
+snippet as "Apply type on variable" w
+as.$1`!p snip.rv = complete(t[1], FIELD_TYPES)`(${2}${VISUAL})
+endsnippet
+
+snippet is "Test type on variable" w
+is.$1`!p snip.rv = complete(t[1], FIELD_TYPES)`(${2}${VISUAL})
+endsnippet
+
+snippet dl "Download and install a package" b
+download.file("${1:${VISUAL:url to package}}", destfile = "${2:${1/.*\/(\S*)$/(?1:$1)/ga}}")
+install.packages("$2", type = "source", repos = NULL)
+library("${3:${2/^(\w+)_.*$/(?1:$1)/ga}}")
+endsnippet
+
 snippet lib "Import a library"
 library(${0:package})
 endsnippet

From 32d8eafe1264d47083a1df3bc7d6c4fc1059c1af Mon Sep 17 00:00:00 2001
From: Louis <louis@lpil.co.uk>
Date: Mon, 9 Jun 2014 10:46:15 +0100
Subject: [PATCH 0339/1587] CSS pseudo elements & classes

---
 snippets/css.snippets | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/snippets/css.snippets b/snippets/css.snippets
index 8886643a4..c4a74dec9 100644
--- a/snippets/css.snippets
+++ b/snippets/css.snippets
@@ -965,3 +965,23 @@ snippet z:a
 	z-index: auto;
 snippet zoo
 	zoom: 1;
+snippet :h
+	:hover
+snippet :fc
+	:first-child
+snippet :lc
+	:last-child
+snippet :nc
+	:nth-child(${0})
+snippet :nlc
+	:nth-last-child(${0})
+snippet :oc
+	:only-child
+snippet :a
+	:after
+snippet :b
+	:before
+snippet ::a
+	::after
+snippet ::b
+	::before

From 0ec9a04f563086c9e7469401165a3268c29f2594 Mon Sep 17 00:00:00 2001
From: Ole Hansen <ole.hansen@fortis-it.de>
Date: Mon, 9 Jun 2014 17:29:58 +0200
Subject: [PATCH 0340/1587] Inserting filenames was not working for java
 snippets. Fixed by supplying the "$1" argument instead of an empty String.

---
 snippets/java.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index 1595ffc1a..3429a2bc8 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -39,11 +39,11 @@ snippet j.u
 ##
 ## Class
 snippet cl
-	class ${1:`vim_snippets#Filename("", "untitled")`} ${0}
+	class ${1:`vim_snippets#Filename("$1", "untitled")`} ${0}
 snippet in
-	interface ${1:`vim_snippets#Filename("", "untitled")`} ${2:extends Parent}
+	interface ${1:`vim_snippets#Filename("$1", "untitled")`} ${2:extends Parent}
 snippet tc
-	public class ${1:`vim_snippets#Filename()`} extends ${0:TestCase}
+	public class ${1:`vim_snippets#Filename("$1")`} extends ${0:TestCase}
 ##
 ## Class Enhancements
 snippet ext
@@ -144,7 +144,7 @@ snippet @au
 snippet @br
 	@brief ${0:Description}
 snippet @fi
-	@file ${0:`vim_snippets#Filename()`}.java
+	@file ${0:`vim_snippets#Filename("$1")`}.java
 snippet @pa
 	@param ${0:param}
 snippet @re

From e5293e3769608b0f4bbaf76587dfeea9448f81c6 Mon Sep 17 00:00:00 2001
From: Ole Hansen <ole.hansen@fortis-it.de>
Date: Mon, 9 Jun 2014 17:34:32 +0200
Subject: [PATCH 0341/1587] Added a trailing space to java snippets that will
 be followed by a space.

---
 snippets/java.snippets | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index 3429a2bc8..0f2a09518 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -1,10 +1,10 @@
 ## Access Modifiers
 snippet po
-	protected
+	protected ${0}
 snippet pu
-	public
+	public ${0}
 snippet pr
-	private
+	private ${0}
 ##
 ## Annotations
 snippet before
@@ -25,7 +25,7 @@ snippet oo
 ##
 ## Basic Java packages and import
 snippet im
-	import
+	import ${0}
 snippet j.b
 	java.beans.
 snippet j.i
@@ -47,9 +47,9 @@ snippet tc
 ##
 ## Class Enhancements
 snippet ext
-	extends
+	extends ${0}
 snippet imp
-	implements
+	implements ${0}
 ##
 ## Comments
 snippet /*
@@ -91,13 +91,13 @@ snippet v
 ##
 ## Enhancements to Methods, variables, classes, etc.
 snippet ab
-	abstract
+	abstract ${0}
 snippet fi
-	final
+	final ${0}
 snippet st
-	static
+	static ${0}
 snippet sy
-	synchronized
+	synchronized ${0}
 ##
 ## Error Methods
 snippet err
@@ -113,9 +113,9 @@ snippet as
 snippet ca
 	catch(${1:Exception} ${2:e}) ${0}
 snippet thr
-	throw
+	throw ${0}
 snippet ths
-	throws
+	throws ${0}
 snippet try
 	try {
 		${0}
@@ -206,7 +206,7 @@ snippet get
 ##
 ## Terminate Methods or Loops
 snippet re
-	return
+	return ${0}
 snippet br
 	break;
 ##

From 64a4d3c922f2f786202ff23ee7def3391da85f7e Mon Sep 17 00:00:00 2001
From: Ole Hansen <ole.hansen@fortis-it.de>
Date: Mon, 9 Jun 2014 19:10:02 +0200
Subject: [PATCH 0342/1587] Added declarations for common collections: d.al =
 declare array list; d.hm = declare hash map; d.hs = declare hash set; d.st =
 declare stack

---
 snippets/java.snippets | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index 0f2a09518..ab3564929 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -89,6 +89,19 @@ snippet m
 snippet v
 	${1:String} ${2:var}${3: = null}${4};
 ##
+## Declaration for ArrayList
+snippet d.al
+	List<${1:Object}> ${2:list} = ArrayList<$1>;${0}
+## Declaration for HashMap
+snippet d.hm
+	Map<${1:Object}, ${2:Object}> ${3:map} = HashMap<$1, $2>;${0}
+## Declaration for HashSet
+snippet d.hs
+	Set<${1:Object}> ${2:set} = HashSet<$1>;${0}
+## Declaration for Stack
+snippet d.st
+	Stack<${1:Object}> ${2:stack} = Stack<$1>;${0}
+##
 ## Enhancements to Methods, variables, classes, etc.
 snippet ab
 	abstract ${0}

From c24c99cc654eb2af38abe8cf532b94cc30623d4f Mon Sep 17 00:00:00 2001
From: Ole Hansen <ole.hansen@fortis-it.de>
Date: Wed, 11 Jun 2014 11:37:36 +0200
Subject: [PATCH 0343/1587] Corrected constructor call

---
 snippets/java.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index ab3564929..c3986d3ac 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -91,16 +91,16 @@ snippet v
 ##
 ## Declaration for ArrayList
 snippet d.al
-	List<${1:Object}> ${2:list} = ArrayList<$1>;${0}
+	List<${1:Object}> ${2:list} = new ArrayList<$1>();${0}
 ## Declaration for HashMap
 snippet d.hm
-	Map<${1:Object}, ${2:Object}> ${3:map} = HashMap<$1, $2>;${0}
+	Map<${1:Object}, ${2:Object}> ${3:map} = new HashMap<$1, $2>();${0}
 ## Declaration for HashSet
 snippet d.hs
-	Set<${1:Object}> ${2:set} = HashSet<$1>;${0}
+	Set<${1:Object}> ${2:set} = new HashSet<$1>();${0}
 ## Declaration for Stack
 snippet d.st
-	Stack<${1:Object}> ${2:stack} = Stack<$1>;${0}
+	Stack<${1:Object}> ${2:stack} = new Stack<$1>();${0}
 ##
 ## Enhancements to Methods, variables, classes, etc.
 snippet ab

From ad254f84b3f26187de5704dd3ccee2876a227a70 Mon Sep 17 00:00:00 2001
From: Ole Hansen <ole.hansen@fortis-it.de>
Date: Wed, 11 Jun 2014 15:31:01 +0200
Subject: [PATCH 0344/1587] Added singleton pattern

---
 snippets/java.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index c3986d3ac..e0965f1b1 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -102,6 +102,18 @@ snippet d.hs
 snippet d.st
 	Stack<${1:Object}> ${2:stack} = new Stack<$1>();${0}
 ##
+## Singleton Pattern
+snippet singlet
+	private static class Holder {
+		private static final ${1:`vim_snippets#Filename("$1")`} INSTANCE = new $1();
+	}
+
+	private $1() { }
+
+	private static $1 getInstance() {
+		return Holder.INSTANCE;
+	}
+##
 ## Enhancements to Methods, variables, classes, etc.
 snippet ab
 	abstract ${0}

From 33803e612384f107627882259dc5998dca5fcf1c Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Wed, 11 Jun 2014 17:09:13 +0200
Subject: [PATCH 0345/1587] Add ac Anchor from Clipboard.

---
 snippets/html.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index d4b5d3f81..5620caae0 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -147,6 +147,8 @@ snippet a:ext
 	<a href="http://${1:example.com}">${0:$1}</a>
 snippet a:mail
 	<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${0:email me}</a>
+snippet ac
+	<a href="`@+`">${0:`@+`}</a>
 snippet abbr
 	<abbr title="${1}">${0}</abbr>
 snippet address

From 7cd12215811c013d53370d58adeb0e075b40a814 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Wed, 11 Jun 2014 20:06:51 +0200
Subject: [PATCH 0346/1587] Changed from spaces to tabs

---
 snippets/julia.snippets | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/snippets/julia.snippets b/snippets/julia.snippets
index b92c8c423..3f84db5bd 100644
--- a/snippets/julia.snippets
+++ b/snippets/julia.snippets
@@ -1,36 +1,36 @@
 snippet fun
-        function ${1:functionname}(${2:parameters})
-          ${0}
-        end
+				function ${1:functionname}(${2:parameters})
+					${0}
+				end
 
 # For loop iterating over iterable container
 snippet forin
-        for ${1} in ${2}
-          ${0}
-        end
+				for ${1} in ${2}
+					${0}
+				end
 
 # Standard for loop
 snippet for
-        for ${1} = ${2}
-          ${0}
-        end
+				for ${1} = ${2}
+					${0}
+				end
 
 # Nested for loop
 snippet fornest
-        for ${1} = ${2}, ${3} = ${4}
-          ${0}
-        end
+				for ${1} = ${2}, ${3} = ${4}
+					${0}
+				end
 
 # While loop
 snippet while
-        while ${1} ${2:<=} ${3}
-          ${0}
-        end
+				while ${1} ${2:<=} ${3}
+					${0}
+				end
 
 # Try catch
 snippet try
-        try
-          ${1}
-        catch ${2}
-          ${0}
-        end
+				try
+					${1}
+				catch ${2}
+					${0}
+				end

From cbbb5b1720a4821254327f302077ee3b603baf06 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Wed, 11 Jun 2014 20:45:53 +0200
Subject: [PATCH 0347/1587] Fix indentation

---
 snippets/julia.snippets | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/snippets/julia.snippets b/snippets/julia.snippets
index 3f84db5bd..8a1dccc56 100644
--- a/snippets/julia.snippets
+++ b/snippets/julia.snippets
@@ -1,36 +1,36 @@
 snippet fun
-				function ${1:functionname}(${2:parameters})
-					${0}
-				end
+		function ${1:functionname}(${2:parameters})
+			${0}
+		end
 
 # For loop iterating over iterable container
 snippet forin
-				for ${1} in ${2}
-					${0}
-				end
+		for ${1} in ${2}
+			${0}
+		end
 
 # Standard for loop
 snippet for
-				for ${1} = ${2}
-					${0}
-				end
+		for ${1} = ${2}
+			${0}
+		end
 
 # Nested for loop
 snippet fornest
-				for ${1} = ${2}, ${3} = ${4}
-					${0}
-				end
+		for ${1} = ${2}, ${3} = ${4}
+			${0}
+		end
 
 # While loop
 snippet while
-				while ${1} ${2:<=} ${3}
-					${0}
-				end
+		while ${1} ${2:<=} ${3}
+			${0}
+		end
 
 # Try catch
 snippet try
-				try
-					${1}
-				catch ${2}
-					${0}
-				end
+		try
+			${1}
+		catch ${2}
+			${0}
+		end

From 8161986df3aadf1a77840fe2109d8ec41afe0379 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Wed, 11 Jun 2014 20:48:03 +0200
Subject: [PATCH 0348/1587] Fix indentation

---
 snippets/julia.snippets | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/snippets/julia.snippets b/snippets/julia.snippets
index 8a1dccc56..7fc2c7a1d 100644
--- a/snippets/julia.snippets
+++ b/snippets/julia.snippets
@@ -1,36 +1,36 @@
 snippet fun
-		function ${1:functionname}(${2:parameters})
-			${0}
-		end
+	function ${1:functionname}(${2:parameters})
+		${0}
+	end
 
 # For loop iterating over iterable container
 snippet forin
-		for ${1} in ${2}
-			${0}
-		end
+	for ${1} in ${2}
+		${0}
+	end
 
 # Standard for loop
 snippet for
-		for ${1} = ${2}
-			${0}
-		end
+	for ${1} = ${2}
+		${0}
+	end
 
 # Nested for loop
 snippet fornest
-		for ${1} = ${2}, ${3} = ${4}
-			${0}
-		end
+	for ${1} = ${2}, ${3} = ${4}
+		${0}
+	end
 
 # While loop
 snippet while
-		while ${1} ${2:<=} ${3}
-			${0}
-		end
+	while ${1} ${2:<=} ${3}
+		${0}
+	end
 
 # Try catch
 snippet try
-		try
-			${1}
-		catch ${2}
-			${0}
-		end
+	try
+		${1}
+	catch ${2}
+		${0}
+	end

From 335637c3b6378761ae413d2ddcc43a43572a7e2c Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Wed, 11 Jun 2014 20:48:03 +0200
Subject: [PATCH 0349/1587] Fix indentation

---
 snippets/julia.snippets | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/snippets/julia.snippets b/snippets/julia.snippets
index 8a1dccc56..e96bb504e 100644
--- a/snippets/julia.snippets
+++ b/snippets/julia.snippets
@@ -1,36 +1,37 @@
+# Standard function definition
 snippet fun
-		function ${1:functionname}(${2:parameters})
-			${0}
-		end
+	function ${1}(${2})
+		${0}
+	end
 
 # For loop iterating over iterable container
 snippet forin
-		for ${1} in ${2}
-			${0}
-		end
+	for ${1} in ${2}
+		${0}
+	end
 
 # Standard for loop
 snippet for
-		for ${1} = ${2}
-			${0}
-		end
+	for ${1} = ${2}
+		${0}
+	end
 
 # Nested for loop
 snippet fornest
-		for ${1} = ${2}, ${3} = ${4}
-			${0}
-		end
+	for ${1} = ${2}, ${3} = ${4}
+		${0}
+	end
 
 # While loop
 snippet while
-		while ${1} ${2:<=} ${3}
-			${0}
-		end
+	while ${1} ${2:<=} ${3}
+		${0}
+	end
 
 # Try catch
 snippet try
-		try
-			${1}
-		catch ${2}
-			${0}
-		end
+	try
+		${1}
+	catch ${2}
+		${0}
+	end

From 40e9ffc37108f1d4e339759c0d145b775088d304 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Thu, 12 Jun 2014 16:19:37 +0200
Subject: [PATCH 0350/1587] Fixes and additions

Various fixes to comply with vim-snippets conventions.
Addition of various new snippets.
---
 snippets/julia.snippets | 86 +++++++++++++++++++++++++++++++++++------
 1 file changed, 74 insertions(+), 12 deletions(-)

diff --git a/snippets/julia.snippets b/snippets/julia.snippets
index e96bb504e..77a7dacec 100644
--- a/snippets/julia.snippets
+++ b/snippets/julia.snippets
@@ -1,37 +1,99 @@
-# Standard function definition
-snippet fun
+snippet #!
+	#!/usr/bin/env julia
+
+# Functions
+snippet fun function definition
 	function ${1}(${2})
 		${0}
 	end
 
-# For loop iterating over iterable container
-snippet forin
+snippet ret return
+	return(${0})
+
+# Printing to console
+snippet pr print
+	print("${1}")
+	${0}
+
+snippet prl print line
+	println("${1}")
+	${0}
+
+# Includes
+snippet use load a package
+	using ${0}
+
+snippet incl include source code
+	include("${1}")
+	${0}
+
+# Loops
+snippet forc for loop iterating over iterable container
 	for ${1} in ${2}
 		${0}
 	end
 
-# Standard for loop
-snippet for
+snippet for standard for loop
 	for ${1} = ${2}
 		${0}
 	end
 
-# Nested for loop
-snippet fornest
+snippet fornest nested for loop
 	for ${1} = ${2}, ${3} = ${4}
 		${0}
 	end
 
-# While loop
-snippet while
+snippet wh while loop
 	while ${1} ${2:<=} ${3}
 		${0}
 	end
 
-# Try catch
-snippet try
+# Conditionals
+snippet if if statement
+	if ${1}
+		${0}
+	end
+
+snippet el else part of statement
+	else
+		${0}
+
+snippet eif else if part of if statement
+	else if ${1}
+		${0}
+
+snippet ife full if-else statement
+	if ${1}
+		${2}
+	else
+		${0}
+	end
+
+# Exceptions
+snippet try try catch
 	try
 		${1}
 	catch ${2}
 		${0}
 	end
+
+snippet fin finally statement
+	finally
+		${0}
+
+snippet thr throw
+	throw(${1})
+	${0}
+
+# Messages
+snippet in
+	info("${1}")
+	${0}
+
+snippet wa
+	warn("${1}")
+	${0}
+
+snippet err
+	error("${1}")
+	${0}

From 6acd456aae6b6a080530261db387d24fb9e63b31 Mon Sep 17 00:00:00 2001
From: opennota <opennota@gmail.com>
Date: Thu, 12 Jun 2014 21:14:53 +0700
Subject: [PATCH 0351/1587] Add fori snippet for Go

---
 UltiSnips/go.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/go.snippets b/UltiSnips/go.snippets
index d01e3f1c5..efd158925 100644
--- a/UltiSnips/go.snippets
+++ b/UltiSnips/go.snippets
@@ -52,6 +52,12 @@ for ${1:condition}${1/(.+)/ /}{
 }
 endsnippet
 
+snippet fori "Integer for loop" b
+for ${1:i} := 0; $1 < ${2:N}; $1++ {
+	${0:${VISUAL}}
+}
+endsnippet
+
 snippet forr "For range loop" b
 for ${2:name} := range ${1:collection} {
 	${0:${VISUAL}}

From bbf7e1394306a6a3964aa44d5d022f71526e8bd7 Mon Sep 17 00:00:00 2001
From: Li Xin <micro-tech@foxmail.com>
Date: Thu, 19 Jun 2014 00:14:51 +0800
Subject: [PATCH 0352/1587] Remove ; after "f"

Anonymouse functions may not need ; at most times.
---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 0a046dbf6..39a008ef9 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -13,7 +13,7 @@ snippet fun
 snippet f
 	function (${1}) {
 		${0}
-	}${2:;}
+	}
 # Immediate function
 snippet (f
 	(function (${1}) {

From 0f02b64b3d01ebd16a6e86cf393c3a5a2516d650 Mon Sep 17 00:00:00 2001
From: Li Xin <micro-tech@foxmail.com>
Date: Thu, 19 Jun 2014 00:18:33 +0800
Subject: [PATCH 0353/1587] Delete html_minimal.snippets

html_minimal.snippets has not been updated for 8 months. Some snippets is conflict with html.snippets.
---
 snippets/html_minimal.snippets | 72 ----------------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 snippets/html_minimal.snippets

diff --git a/snippets/html_minimal.snippets b/snippets/html_minimal.snippets
deleted file mode 100644
index 43e5d4a4e..000000000
--- a/snippets/html_minimal.snippets
+++ /dev/null
@@ -1,72 +0,0 @@
-# file containing most useful mappings only
-# when editing this file please be aware that there is ZenCoding and sparkup
-
-# html 5 is recommended from now on
-snippet html5
-	<!doctype html>
-	<html>
-	<head>
-		<meta charset="utf-8">
-		<title>$2</title>
-		$3
-	</head>
-	<body>
-	$4
-	</body>
-	</html>
-
-# ==== TAGS
-# you always need these:
-snippet .
-	class="${1}"
-snippet n
-	name="${1}"
-snippet r
-	rel="${1}"
-snippet t
-	title="${1}"
-
-# not using # because id is faster to type
-snippet id
-	id="${1}"
-snippet idn
-	id="${1}" name="${0:$1}"
-
-snippet label_and_input
-	<label for="${0:$1}">${1}</label>
-	<input type="${3:text}" name="${4:$2}" id="${5:$2}" value="${6}">
-
-
-# FORMS
-# use idn . or n to add id
-snippet input
-	<input type="${1:text}" value="${2}" ${3}>
-snippet submit
-	<input type="submit" value="${2}" ${3}>
-snippet textarea
-	<textarea $1>$2</textarea>
-
-# if you need id or class use snippets above
-snippet form
-	<form method="${1:post/get}" action="$2">
-        $3
-	</form>
-
-# other tags
-snippet br
-	<br/>
-snippet a
-	<a href="#" $2>$3</a>
-snippet img
-	<img src="$1" alt="$2"/>
-# JS/CSS
-snippet css_file
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
-snippet css_block
-	<style type='text/css'>
-	</style>
-snippet script_block
-	<script type="text/javascript" charset="utf-8">
-	</script>
-snippet script_file
-	<script src="${1}" type="text/javascript"></script>

From a84f6f3819c08b62b19408a3c27a87fab4c2ba88 Mon Sep 17 00:00:00 2001
From: Ole Hansen <ole.hansen@fortis-it.de>
Date: Sun, 22 Jun 2014 16:29:23 +0200
Subject: [PATCH 0354/1587] Fixed singleton getInstance

---
 snippets/java.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index e0965f1b1..ef29e801a 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -110,7 +110,7 @@ snippet singlet
 
 	private $1() { }
 
-	private static $1 getInstance() {
+	public static $1 getInstance() {
 		return Holder.INSTANCE;
 	}
 ##

From 0513b65541a1d06e625c9b36612f58183899f1ce Mon Sep 17 00:00:00 2001
From: Ole Hansen <ole.hansen@fortis-it.de>
Date: Sun, 22 Jun 2014 16:49:15 +0200
Subject: [PATCH 0355/1587] Added JUnit asserts and fail snippets

---
 snippets/java.snippets | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index ef29e801a..ea2ec7aa7 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -135,6 +135,24 @@ snippet errln
 ## Exception Handling
 snippet as
 	assert ${1:test} : "${2:Failure message}";
+snippet ae
+	assertEquals("${1:Failure message}", ${2:expected}, ${3:actual});
+snippet aae
+	assertArrayEquals("${1:Failure message}", ${2:expecteds}, ${3:actuals});
+snippet af
+	assertFalse("${1:Failure message}", ${2:condition});
+snippet at
+	assertTrue("${1:Failure message}", ${2:condition});
+snippet an
+	assertNull("${1:Failure message}", ${2:object});
+snippet ann
+	assertNotNull("${1:Failure message}", ${2:object});
+snippet ass
+	assertSame("${1:Failure message}", ${2:expected}, ${3:actual});
+snippet asns
+	assertNotSame("${1:Failure message}", ${2:expected}, ${3:actual});
+snippet fa
+	fail("${1:Failure message}");
 snippet ca
 	catch(${1:Exception} ${2:e}) ${0}
 snippet thr

From 79a0442e54d3b15249831b6099154b2dba04ed06 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Mon, 23 Jun 2014 12:37:17 +0200
Subject: [PATCH 0356/1587] Added ternary operator snippet

---
 snippets/julia.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/julia.snippets b/snippets/julia.snippets
index 77a7dacec..1876ed848 100644
--- a/snippets/julia.snippets
+++ b/snippets/julia.snippets
@@ -69,6 +69,9 @@ snippet ife full if-else statement
 		${0}
 	end
 
+snippet tern ternary operator
+	${1} ? ${2} : ${3:nothing}
+
 # Exceptions
 snippet try try catch
 	try

From db3a57e104d718027f00daf6a6d80a8012e22c6a Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Mon, 23 Jun 2014 12:37:34 +0200
Subject: [PATCH 0357/1587] Initial commit

Adds snippets for function and type documentation, as used by the
DataArrays package for Julia.

Adds TODO snippet.
---
 UltiSnips/julia.snippets | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 UltiSnips/julia.snippets

diff --git a/UltiSnips/julia.snippets b/UltiSnips/julia.snippets
new file mode 100644
index 000000000..ac4929dea
--- /dev/null
+++ b/UltiSnips/julia.snippets
@@ -0,0 +1,38 @@
+# Documentation
+snippet docf "function documentation"
+#' @description
+#'
+#' ${1:function description}
+#'
+#' ${2:@param ${3:name}::${4:Type} ${5:Description}}
+#'
+#' ${6:@returns ${7:name}::${8:Type} ${9:Description}}
+#'
+#' @examples
+#'
+#' ${10: function call examples}
+endsnippet
+
+snippet doct "type definition"
+#' @description
+#'
+#' ${1:type description}
+#'
+#' ${2:@field ${3:name}::${4:Type} ${5:Description}}
+#'
+#' @examples
+#'
+#' ${10: constructor examples}
+endsnippet
+
+snippet par "function parameter documentation"
+#' @param ${1:name}::${2:Type} ${0:Description}
+endsnippet
+
+snippet fld "type field documentation"
+#' @field ${1:name}::${2:Type} ${0:Description}
+endsnippet
+
+snippet todo "todo entry"
+# TODO${1: (`whoami`, `date +%Y-%m-%d`)}: ${0}
+endsnippet

From 4a63c78bd16ce3f4c2acc1295ccc5ebea31a6815 Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Wed, 25 Jun 2014 11:01:10 +0200
Subject: [PATCH 0358/1587] Added b option, removed todo snippet.

---
 UltiSnips/julia.snippets | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/UltiSnips/julia.snippets b/UltiSnips/julia.snippets
index ac4929dea..259c5f4cf 100644
--- a/UltiSnips/julia.snippets
+++ b/UltiSnips/julia.snippets
@@ -1,5 +1,5 @@
 # Documentation
-snippet docf "function documentation"
+snippet docf "function documentation" b
 #' @description
 #'
 #' ${1:function description}
@@ -13,7 +13,7 @@ snippet docf "function documentation"
 #' ${10: function call examples}
 endsnippet
 
-snippet doct "type definition"
+snippet doct "type definition" b
 #' @description
 #'
 #' ${1:type description}
@@ -25,14 +25,10 @@ snippet doct "type definition"
 #' ${10: constructor examples}
 endsnippet
 
-snippet par "function parameter documentation"
+snippet par "function parameter documentation" b
 #' @param ${1:name}::${2:Type} ${0:Description}
 endsnippet
 
-snippet fld "type field documentation"
+snippet fld "type field documentation" b
 #' @field ${1:name}::${2:Type} ${0:Description}
 endsnippet
-
-snippet todo "todo entry"
-# TODO${1: (`whoami`, `date +%Y-%m-%d`)}: ${0}
-endsnippet

From 753e0ae39def2aaa82aea0b5caf18f46db081bdd Mon Sep 17 00:00:00 2001
From: zauguin <zauguin@gmail.com>
Date: Mon, 30 Jun 2014 06:46:10 +0200
Subject: [PATCH 0359/1587] Added ${VISUAL} to C once snippet

---
 UltiSnips/c.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 21dd87b0d..e6ea2f9d2 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -74,7 +74,7 @@ else:
 	snip.rv = snip.c`}
 #define $1
 
-${0}
+${VISUAL}${0}
 
 #endif /* end of include guard: $1 */
 

From 43b272fd393c9d9b454f9efc82d67e95140f6d9b Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 1 Jul 2014 20:35:16 +0200
Subject: [PATCH 0360/1587] name/array/bar in php's fun snippet is annoying,
 remove them

There are anonymous functions, too: $a = function(){ .. };
---
 snippets/php.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index d7b21eb5c..831d53db4 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -40,7 +40,7 @@ snippet i
 snippet t.
 	$this->
 snippet f
-	function ${1:foo}(${2:array }${3:$bar})
+	function ${1}(${3})
 	{
 		${0}
 	}

From f11ec0bf184d8e54ae47f41205c64f3750ff2732 Mon Sep 17 00:00:00 2001
From: Jan Mollowitz <janmollowitz@gmail.com>
Date: Tue, 1 Jul 2014 21:47:05 +0200
Subject: [PATCH 0361/1587] Added basic class with namespace snippet.

---
 UltiSnips/php_symfony2.snippets | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/UltiSnips/php_symfony2.snippets b/UltiSnips/php_symfony2.snippets
index 3d433169d..55423e713 100644
--- a/UltiSnips/php_symfony2.snippets
+++ b/UltiSnips/php_symfony2.snippets
@@ -3,6 +3,28 @@
 
 priority -50
 
+snippet classn "Basic class with namespace snippet" b
+namespace `!p
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+/**
+ * ${1:@author `whoami`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+`$2
+{
+    public function __construct(${3:$options})
+    {
+        ${4:// code}
+    }$0
+}
+endsnippet
+
 snippet contr "Symfony2 controller" b
 namespace `!p
 abspath = os.path.abspath(path)

From bb3540919945570de950a83a20f34ff49f5de752 Mon Sep 17 00:00:00 2001
From: Christian <cn00@gmx.at>
Date: Thu, 3 Jul 2014 12:52:40 +0200
Subject: [PATCH 0362/1587] Fix and improve rst_char_len

The previously used regex was plainly wrong (see #394). This solution should be more solid.
---
 UltiSnips/rst.snippets | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 3763a95e9..5c1df1c14 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -74,15 +74,17 @@ def check_file_exist(rst_path, relative_path):
 		return abs_path
 
 
-def rst_char_len(char):
-	"""
-	return len of string which fit in rst
-	For instance:chinese "我" decode as only one character,
-	However, the rst interpreter needs 2 "=" instead of 1.
+try:
+	rst_char_len = vim.strwidth  # Requires Vim 7.3+
+except AttributeError:
+	from unicodedata import east_asian_width  # Requires Python 2.4+
+	def rst_char_len(s):
+		"""Return the required over-/underline length for s."""
+		result = 0
+		for c in s:
+			result += 2 if east_asian_width(c) in ('W', 'F') else 1
+		return result
 
-	:param: char needs to be count
-	"""
-	return len(re.findall(r'[^\u4e00-\u9fff\s]', char))+len(char)
 
 def	make_items(times, leading='+'):
 	"""

From 6c0f3aa278347c87c44f927658a73ab7695d85f3 Mon Sep 17 00:00:00 2001
From: Kevin Schaul <kevin.schaul@gmail.com>
Date: Thu, 3 Jul 2014 10:04:20 -0400
Subject: [PATCH 0363/1587] Add javascript console.debug snippet

---
 snippets/javascript/javascript.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 39a008ef9..d20d71363 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -94,6 +94,9 @@ snippet gett
 # console.log (Firebug)
 snippet cl
 	console.log(${0});
+# console.debug (Firebug)
+snippet cd
+	console.debug(${0});
 # return
 snippet ret
 	return ${0:result}

From 3dcb2900b2062a57e7e30dcb82b1ed20b9d44bec Mon Sep 17 00:00:00 2001
From: Christian <cn00@gmx.at>
Date: Thu, 3 Jul 2014 20:40:09 +0200
Subject: [PATCH 0364/1587] rst: Remove comment about requiring Python 2.4+.

Ultisnips needs 2.6, so this is save.
---
 UltiSnips/rst.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 5c1df1c14..624b201ca 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -77,7 +77,7 @@ def check_file_exist(rst_path, relative_path):
 try:
 	rst_char_len = vim.strwidth  # Requires Vim 7.3+
 except AttributeError:
-	from unicodedata import east_asian_width  # Requires Python 2.4+
+	from unicodedata import east_asian_width
 	def rst_char_len(s):
 		"""Return the required over-/underline length for s."""
 		result = 0

From fe949a3477231d18509ab83ac7aebf2a535d5955 Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <l-m-h@web.de>
Date: Wed, 2 Jul 2014 10:54:42 +0200
Subject: [PATCH 0365/1587] Escape backslash before tabstop.

---
 snippets/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 37fcc91b6..87c150ca5 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -1,7 +1,7 @@
 #PREAMBLE
 #newcommand
 snippet nc \newcommand
-	\newcommand{\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
+	\newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
 #usepackage
 snippet up \usepackage
 	\usepackage[${1:options}]{${2:package}} ${0}

From 91a31b1fbaad874012c5db105fe6fc442825b1bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9zar=20Ant=C3=A1res?= <zzantares@gmail.com>
Date: Sun, 6 Jul 2014 22:22:35 -0500
Subject: [PATCH 0366/1587] PHP Class snippet was working wrong

---
 UltiSnips/php.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 84003a722..b71091208 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -224,7 +224,7 @@ class $1
 {
 	public function ${3:__construct}(${4:$options})
 	{
-		${4:// code}
+		${5:// code}
 	}
 }
 $0

From ede995ce81074cde4ba0c1eaf1e0c71f91206db9 Mon Sep 17 00:00:00 2001
From: Rene Vergara <rene.a.vergara@gmail.com>
Date: Tue, 15 Jul 2014 16:02:19 -0500
Subject: [PATCH 0367/1587] Correct spacing for vim highlighting

---
 UltiSnips/ledger.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/ledger.snippets b/UltiSnips/ledger.snippets
index 4bf46916f..74ec0f1c0 100644
--- a/UltiSnips/ledger.snippets
+++ b/UltiSnips/ledger.snippets
@@ -2,7 +2,7 @@ priority -50
 
 snippet t "Transaction" b
 ${1:`!v strftime("%Y")`}-${2:`!v strftime("%m")`}-${3:`!v strftime("%d")`} ${4:*} ${5:Payee}
-	${6:Expenses}			\$${7:0.00}
+	${6:Expenses} 		\$${7:0.00}
 	${8:Assets:Checking}
 $0
 endsnippet

From d883a0ca820c80ddb7335c8ce6da506cc3153721 Mon Sep 17 00:00:00 2001
From: Rene Vergara <rene.a.vergara@gmail.com>
Date: Tue, 15 Jul 2014 16:02:19 -0500
Subject: [PATCH 0368/1587] Correct spacing for vim highlighting

---
 UltiSnips/ledger.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/ledger.snippets b/UltiSnips/ledger.snippets
index 4bf46916f..d36bf85d3 100644
--- a/UltiSnips/ledger.snippets
+++ b/UltiSnips/ledger.snippets
@@ -2,7 +2,7 @@ priority -50
 
 snippet t "Transaction" b
 ${1:`!v strftime("%Y")`}-${2:`!v strftime("%m")`}-${3:`!v strftime("%d")`} ${4:*} ${5:Payee}
-	${6:Expenses}			\$${7:0.00}
+	${6:Expenses}  		\$${7:0.00}
 	${8:Assets:Checking}
 $0
 endsnippet

From cbcc23571fa420bf198d18a47ce33a1862a62c66 Mon Sep 17 00:00:00 2001
From: Eustaquio Rangel <taq@eustaquiorangel.com>
Date: Wed, 16 Jul 2014 12:01:05 -0300
Subject: [PATCH 0369/1587] Starting to split Ruby and Rails snippets

---
 snippets/rails.snippets | 532 +++++++++++++++++++++++++++++++++++++++
 snippets/ruby.snippets  | 539 ----------------------------------------
 2 files changed, 532 insertions(+), 539 deletions(-)
 create mode 100644 snippets/rails.snippets

diff --git a/snippets/rails.snippets b/snippets/rails.snippets
new file mode 100644
index 000000000..fba3fb46c
--- /dev/null
+++ b/snippets/rails.snippets
@@ -0,0 +1,532 @@
+snippet art
+	assert_redirected_to ${1::action => "${2:index}"}
+snippet artnp
+	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1}, ${0:@$2})
+snippet artnpp
+	assert_redirected_to ${1:parent}_${2:child}_path(${0:@$1})
+snippet artp
+	assert_redirected_to ${1:model}_path(${0:@$1})
+snippet artpp
+	assert_redirected_to ${0:model}s_path
+snippet asd
+	assert_difference "${1:Model}.${2:count}", ${3:1} do
+		${0}
+	end
+snippet asnd
+	assert_no_difference "${1:Model}.${2:count}" do
+		${0}
+	end
+snippet asre
+	assert_response :${1:success}, @response.body
+snippet asrj
+	assert_rjs :${1:replace}, "${0:dom id}"
+snippet ass assert_select(..)
+	assert_select '${1:path}', :${2:text} => '${3:inner_html' ${4:do}
+snippet ba
+	before_action :${0:method}
+snippet bf
+	before_filter :${0:method}
+snippet bt
+	belongs_to :${0:association}
+snippet btp
+	belongs_to :${1:association}, :polymorphic => true
+snippet crw
+	cattr_accessor :${0:attr_names}
+snippet defcreate
+	def create
+		@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])
+
+		respond_to do |format|
+			if @$1.save
+				flash[:notice] = '$2 was successfully created.'
+				format.html { redirect_to(@$1) }
+				format.xml  { render :xml => @$1, :status => :created, :location => @$1 }
+			else
+				format.html { render :action => "new" }
+				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
+			end
+		end
+	end
+snippet defdestroy
+	def destroy
+		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
+		@$1.destroy
+
+		respond_to do |format|
+			format.html { redirect_to($1s_url) }
+			format.xml  { head :ok }
+		end
+	end
+snippet defedit
+	def edit
+		@${1:model_class_name} = ${0:ModelClassName}.find(params[:id])
+	end
+snippet defindex
+	def index
+		@${1:model_class_name} = ${2:ModelClassName}.all
+
+		respond_to do |format|
+			format.html # index.html.erb
+			format.xml  { render :xml => @$1s }
+		end
+	end
+snippet defnew
+	def new
+		@${1:model_class_name} = ${2:ModelClassName}.new
+
+		respond_to do |format|
+			format.html # new.html.erb
+			format.xml  { render :xml => @$1 }
+		end
+	end
+snippet defshow
+	def show
+		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
+
+		respond_to do |format|
+			format.html # show.html.erb
+			format.xml  { render :xml => @$1 }
+		end
+	end
+snippet defupdate
+	def update
+		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
+
+		respond_to do |format|
+			if @$1.update_attributes(params[:$1])
+				flash[:notice] = '$2 was successfully updated.'
+				format.html { redirect_to(@$1) }
+				format.xml  { head :ok }
+			else
+				format.html { render :action => "edit" }
+				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
+			end
+		end
+	end
+snippet dele delegate .. to
+	delegate :${1:methods}, :to => :${0:object}
+snippet dele delegate .. to .. prefix .. allow_nil
+	delegate :${1:methods}, :to => :${2:object}, :prefix => :${3:prefix}, :allow_nil => ${0:allow_nil}
+snippet flash
+	flash[:${1:notice}] = "${0}"
+snippet habtm
+	has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"
+snippet hm
+	has_many :${0:object}
+snippet hmd
+	has_many :${1:other}s, :class_name => "${2:$1}", :foreign_key => "${3:$1}_id", :dependent => :destroy
+snippet hmt
+	has_many :${1:object}, :through => :${0:object}
+snippet ho
+	has_one :${0:object}
+snippet hod
+	has_one :${1:object}, dependent: :${0:destroy}
+snippet i18
+	I18n.t('${1:type.key}')
+snippet ist
+	<%= image_submit_tag("${1:agree.png}", :id => "${2:id}"${0} %>
+snippet log
+	Rails.logger.${1:debug} ${0}
+snippet log2
+	RAILS_DEFAULT_LOGGER.${1:debug} ${0}
+snippet logd
+	logger.debug { "${1:message}" }
+snippet loge
+	logger.error { "${1:message}" }
+snippet logf
+	logger.fatal { "${1:message}" }
+snippet logi
+	logger.info { "${1:message}" }
+snippet logw
+	logger.warn { "${1:message}" }
+snippet mapc
+	${1:map}.${2:connect} '${0:controller/:action/:id}'
+snippet mapca
+	${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"
+snippet mapr
+	${1:map}.resource :${0:resource}
+snippet maprs
+	${1:map}.resources :${0:resource}
+snippet mapwo
+	${1:map}.with_options :${2:controller} => '${3:thing}' do |$3|
+		${0}
+	end
+
+###############################
+#   model callback snippets   #
+###############################
+
+# before callback
+snippet mbv
+	before_validation :${0:method}
+snippet mbc
+	before_create :${0:method}
+snippet mbu
+	before_update :${0:method}
+snippet mbs
+	before_save :${0:method}
+snippet mbd
+	before_destroy :${0:method}
+
+# after callback
+snippet mav
+	after_validation :${0:method}
+snippet maf
+	after_find :${0:method}
+snippet mat
+	after_touch :${0:method}
+snippet macr
+	after_create :${0:method}
+snippet mau
+	after_update :${0:method}
+snippet mas
+	after_save :${0:method}
+snippet mad
+	after_destroy :${0:method}
+
+# around callback
+snippet marc
+	around_create :${0:method}
+snippet maru
+	around_update :${0:method}
+snippet mars
+	around_save :${0:method}
+snippet mard
+	around_destroy :${0:method}
+
+snippet mcht
+	change_table :${1:table_name} do |t|
+		${0}
+	end
+snippet mp
+	map(&:${0:id})
+snippet mrw
+	mattr_accessor :${0:attr_names}
+snippet oa
+	order("${0:field}")
+snippet od
+	order("${0:field} DESC")
+snippet pa
+	params[:${1:id}]
+snippet ra
+	render :action => "${0:action}"
+snippet ral
+	render :action => "${1:action}", :layout => "${0:layoutname}"
+snippet rest
+	respond_to do |format|
+		format.${1:html} { ${0} }
+	end
+snippet rf
+	render :file => "${0:filepath}"
+snippet rfu
+	render :file => "${1:filepath}", :use_full_path => ${0:false}
+snippet ri
+	render :inline => "${0:<%= 'hello' %>}"
+snippet ril
+	render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"${0} }
+snippet rit
+	render :inline => "${1:<%= 'hello' %>}", :type => ${0::rxml}
+snippet rjson
+	render :json => ${0:text to render}
+snippet rl
+	render :layout => "${0:layoutname}"
+snippet rn
+	render :nothing => ${0:true}
+snippet rns
+	render :nothing => ${1:true}, :status => ${0:401}
+snippet rp
+	render :partial => "${0:item}"
+snippet rpc
+	render :partial => "${1:item}", :collection => ${0:@$1s}
+snippet rpl
+	render :partial => "${1:item}", :locals => { :${2:$1} => ${0:@$1}
+snippet rpo
+	render :partial => "${1:item}", :object => ${0:@$1}
+snippet rps
+	render :partial => "${1:item}", :status => ${0:500}
+snippet rt
+	render :text => "${0:text to render}"
+snippet rtl
+	render :text => "${1:text to render}", :layout => "${0:layoutname}"
+snippet rtlt
+	render :text => "${1:text to render}", :layout => ${0:true}
+snippet rts
+	render :text => "${1:text to render}", :status => ${0:401}
+snippet ru
+	render :update do |${1:page}|
+		$1.${0}
+	end
+snippet rxml
+	render :xml => ${0:text to render}
+snippet sc
+	scope :${1:name}, -> { where(${2:field}: ${0:value}) }
+snippet sl
+	scope :${1:name}, lambda do |${2:value}|
+		where("${3:field = ?}", ${0:bind var})
+	end
+snippet sha1
+	Digest::SHA1.hexdigest(${0:string})
+snippet sweeper
+	class ${1:ModelClassName}Sweeper < ActionController::Caching::Sweeper
+		observe $1
+
+		def after_save(${0:model_class_name})
+			expire_cache($2)
+		end
+
+		def after_destroy($2)
+			expire_cache($2)
+		end
+
+		def expire_cache($2)
+			expire_page
+		end
+	end
+snippet va validates_associated
+	validates_associated :${0:attribute}
+snippet va validates .., :acceptance => true
+	validates :${0:terms}, :acceptance => true
+snippet vc
+	validates :${0:attribute}, :confirmation => true
+snippet ve
+	validates :${1:attribute}, :exclusion => { :in => ${0:%w( mov avi )} }
+snippet vf
+	validates :${1:attribute}, :format => { :with => /${0:regex}/ }
+snippet vi
+	validates :${1:attribute}, :inclusion => { :in => %w(${0: mov avi }) }
+snippet vl
+	validates :${1:attribute}, :length => { :in => ${2:3}..${0:20} }
+snippet vn
+	validates :${0:attribute}, :numericality => true
+snippet vp
+	validates :${0:attribute}, :presence => true
+snippet vu
+	validates :${0:attribute}, :uniqueness => true
+snippet format
+	format.${1:js|xml|html} { ${0} }
+snippet wc
+	where(${1:"conditions"}${0:, bind_var})
+snippet wf
+	where(${1:field} => ${0:value})
+snippet xdelete
+	xhr :delete, :${1:destroy}, :id => ${2:1}
+snippet xget
+	xhr :get, :${1:show}, :id => ${2:1}
+snippet xpost
+	xhr :post, :${1:create}, :${2:object} => { ${0} }
+snippet xput
+	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }
+snippet test
+	test "should ${1:do something}" do
+		${0}
+	end
+###########################
+#   migrations snippets   #
+###########################
+snippet mac
+	add_column :${1:table_name}, :${2:column_name}, :${0:data_type}
+snippet mai
+	add_index :${1:table_name}, :${0:column_name}
+snippet mrc
+	remove_column :${1:table_name}, :${0:column_name}
+snippet mrnc
+	rename_column :${1:table_name}, :${2:old_column_name}, :${0:new_column_name}
+snippet mcc
+	change_column :${1:table}, :${2:column}, :${0:type}
+snippet mnc
+	t.${1:string} :${2:title}${3:, null: false}
+snippet mct
+	create_table :${1:table_name} do |t|
+		${0}
+	end
+snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
+	class ${1:class_name} < ActiveRecord::Migration
+		def up
+			${0}
+		end
+
+		def down
+		end
+	end
+snippet migration class .. < ActiveRecord::Migration .. def change .. end
+	class ${1:class_name} < ActiveRecord::Migration
+		def change
+			${0}
+		end
+	end
+snippet trc
+	t.remove :${0:column}
+snippet tre
+	t.rename :${1:old_column_name}, :${2:new_column_name}
+	${0}
+snippet tref
+	t.references :${0:model}
+snippet tcb
+	t.boolean :${1:title}
+	${0}
+snippet tcbi
+	t.binary :${1:title}, :limit => ${2:2}.megabytes
+	${0}
+snippet tcd
+	t.decimal :${1:title}, :precision => ${2:10}, :scale => ${3:2}
+	${0}
+snippet tcda
+	t.date :${1:title}
+	${0}
+snippet tcdt
+	t.datetime :${1:title}
+	${0}
+snippet tcf
+	t.float :${1:title}
+	${0}
+snippet tch
+	t.change :${1:name}, :${2:string}, :${3:limit} => ${4:80}
+	${0}
+snippet tci
+	t.integer :${1:title}
+	${0}
+snippet tcl
+	t.integer :lock_version, :null => false, :default => 0
+	${0}
+snippet tcr
+	t.references :${1:taggable}, :polymorphic => { :default => '${2:Photo}' }
+	${0}
+snippet tcs
+	t.string :${1:title}
+	${0}
+snippet tct
+	t.text :${1:title}
+	${0}
+snippet tcti
+	t.time :${1:title}
+	${0}
+snippet tcts
+	t.timestamp :${1:title}
+	${0}
+snippet tctss
+	t.timestamps
+	${0}
+##########################
+#     Rspec snippets     #
+##########################
+snippet desc
+	describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
+		${0}
+	end
+snippet descm
+	describe "${1:#method}" do
+		${0:pending "Not implemented"}
+	end
+snippet cont
+	context "${1:message}" do
+		${0}
+	end
+snippet bef
+	before :${1:each} do
+		${0}
+	end
+snippet aft
+	after :${1:each} do
+		${0}
+	end
+snippet let
+	let(:${1:object}) { ${0} }
+snippet let!
+	let!(:${1:object}) { ${0} }
+snippet subj
+	subject { ${0} }
+snippet s.
+	subject.${0:method}
+snippet spec
+	specify { subject.${0} }
+snippet exp
+	expect(${1:object}).to ${0}
+snippet expb
+	expect { ${1:object} }.to ${0}
+snippet experr
+	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/
+snippet shared
+	shared_examples ${0:"shared examples name"}
+snippet ibl
+	it_behaves_like ${0:"shared examples name"}
+snippet it
+	it "${1:spec_name}" do
+		${0}
+	end
+snippet its
+	its(:${1:method}) { should ${0} }
+snippet is
+	it { should ${0} }
+snippet isn
+	it { should_not ${0} }
+#ShouldaMatchers#ActionController
+snippet isfp
+	it { should filter_param :${0:key} }
+snippet isrt
+	it { should redirect_to ${0:url} }
+snippet isrtp
+	it { should render_template ${0} }
+snippet isrwl
+	it { should render_with_layout ${0} }
+snippet isrf
+	it { should rescue_from ${0:exception} }
+snippet isrw
+	it { should respond_with ${0:status} }
+snippet isr
+	it { should route(:${1:method}, '${0:path}') }
+snippet isss
+	it { should set_session :${0:key} }
+snippet issf
+	it { should set_the_flash('${0}') }
+#ShouldaMatchers#ActiveModel
+snippet isama
+	it { should allow_mass_assignment_of :${0} }
+snippet isav
+	it { should allow_value(${1}).for :${0} }
+snippet isee
+	it { should ensure_exclusion_of :${0} }
+snippet isei
+	it { should ensure_inclusion_of :${0} }
+snippet isel
+	it { should ensure_length_of :${0} }
+snippet isva
+	it { should validate_acceptance_of :${0} }
+snippet isvc
+	it { should validate_confirmation_of :${0} }
+snippet isvn
+	it { should validate_numericality_of :${0} }
+snippet isvp
+	it { should validate_presence_of :${0} }
+snippet isvu
+	it { should validate_uniqueness_of :${0} }
+#ShouldaMatchers#ActiveRecord
+snippet isana
+	it { should accept_nested_attributes_for :${0} }
+snippet isbt
+	it { should belong_to :${0} }
+snippet isbtcc
+	it { should belong_to(:${1}).counter_cache ${0:true} }
+snippet ishbtm
+	it { should have_and_belong_to_many :${0} }
+snippet isbv
+	it { should be_valid }
+snippet ishc
+	it { should have_db_column :${0} }
+snippet ishi
+	it { should have_db_index :${0} }
+snippet ishm
+	it { should have_many :${0} }
+snippet ishmt
+	it { should have_many(:${1}).through :${0} }
+snippet isho
+	it { should have_one :${0} }
+snippet ishro
+	it { should have_readonly_attribute :${0} }
+snippet iss
+	it { should serialize :${0} }
+snippet isres
+	it { should respond_to :${0} }
+snippet isresw
+	it { should respond_to(:${1}).with(${0}).arguments }
+snippet super_call
+	${1:super_class}.instance_method(:${0:method}).bind(self).call
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 5d9c01ea3..fac1a0542 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -1,7 +1,3 @@
-########################################
-# Ruby snippets - for Rails, see below #
-########################################
-
 # encoding for Ruby 1.9
 snippet enc
 	# encoding: utf-8
@@ -595,538 +591,3 @@ snippet pry
 	require 'pry'; binding.pry
 snippet strf
 	strftime("${1:%Y-%m-%d %H:%M:%S %z}")${0}
-#############################################
-# Rails snippets - for pure Ruby, see above #
-#############################################
-snippet art
-	assert_redirected_to ${1::action => "${2:index}"}
-snippet artnp
-	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1}, ${0:@$2})
-snippet artnpp
-	assert_redirected_to ${1:parent}_${2:child}_path(${0:@$1})
-snippet artp
-	assert_redirected_to ${1:model}_path(${0:@$1})
-snippet artpp
-	assert_redirected_to ${0:model}s_path
-snippet asd
-	assert_difference "${1:Model}.${2:count}", ${3:1} do
-		${0}
-	end
-snippet asnd
-	assert_no_difference "${1:Model}.${2:count}" do
-		${0}
-	end
-snippet asre
-	assert_response :${1:success}, @response.body
-snippet asrj
-	assert_rjs :${1:replace}, "${0:dom id}"
-snippet ass assert_select(..)
-	assert_select '${1:path}', :${2:text} => '${3:inner_html' ${4:do}
-snippet ba
-	before_action :${0:method}
-snippet bf
-	before_filter :${0:method}
-snippet bt
-	belongs_to :${0:association}
-snippet btp
-	belongs_to :${1:association}, :polymorphic => true
-snippet crw
-	cattr_accessor :${0:attr_names}
-snippet defcreate
-	def create
-		@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])
-
-		respond_to do |format|
-			if @$1.save
-				flash[:notice] = '$2 was successfully created.'
-				format.html { redirect_to(@$1) }
-				format.xml  { render :xml => @$1, :status => :created, :location => @$1 }
-			else
-				format.html { render :action => "new" }
-				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
-			end
-		end
-	end
-snippet defdestroy
-	def destroy
-		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
-		@$1.destroy
-
-		respond_to do |format|
-			format.html { redirect_to($1s_url) }
-			format.xml  { head :ok }
-		end
-	end
-snippet defedit
-	def edit
-		@${1:model_class_name} = ${0:ModelClassName}.find(params[:id])
-	end
-snippet defindex
-	def index
-		@${1:model_class_name} = ${2:ModelClassName}.all
-
-		respond_to do |format|
-			format.html # index.html.erb
-			format.xml  { render :xml => @$1s }
-		end
-	end
-snippet defnew
-	def new
-		@${1:model_class_name} = ${2:ModelClassName}.new
-
-		respond_to do |format|
-			format.html # new.html.erb
-			format.xml  { render :xml => @$1 }
-		end
-	end
-snippet defshow
-	def show
-		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
-
-		respond_to do |format|
-			format.html # show.html.erb
-			format.xml  { render :xml => @$1 }
-		end
-	end
-snippet defupdate
-	def update
-		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
-
-		respond_to do |format|
-			if @$1.update_attributes(params[:$1])
-				flash[:notice] = '$2 was successfully updated.'
-				format.html { redirect_to(@$1) }
-				format.xml  { head :ok }
-			else
-				format.html { render :action => "edit" }
-				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
-			end
-		end
-	end
-snippet dele delegate .. to
-	delegate :${1:methods}, :to => :${0:object}
-snippet dele delegate .. to .. prefix .. allow_nil
-	delegate :${1:methods}, :to => :${2:object}, :prefix => :${3:prefix}, :allow_nil => ${0:allow_nil}
-snippet flash
-	flash[:${1:notice}] = "${0}"
-snippet habtm
-	has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"
-snippet hm
-	has_many :${0:object}
-snippet hmd
-	has_many :${1:other}s, :class_name => "${2:$1}", :foreign_key => "${3:$1}_id", :dependent => :destroy
-snippet hmt
-	has_many :${1:object}, :through => :${0:object}
-snippet ho
-	has_one :${0:object}
-snippet hod
-	has_one :${1:object}, dependent: :${0:destroy}
-snippet i18
-	I18n.t('${1:type.key}')
-snippet ist
-	<%= image_submit_tag("${1:agree.png}", :id => "${2:id}"${0} %>
-snippet log
-	Rails.logger.${1:debug} ${0}
-snippet log2
-	RAILS_DEFAULT_LOGGER.${1:debug} ${0}
-snippet logd
-	logger.debug { "${1:message}" }
-snippet loge
-	logger.error { "${1:message}" }
-snippet logf
-	logger.fatal { "${1:message}" }
-snippet logi
-	logger.info { "${1:message}" }
-snippet logw
-	logger.warn { "${1:message}" }
-snippet mapc
-	${1:map}.${2:connect} '${0:controller/:action/:id}'
-snippet mapca
-	${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"
-snippet mapr
-	${1:map}.resource :${0:resource}
-snippet maprs
-	${1:map}.resources :${0:resource}
-snippet mapwo
-	${1:map}.with_options :${2:controller} => '${3:thing}' do |$3|
-		${0}
-	end
-
-###############################
-#   model callback snippets   #
-###############################
-
-# before callback
-snippet mbv
-	before_validation :${0:method}
-snippet mbc
-	before_create :${0:method}
-snippet mbu
-	before_update :${0:method}
-snippet mbs
-	before_save :${0:method}
-snippet mbd
-	before_destroy :${0:method}
-
-# after callback
-snippet mav
-	after_validation :${0:method}
-snippet maf
-	after_find :${0:method}
-snippet mat
-	after_touch :${0:method}
-snippet macr
-	after_create :${0:method}
-snippet mau
-	after_update :${0:method}
-snippet mas
-	after_save :${0:method}
-snippet mad
-	after_destroy :${0:method}
-
-# around callback
-snippet marc
-	around_create :${0:method}
-snippet maru
-	around_update :${0:method}
-snippet mars
-	around_save :${0:method}
-snippet mard
-	around_destroy :${0:method}
-
-snippet mcht
-	change_table :${1:table_name} do |t|
-		${0}
-	end
-snippet mp
-	map(&:${0:id})
-snippet mrw
-	mattr_accessor :${0:attr_names}
-snippet oa
-	order("${0:field}")
-snippet od
-	order("${0:field} DESC")
-snippet pa
-	params[:${1:id}]
-snippet ra
-	render :action => "${0:action}"
-snippet ral
-	render :action => "${1:action}", :layout => "${0:layoutname}"
-snippet rest
-	respond_to do |format|
-		format.${1:html} { ${0} }
-	end
-snippet rf
-	render :file => "${0:filepath}"
-snippet rfu
-	render :file => "${1:filepath}", :use_full_path => ${0:false}
-snippet ri
-	render :inline => "${0:<%= 'hello' %>}"
-snippet ril
-	render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"${0} }
-snippet rit
-	render :inline => "${1:<%= 'hello' %>}", :type => ${0::rxml}
-snippet rjson
-	render :json => ${0:text to render}
-snippet rl
-	render :layout => "${0:layoutname}"
-snippet rn
-	render :nothing => ${0:true}
-snippet rns
-	render :nothing => ${1:true}, :status => ${0:401}
-snippet rp
-	render :partial => "${0:item}"
-snippet rpc
-	render :partial => "${1:item}", :collection => ${0:@$1s}
-snippet rpl
-	render :partial => "${1:item}", :locals => { :${2:$1} => ${0:@$1}
-snippet rpo
-	render :partial => "${1:item}", :object => ${0:@$1}
-snippet rps
-	render :partial => "${1:item}", :status => ${0:500}
-snippet rt
-	render :text => "${0:text to render}"
-snippet rtl
-	render :text => "${1:text to render}", :layout => "${0:layoutname}"
-snippet rtlt
-	render :text => "${1:text to render}", :layout => ${0:true}
-snippet rts
-	render :text => "${1:text to render}", :status => ${0:401}
-snippet ru
-	render :update do |${1:page}|
-		$1.${0}
-	end
-snippet rxml
-	render :xml => ${0:text to render}
-snippet sc
-	scope :${1:name}, -> { where(${2:field}: ${0:value}) }
-snippet sl
-	scope :${1:name}, lambda do |${2:value}|
-		where("${3:field = ?}", ${0:bind var})
-	end
-snippet sha1
-	Digest::SHA1.hexdigest(${0:string})
-snippet sweeper
-	class ${1:ModelClassName}Sweeper < ActionController::Caching::Sweeper
-		observe $1
-
-		def after_save(${0:model_class_name})
-			expire_cache($2)
-		end
-
-		def after_destroy($2)
-			expire_cache($2)
-		end
-
-		def expire_cache($2)
-			expire_page
-		end
-	end
-snippet va validates_associated
-	validates_associated :${0:attribute}
-snippet va validates .., :acceptance => true
-	validates :${0:terms}, :acceptance => true
-snippet vc
-	validates :${0:attribute}, :confirmation => true
-snippet ve
-	validates :${1:attribute}, :exclusion => { :in => ${0:%w( mov avi )} }
-snippet vf
-	validates :${1:attribute}, :format => { :with => /${0:regex}/ }
-snippet vi
-	validates :${1:attribute}, :inclusion => { :in => %w(${0: mov avi }) }
-snippet vl
-	validates :${1:attribute}, :length => { :in => ${2:3}..${0:20} }
-snippet vn
-	validates :${0:attribute}, :numericality => true
-snippet vp
-	validates :${0:attribute}, :presence => true
-snippet vu
-	validates :${0:attribute}, :uniqueness => true
-snippet format
-	format.${1:js|xml|html} { ${0} }
-snippet wc
-	where(${1:"conditions"}${0:, bind_var})
-snippet wf
-	where(${1:field} => ${0:value})
-snippet xdelete
-	xhr :delete, :${1:destroy}, :id => ${2:1}
-snippet xget
-	xhr :get, :${1:show}, :id => ${2:1}
-snippet xpost
-	xhr :post, :${1:create}, :${2:object} => { ${0} }
-snippet xput
-	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }
-snippet test
-	test "should ${1:do something}" do
-		${0}
-	end
-###########################
-#   migrations snippets   #
-###########################
-snippet mac
-	add_column :${1:table_name}, :${2:column_name}, :${0:data_type}
-snippet mai
-	add_index :${1:table_name}, :${0:column_name}
-snippet mrc
-	remove_column :${1:table_name}, :${0:column_name}
-snippet mrnc
-	rename_column :${1:table_name}, :${2:old_column_name}, :${0:new_column_name}
-snippet mcc
-	change_column :${1:table}, :${2:column}, :${0:type}
-snippet mnc
-	t.${1:string} :${2:title}${3:, null: false}
-snippet mct
-	create_table :${1:table_name} do |t|
-		${0}
-	end
-snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
-	class ${1:class_name} < ActiveRecord::Migration
-		def up
-			${0}
-		end
-
-		def down
-		end
-	end
-snippet migration class .. < ActiveRecord::Migration .. def change .. end
-	class ${1:class_name} < ActiveRecord::Migration
-		def change
-			${0}
-		end
-	end
-snippet trc
-	t.remove :${0:column}
-snippet tre
-	t.rename :${1:old_column_name}, :${2:new_column_name}
-	${0}
-snippet tref
-	t.references :${0:model}
-snippet tcb
-	t.boolean :${1:title}
-	${0}
-snippet tcbi
-	t.binary :${1:title}, :limit => ${2:2}.megabytes
-	${0}
-snippet tcd
-	t.decimal :${1:title}, :precision => ${2:10}, :scale => ${3:2}
-	${0}
-snippet tcda
-	t.date :${1:title}
-	${0}
-snippet tcdt
-	t.datetime :${1:title}
-	${0}
-snippet tcf
-	t.float :${1:title}
-	${0}
-snippet tch
-	t.change :${1:name}, :${2:string}, :${3:limit} => ${4:80}
-	${0}
-snippet tci
-	t.integer :${1:title}
-	${0}
-snippet tcl
-	t.integer :lock_version, :null => false, :default => 0
-	${0}
-snippet tcr
-	t.references :${1:taggable}, :polymorphic => { :default => '${2:Photo}' }
-	${0}
-snippet tcs
-	t.string :${1:title}
-	${0}
-snippet tct
-	t.text :${1:title}
-	${0}
-snippet tcti
-	t.time :${1:title}
-	${0}
-snippet tcts
-	t.timestamp :${1:title}
-	${0}
-snippet tctss
-	t.timestamps
-	${0}
-##########################
-#     Rspec snippets     #
-##########################
-snippet desc
-	describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
-		${0}
-	end
-snippet descm
-	describe "${1:#method}" do
-		${0:pending "Not implemented"}
-	end
-snippet cont
-	context "${1:message}" do
-		${0}
-	end
-snippet bef
-	before :${1:each} do
-		${0}
-	end
-snippet aft
-	after :${1:each} do
-		${0}
-	end
-snippet let
-	let(:${1:object}) { ${0} }
-snippet let!
-	let!(:${1:object}) { ${0} }
-snippet subj
-	subject { ${0} }
-snippet s.
-	subject.${0:method}
-snippet spec
-	specify { subject.${0} }
-snippet exp
-	expect(${1:object}).to ${0}
-snippet expb
-	expect { ${1:object} }.to ${0}
-snippet experr
-	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/
-snippet shared
-	shared_examples ${0:"shared examples name"}
-snippet ibl
-	it_behaves_like ${0:"shared examples name"}
-snippet it
-	it "${1:spec_name}" do
-		${0}
-	end
-snippet its
-	its(:${1:method}) { should ${0} }
-snippet is
-	it { should ${0} }
-snippet isn
-	it { should_not ${0} }
-#ShouldaMatchers#ActionController
-snippet isfp
-	it { should filter_param :${0:key} }
-snippet isrt
-	it { should redirect_to ${0:url} }
-snippet isrtp
-	it { should render_template ${0} }
-snippet isrwl
-	it { should render_with_layout ${0} }
-snippet isrf
-	it { should rescue_from ${0:exception} }
-snippet isrw
-	it { should respond_with ${0:status} }
-snippet isr
-	it { should route(:${1:method}, '${0:path}') }
-snippet isss
-	it { should set_session :${0:key} }
-snippet issf
-	it { should set_the_flash('${0}') }
-#ShouldaMatchers#ActiveModel
-snippet isama
-	it { should allow_mass_assignment_of :${0} }
-snippet isav
-	it { should allow_value(${1}).for :${0} }
-snippet isee
-	it { should ensure_exclusion_of :${0} }
-snippet isei
-	it { should ensure_inclusion_of :${0} }
-snippet isel
-	it { should ensure_length_of :${0} }
-snippet isva
-	it { should validate_acceptance_of :${0} }
-snippet isvc
-	it { should validate_confirmation_of :${0} }
-snippet isvn
-	it { should validate_numericality_of :${0} }
-snippet isvp
-	it { should validate_presence_of :${0} }
-snippet isvu
-	it { should validate_uniqueness_of :${0} }
-#ShouldaMatchers#ActiveRecord
-snippet isana
-	it { should accept_nested_attributes_for :${0} }
-snippet isbt
-	it { should belong_to :${0} }
-snippet isbtcc
-	it { should belong_to(:${1}).counter_cache ${0:true} }
-snippet ishbtm
-	it { should have_and_belong_to_many :${0} }
-snippet isbv
-	it { should be_valid }
-snippet ishc
-	it { should have_db_column :${0} }
-snippet ishi
-	it { should have_db_index :${0} }
-snippet ishm
-	it { should have_many :${0} }
-snippet ishmt
-	it { should have_many(:${1}).through :${0} }
-snippet isho
-	it { should have_one :${0} }
-snippet ishro
-	it { should have_readonly_attribute :${0} }
-snippet iss
-	it { should serialize :${0} }
-snippet isres
-	it { should respond_to :${0} }
-snippet isresw
-	it { should respond_to(:${1}).with(${0}).arguments }
-snippet super_call
-	${1:super_class}.instance_method(:${0:method}).bind(self).call

From 4cdf9dbf86c4596a596fc32e4793e8547df0c189 Mon Sep 17 00:00:00 2001
From: Eustaquio Rangel <taq@eustaquiorangel.com>
Date: Wed, 16 Jul 2014 19:40:38 -0300
Subject: [PATCH 0370/1587] Changed double quotes to single quotes.

We'll start to change this to make valid Ruby source files according to
Rubocop (https://github.com/bbatsov/rubocop). Changes here came from
https://github.com/honza/vim-snippets/pull/401, thanks for warning us, @mkroman!
---
 snippets/rails.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index fba3fb46c..84215ba64 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -414,11 +414,11 @@ snippet desc
 		${0}
 	end
 snippet descm
-	describe "${1:#method}" do
-		${0:pending "Not implemented"}
+	describe '${1:#method}' do
+		${0:pending 'Not implemented'}
 	end
 snippet cont
-	context "${1:message}" do
+	context '${1:message}' do
 		${0}
 	end
 snippet bef
@@ -450,7 +450,7 @@ snippet shared
 snippet ibl
 	it_behaves_like ${0:"shared examples name"}
 snippet it
-	it "${1:spec_name}" do
+	it '${1:spec_name}' do
 		${0}
 	end
 snippet its

From 8bb5faebbc4c40e38240336ee9bc1050559b78c2 Mon Sep 17 00:00:00 2001
From: Eustaquio Rangel <taq@eustaquiorangel.com>
Date: Fri, 18 Jul 2014 10:52:57 -0300
Subject: [PATCH 0371/1587] Revised the Ruby snippets to conform to Rubocop
 rules.

---
 snippets/ruby.snippets | 80 ++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index fac1a0542..2cfb36f9d 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -31,9 +31,9 @@ snippet beg
 	end
 
 snippet req require
-	require "${1}"
+	require '${1}'
 snippet reqr
-	require_relative "${1}"
+	require_relative '${1}'
 snippet #
 	# =>
 snippet end
@@ -57,7 +57,7 @@ snippet deft
 snippet descendants
 	class Class
 		def descendants
-			ObjectSpace.each_object(::Class).select {|klass| klass < self }
+			ObjectSpace.each_object(::Class).select { |klass| klass < self }
 		end
 	end
 snippet if
@@ -228,13 +228,13 @@ snippet array
 snippet hash
 	Hash.new { |${1:hash}, ${2:key}| $1[$2] = ${0} }
 snippet file File.foreach() { |line| .. }
-	File.foreach(${1:"path/to/file"}) { |${2:line}| ${0} }
+	File.foreach(${1:'path/to/file'}) { |${2:line}| ${0} }
 snippet file File.read()
-	File.read(${1:"path/to/file"})
+	File.read(${1:'path/to/file'})
 snippet Dir Dir.global() { |file| .. }
-	Dir.glob(${1:"dir/glob/*"}) { |${2:file}| ${0} }
+	Dir.glob(${1:'dir/glob/*'}) { |${2:file}| ${0} }
 snippet Dir Dir[".."]
-	Dir[${1:"glob/**/*.rb"}]
+	Dir[${1:'glob/**/*.rb'}]
 snippet dir
 	Filename.dirname(__FILE__)
 snippet deli
@@ -243,7 +243,7 @@ snippet fil
 	fill(${1:range}) { |${2:i}| ${0} }
 # flatten_once()
 snippet flao
-	inject(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2)}
+	reduce(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2) }
 snippet zip
 	zip(${1:enums}) { |${2:row}| ${0} }
 # downto(0) { |n| .. }
@@ -415,6 +415,10 @@ snippet seld
 	end
 snippet lam
 	lambda { |${1:args}| ${0} }
+snippet ->
+	-> { ${0} }
+snippet ->a
+	->(${1:args}) { ${0} }
 # I'm pretty sure that ruby users expect do to expand to do .. end
 snippet do
 	do
@@ -428,12 +432,12 @@ snippet dov
 		${2}
 	end
 snippet :
-	:${1:key} => ${2:"value"}
+	${1:key}: ${2:'value'}
 snippet ope
-	open(${1:"path/or/url/or/pipe"}, "${2:w}") { |${3:io}| ${0} }
+	open('${1:path/or/url/or/pipe}', '${2:w}') { |${3:io}| ${0} }
 # path_from_here()
 snippet fpath
-	File.join(File.dirname(__FILE__), *%2[${1:rel path here}])
+	File.join(File.dirname(__FILE__), *['${1:rel path here}'])
 # unix_filter {}
 snippet unif
 	ARGF.each_line${1} do |${2:line}|
@@ -441,21 +445,21 @@ snippet unif
 	end
 # option_parse {}
 snippet optp
-	require "optparse"
+	require 'optparse'
 
-	options = {${0:default => "args"}}
+	options = { ${0:default: 'args'} }
 
 	ARGV.options do |opts|
-		opts.banner = "Usage: #{File.basename($PROGRAM_NAME)}
+		opts.banner = "Usage: #{File.basename($PROGRAM_NAME)}"
+	end
 snippet opt
-	opts.on( "-${1:o}", "--${2:long-option-name}", ${3:String},
-	         "${4:Option description.}") do |${5:opt}|
+	opts.on('-${1:o}', '--${2:long-option-name}', ${3:String}, '${4:Option description.}') do |${5:opt}|
 		${0}
 	end
 snippet tc
-	require "test/unit"
+	require 'test/unit'
 
-	require "${1:library_file_name}"
+	require '${1:library_file_name}'
 
 	class Test${2:$1} < Test::Unit::TestCase
 		def test_${3:case_name}
@@ -463,18 +467,18 @@ snippet tc
 		end
 	end
 snippet ts
-	require "test/unit"
+	require 'test/unit'
 
-	require "tc_${1:test_case_file}"
-	require "tc_${2:test_case_file}"
+	require 'tc_${1:test_case_file}'
+	require 'tc_${2:test_case_file}'
 snippet as
-	assert ${1:test}, "${2:Failure message.}"
+	assert ${1:test}, '${2:Failure message.}'
 snippet ase
 	assert_equal ${1:expected}, ${2:actual}
 snippet asne
 	assert_not_equal ${1:unexpected}, ${2:actual}
 snippet asid
-	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2 ** -20}
+	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2**-20}
 snippet asi
 	assert_includes ${1:collection}, ${2:object}
 snippet asio
@@ -486,9 +490,9 @@ snippet asn
 snippet asnn
 	assert_not_nil ${1:instance}
 snippet asm
-	assert_match /${1:expected_pattern}/, ${2:actual_string}
+	assert_match(/${1:expected_pattern}/, ${2:actual_string})
 snippet asnm
-	assert_no_match /${1:unexpected_pattern}/, ${2:actual_string}
+	assert_no_match(/${1:unexpected_pattern}/, ${2:actual_string})
 snippet aso
 	assert_operator ${1:left}, :${2:operator}, ${3:right}
 snippet asr
@@ -512,7 +516,7 @@ snippet ass assert_send(..)
 snippet asns
 	assert_not_same ${1:unexpected}, ${2:actual}
 snippet ast
-	assert_throws :${1:expected} { ${0} }
+	assert_throws :${1:expected}, -> { ${0} }
 snippet astd
 	assert_throws :${1:expected} do
 		${0}
@@ -524,7 +528,7 @@ snippet asntd
 		${0}
 	end
 snippet fl
-	flunk "${1:Failure message.}"
+	flunk '${1:Failure message.}'
 # Benchmark.bmbm do .. end
 snippet bm-
 	TESTS = ${1:10_000}
@@ -532,31 +536,31 @@ snippet bm-
 		${0}
 	end
 snippet rep
-	results.report("${1:name}:") { TESTS.times { ${0} }}
+	results.report('${1:name}:') { TESTS.times { ${0} } }
 # Marshal.dump(.., file)
 snippet Md
-	File.open(${1:"path/to/file.dump"}, "wb") { |${2:file}| Marshal.dump(${3:obj}, $2) }
+	File.open('${1:path/to/file.dump}', 'wb') { |${2:file}| Marshal.dump(${3:obj}, $2) }
 # Mashal.load(obj)
 snippet Ml
-	File.open(${1:"path/to/file.dump"}, "rb") { |${2:file}| Marshal.load($2) }
+	File.open('${1:path/to/file.dump}', 'rb') { |${2:file}| Marshal.load($2) }
 # deep_copy(..)
 snippet deec
 	Marshal.load(Marshal.dump(${1:obj_to_copy}))
 snippet Pn-
-	PStore.new(${1:"file_name.pstore"})
+	PStore.new('${1:file_name.pstore}')
 snippet tra
 	transaction(${1:true}) { ${0} }
 # xmlread(..)
 snippet xml-
-	REXML::Document.new(File.read(${1:"path/to/file"}))
+	REXML::Document.new(File.read('${1:path/to/file}'))
 # xpath(..) { .. }
 snippet xpa
-	elements.each(${1:"//Xpath"}) do |${2:node}|
+	elements.each('${1://Xpath}') do |${2:node}|
 		${0}
 	end
 # class_from_name()
 snippet clafn
-	split("::").inject(Object) { |par, const| par.const_get(const) }
+	split('::').inject(Object) { |par, const| par.const_get(const) }
 # singleton_class()
 snippet sinc
 	class << self; self end
@@ -565,8 +569,8 @@ snippet nam
 		${0}
 	end
 snippet tas
-	desc "${1:Task description}"
-	task :${2:task_name => [:dependent, :tasks]} do
+	desc '${1:Task description}'
+	task ${2:task_name: [:dependent, :tasks]} do
 		${0}
 	end
 # block
@@ -574,7 +578,7 @@ snippet b
 	{ |${1:var}| ${0} }
 snippet begin
 	begin
-		raise 'A test exception.'
+		fail 'A test exception.'
 	rescue Exception => e
 		puts e.message
 		puts e.backtrace.inspect
@@ -590,4 +594,4 @@ snippet debug
 snippet pry
 	require 'pry'; binding.pry
 snippet strf
-	strftime("${1:%Y-%m-%d %H:%M:%S %z}")${0}
+	strftime('${1:%Y-%m-%d %H:%M:%S %z}')${0}

From e3116716598e1ea1073dcab2960532be30aa8bbe Mon Sep 17 00:00:00 2001
From: Eustaquio Rangel <taq@eustaquiorangel.com>
Date: Fri, 18 Jul 2014 19:11:31 -0300
Subject: [PATCH 0372/1587] Revised the Rails snippets according to Ruby code
 styles.

---
 snippets/rails.snippets | 154 ++++++++++++++++++++--------------------
 1 file changed, 78 insertions(+), 76 deletions(-)

diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index 84215ba64..44b1598c5 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -1,5 +1,5 @@
 snippet art
-	assert_redirected_to ${1::action => "${2:index}"}
+	assert_redirected_to ${1:action}: '${2:index}'
 snippet artnp
 	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1}, ${0:@$2})
 snippet artnpp
@@ -9,19 +9,21 @@ snippet artp
 snippet artpp
 	assert_redirected_to ${0:model}s_path
 snippet asd
-	assert_difference "${1:Model}.${2:count}", ${3:1} do
+	assert_difference '${1:Model}.${2:count}', ${3:1} do
 		${0}
 	end
 snippet asnd
-	assert_no_difference "${1:Model}.${2:count}" do
+	assert_no_difference '${1:Model}.${2:count}' do
 		${0}
 	end
 snippet asre
 	assert_response :${1:success}, @response.body
 snippet asrj
-	assert_rjs :${1:replace}, "${0:dom id}"
+	assert_rjs :${1:replace}, '${0:dom id}'
 snippet ass assert_select(..)
-	assert_select '${1:path}', :${2:text} => '${3:inner_html' ${4:do}
+	assert_select '${1:path}', ${2:text}: '${3:inner_html}' ${4:do}
+		${0}
+	end
 snippet ba
 	before_action :${0:method}
 snippet bf
@@ -29,7 +31,7 @@ snippet bf
 snippet bt
 	belongs_to :${0:association}
 snippet btp
-	belongs_to :${1:association}, :polymorphic => true
+	belongs_to :${1:association}, polymorphic: true
 snippet crw
 	cattr_accessor :${0:attr_names}
 snippet defcreate
@@ -40,10 +42,10 @@ snippet defcreate
 			if @$1.save
 				flash[:notice] = '$2 was successfully created.'
 				format.html { redirect_to(@$1) }
-				format.xml  { render :xml => @$1, :status => :created, :location => @$1 }
+				format.xml  { render xml: @$1, status: :created, location: @$1 }
 			else
-				format.html { render :action => "new" }
-				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
+				format.html { render action: 'new' }
+				format.xml  { render xml: @$1.errors, status: :unprocessable_entity }
 			end
 		end
 	end
@@ -67,7 +69,7 @@ snippet defindex
 
 		respond_to do |format|
 			format.html # index.html.erb
-			format.xml  { render :xml => @$1s }
+			format.xml  { render xml: @$1s }
 		end
 	end
 snippet defnew
@@ -76,7 +78,7 @@ snippet defnew
 
 		respond_to do |format|
 			format.html # new.html.erb
-			format.xml  { render :xml => @$1 }
+			format.xml  { render xml: @$1 }
 		end
 	end
 snippet defshow
@@ -85,7 +87,7 @@ snippet defshow
 
 		respond_to do |format|
 			format.html # show.html.erb
-			format.xml  { render :xml => @$1 }
+			format.xml  { render xml: @$1 }
 		end
 	end
 snippet defupdate
@@ -98,25 +100,25 @@ snippet defupdate
 				format.html { redirect_to(@$1) }
 				format.xml  { head :ok }
 			else
-				format.html { render :action => "edit" }
-				format.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
+				format.html { render action: 'edit' }
+				format.xml  { render xml: @$1.errors, status: :unprocessable_entity }
 			end
 		end
 	end
 snippet dele delegate .. to
-	delegate :${1:methods}, :to => :${0:object}
+	delegate :${1:methods}, to: :${0:object}
 snippet dele delegate .. to .. prefix .. allow_nil
-	delegate :${1:methods}, :to => :${2:object}, :prefix => :${3:prefix}, :allow_nil => ${0:allow_nil}
+	delegate :${1:methods}, to: :${2:object}, prefix: :${3:prefix}, allow_nil: ${0:allow_nil}
 snippet flash
-	flash[:${1:notice}] = "${0}"
+	flash[:${1:notice}] = '${0}'
 snippet habtm
-	has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"
+	has_and_belongs_to_many :${1:object}, join_table: '${2:table_name}', foreign_key: '${3}_id'
 snippet hm
 	has_many :${0:object}
 snippet hmd
-	has_many :${1:other}s, :class_name => "${2:$1}", :foreign_key => "${3:$1}_id", :dependent => :destroy
+	has_many :${1:other}s, class_name: '${2:$1}', foreign_key: '${3:$1}_id', dependent: :destroy
 snippet hmt
-	has_many :${1:object}, :through => :${0:object}
+	has_many :${1:object}, through: :${0:object}
 snippet ho
 	has_one :${0:object}
 snippet hod
@@ -124,31 +126,31 @@ snippet hod
 snippet i18
 	I18n.t('${1:type.key}')
 snippet ist
-	<%= image_submit_tag("${1:agree.png}", :id => "${2:id}"${0} %>
+	<%= image_submit_tag('${1:agree.png}', id: '${2:id}'${0}) %>
 snippet log
 	Rails.logger.${1:debug} ${0}
 snippet log2
 	RAILS_DEFAULT_LOGGER.${1:debug} ${0}
 snippet logd
-	logger.debug { "${1:message}" }
+	logger.debug { '${1:message}' }
 snippet loge
-	logger.error { "${1:message}" }
+	logger.error { '${1:message}' }
 snippet logf
-	logger.fatal { "${1:message}" }
+	logger.fatal { '${1:message}' }
 snippet logi
-	logger.info { "${1:message}" }
+	logger.info { '${1:message}' }
 snippet logw
-	logger.warn { "${1:message}" }
+	logger.warn { '${1:message}' }
 snippet mapc
 	${1:map}.${2:connect} '${0:controller/:action/:id}'
 snippet mapca
-	${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"
+	${1:map}.catch_all '*${2:anything}', controller: '${3:default}', action: '${4:error}'
 snippet mapr
 	${1:map}.resource :${0:resource}
 snippet maprs
 	${1:map}.resources :${0:resource}
 snippet mapwo
-	${1:map}.with_options :${2:controller} => '${3:thing}' do |$3|
+	${1:map}.with_options ${2:controller}: '${3:thing}' do |$3|
 		${0}
 	end
 
@@ -203,66 +205,66 @@ snippet mp
 snippet mrw
 	mattr_accessor :${0:attr_names}
 snippet oa
-	order("${0:field}")
+	order('${0:field}')
 snippet od
-	order("${0:field} DESC")
+	order('${0:field} DESC')
 snippet pa
 	params[:${1:id}]
 snippet ra
-	render :action => "${0:action}"
+	render action: '${0:action}'
 snippet ral
-	render :action => "${1:action}", :layout => "${0:layoutname}"
+	render action: '${1:action}', layout: '${0:layoutname}'
 snippet rest
 	respond_to do |format|
 		format.${1:html} { ${0} }
 	end
 snippet rf
-	render :file => "${0:filepath}"
+	render file: '${0:filepath}'
 snippet rfu
-	render :file => "${1:filepath}", :use_full_path => ${0:false}
+	render file: '${1:filepath}', use_full_path: ${0:false}
 snippet ri
-	render :inline => "${0:<%= 'hello' %>}"
+	render inline: "${0:<%= 'hello' %>}"
 snippet ril
-	render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"${0} }
+	render inline: "${1:<%= 'hello' %>}", locals: { ${2:name}: '${3:value}'${0} }
 snippet rit
-	render :inline => "${1:<%= 'hello' %>}", :type => ${0::rxml}
+	render inline: "${1:<%= 'hello' %>}", type: ${0::rxml}
 snippet rjson
-	render :json => ${0:text to render}
+	render json: '${0:text to render}'
 snippet rl
-	render :layout => "${0:layoutname}"
+	render layout: '${0:layoutname}'
 snippet rn
-	render :nothing => ${0:true}
+	render nothing: ${0:true}
 snippet rns
-	render :nothing => ${1:true}, :status => ${0:401}
+	render nothing: ${1:true}, status: ${0:401}
 snippet rp
-	render :partial => "${0:item}"
+	render partial: '${0:item}'
 snippet rpc
-	render :partial => "${1:item}", :collection => ${0:@$1s}
+	render partial: '${1:item}', collection: ${0:@$1s}
 snippet rpl
-	render :partial => "${1:item}", :locals => { :${2:$1} => ${0:@$1}
+	render partial: '${1:item}', locals: { ${2:$1}: ${0:@$1} }
 snippet rpo
-	render :partial => "${1:item}", :object => ${0:@$1}
+	render partial: '${1:item}', object: ${0:@$1}
 snippet rps
-	render :partial => "${1:item}", :status => ${0:500}
+	render partial: '${1:item}', status: ${0:500}
 snippet rt
-	render :text => "${0:text to render}"
+	render text: '${0:text to render}'
 snippet rtl
-	render :text => "${1:text to render}", :layout => "${0:layoutname}"
+	render text: '${1:text to render}', layout: '${0:layoutname}'
 snippet rtlt
-	render :text => "${1:text to render}", :layout => ${0:true}
+	render text: '${1:text to render}', layout: ${0:true}
 snippet rts
-	render :text => "${1:text to render}", :status => ${0:401}
+	render text: '${1:text to render}', status: ${0:401}
 snippet ru
 	render :update do |${1:page}|
 		$1.${0}
 	end
 snippet rxml
-	render :xml => ${0:text to render}
+	render xml: '${0:text to render}'
 snippet sc
 	scope :${1:name}, -> { where(${2:field}: ${0:value}) }
 snippet sl
 	scope :${1:name}, lambda do |${2:value}|
-		where("${3:field = ?}", ${0:bind var})
+		where('${3:field = ?}', ${0:value})
 	end
 snippet sha1
 	Digest::SHA1.hexdigest(${0:string})
@@ -284,40 +286,40 @@ snippet sweeper
 	end
 snippet va validates_associated
 	validates_associated :${0:attribute}
-snippet va validates .., :acceptance => true
-	validates :${0:terms}, :acceptance => true
+snippet va validates .., acceptance: true
+	validates :${0:terms}, acceptance: true
 snippet vc
-	validates :${0:attribute}, :confirmation => true
+	validates :${0:attribute}, confirmation: true
 snippet ve
-	validates :${1:attribute}, :exclusion => { :in => ${0:%w( mov avi )} }
+	validates :${1:attribute}, exclusion: { in: ${0:%w( mov avi )} }
 snippet vf
-	validates :${1:attribute}, :format => { :with => /${0:regex}/ }
+	validates :${1:attribute}, format: { with: /${0:regex}/ }
 snippet vi
-	validates :${1:attribute}, :inclusion => { :in => %w(${0: mov avi }) }
+	validates :${1:attribute}, inclusion: { in: %w(${0: mov avi }) }
 snippet vl
-	validates :${1:attribute}, :length => { :in => ${2:3}..${0:20} }
+	validates :${1:attribute}, length: { in: ${2:3}..${0:20} }
 snippet vn
-	validates :${0:attribute}, :numericality => true
+	validates :${0:attribute}, numericality: true
 snippet vp
-	validates :${0:attribute}, :presence => true
+	validates :${0:attribute}, presence: true
 snippet vu
-	validates :${0:attribute}, :uniqueness => true
+	validates :${0:attribute}, uniqueness: true
 snippet format
 	format.${1:js|xml|html} { ${0} }
 snippet wc
-	where(${1:"conditions"}${0:, bind_var})
+	where(${1:'conditions'}${0:, bind_var})
 snippet wf
-	where(${1:field} => ${0:value})
+	where(${1:field}: ${0:value})
 snippet xdelete
-	xhr :delete, :${1:destroy}, :id => ${2:1}
+	xhr :delete, :${1:destroy}, id: ${2:1}
 snippet xget
-	xhr :get, :${1:show}, :id => ${2:1}
+	xhr :get, :${1:show}, id: ${2:1}
 snippet xpost
-	xhr :post, :${1:create}, :${2:object} => { ${0} }
+	xhr :post, :${1:create}, ${2:object}: ${3:object}
 snippet xput
-	xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }
+	xhr :put, :${1:update}, id: ${2:1}, ${3:object}: ${4:object}
 snippet test
-	test "should ${1:do something}" do
+	test 'should ${1:do something}' do
 		${0}
 	end
 ###########################
@@ -365,10 +367,10 @@ snippet tcb
 	t.boolean :${1:title}
 	${0}
 snippet tcbi
-	t.binary :${1:title}, :limit => ${2:2}.megabytes
+	t.binary :${1:title}, limit: ${2:2}.megabytes
 	${0}
 snippet tcd
-	t.decimal :${1:title}, :precision => ${2:10}, :scale => ${3:2}
+	t.decimal :${1:title}, precision: ${2:10}, scale: ${3:2}
 	${0}
 snippet tcda
 	t.date :${1:title}
@@ -380,16 +382,16 @@ snippet tcf
 	t.float :${1:title}
 	${0}
 snippet tch
-	t.change :${1:name}, :${2:string}, :${3:limit} => ${4:80}
+	t.change :${1:name}, :${2:string}, ${3:limit}: ${4:80}
 	${0}
 snippet tci
 	t.integer :${1:title}
 	${0}
 snippet tcl
-	t.integer :lock_version, :null => false, :default => 0
+	t.integer :lock_version, null: false, default: 0
 	${0}
 snippet tcr
-	t.references :${1:taggable}, :polymorphic => { :default => '${2:Photo}' }
+	t.references :${1:taggable}, polymorphic: { default: '${2:Photo}' }
 	${0}
 snippet tcs
 	t.string :${1:title}
@@ -446,9 +448,9 @@ snippet expb
 snippet experr
 	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/
 snippet shared
-	shared_examples ${0:"shared examples name"}
+	shared_examples ${0:'shared examples name'}
 snippet ibl
-	it_behaves_like ${0:"shared examples name"}
+	it_behaves_like ${0:'shared examples name'}
 snippet it
 	it '${1:spec_name}' do
 		${0}

From 0073abacb26cbb1239214e29036e167357ce6fe2 Mon Sep 17 00:00:00 2001
From: Eustaquio Rangel <taq@eustaquiorangel.com>
Date: Sat, 19 Jul 2014 11:33:29 -0300
Subject: [PATCH 0373/1587] Minitest snippets

---
 snippets/ruby.snippets | 61 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 2cfb36f9d..af75bd086 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -595,3 +595,64 @@ snippet pry
 	require 'pry'; binding.pry
 snippet strf
 	strftime('${1:%Y-%m-%d %H:%M:%S %z}')${0}
+#
+# Minitest snippets
+#
+snippet mb
+	must_be ${0}
+snippet wb
+	wont_be ${0}
+snippet mbe
+	must_be_empty
+snippet wbe
+	wont_be_empty
+snippet mbio
+	must_be_instance_of ${0:Class}
+snippet wbio
+	wont_be_instance_of ${0:Class}
+snippet mbko
+	must_be_kind_of ${0:Class}
+snippet wbko
+	wont_be_kind_of ${0:Class}
+snippet mbn
+	must_be_nil
+snippet wbn
+	wont_be_nil
+snippet mbsa
+	must_be_same_as ${0:other}
+snippet wbsa
+	wont_be_same_as ${0:other}
+snippet mbsi
+	-> { ${0} }.must_be_silent
+snippet mbwd
+	must_be_within_delta ${1:0.1}, ${2:0.1}
+snippet wbwd
+	wont_be_within_delta ${1:0.1}, ${2:0.1}
+snippet mbwe
+	must_be_within_epsilon ${1:0.1}, ${2:0.1}
+snippet wbwe
+	wont_be_within_epsilon ${1:0.1}, ${2:0.1}
+snippet me
+	must_equal ${0:other}
+snippet we
+	wont_equal ${0:other}
+snippet mi
+	must_include ${0:what}
+snippet wi
+	wont_include ${0:what}
+snippet mm
+	must_match /${0:regex}/
+snippet wm
+	wont_match /${0:regex}/
+snippet mout
+	-> { ${1} }.must_output '${0}'
+snippet mra
+	-> { ${1} }.must_raise ${0:Exception}
+snippet mrt
+	must_respond_to :${0:method}
+snippet wrt
+	wont_respond_to :${0:method}
+snippet msend
+	must_send [ ${1:what}, :${2:method}, ${3:args} ]
+snippet mthrow
+	-> { throw :${1:error} }.must_throw :${2:error}

From c6983fcd6ab74e9d3bb03d6aec2f88a4a83d1755 Mon Sep 17 00:00:00 2001
From: Pascal <pascal.lalancette@ubisoft.com>
Date: Fri, 25 Jul 2014 10:59:07 -0400
Subject: [PATCH 0374/1587] Add python test snippets for assertIsNone and
 assertIsNotNone

---
 UltiSnips/python.snippets | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 64b5cfd2c..233ad3329 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -47,10 +47,10 @@ class Arg(object):
 
 	def __str__(self):
 		return self.name
-	
+
 	def __unicode__(self):
 		return self.name
-	
+
 	def is_kwarg(self):
 		return '=' in self.arg
 
@@ -560,6 +560,13 @@ snippet ar "Assert raises" b
 self.assertRaises(${1:exception}, ${2:func}${3/.+/, /}${3:arguments})
 endsnippet
 
+snippet an "Assert is None" b
+self.assertIsNone(${0:expression})
+endsnippet
+
+snippet ann "Assert is not None" b
+self.assertIsNotNone(${0:expression})
+endsnippet
 
 snippet testcase "pyunit testcase" b
 class Test${1:Class}(${2:unittest.TestCase}):

From 1a2e6e83116b306a98333ad492734f290c9bd118 Mon Sep 17 00:00:00 2001
From: "Jason S. Jones" <jsjones96@gmail.com>
Date: Fri, 25 Jul 2014 21:30:28 -0700
Subject: [PATCH 0375/1587] Add html comment snippet

---
 snippets/html.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 5620caae0..3642bbca7 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -47,6 +47,9 @@ snippet backspace
 # ⎋
 snippet esc
 	&#x238B;
+# comment
+snippet //
+	<!-- ${1} -->${0}
 # Generic Doctype
 snippet doctype HTML 4.01 Strict
 	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"

From 2cc6493457e5ab62138759030e944910757db843 Mon Sep 17 00:00:00 2001
From: Josh Wainwright <wainwright.ja@gmail.com>
Date: Sat, 26 Jul 2014 09:49:49 +0100
Subject: [PATCH 0376/1587] Make trigger for "else" inline with
 recommendations.

Also make it require word boundary so does not expand within a word.
---
 UltiSnips/java.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 02b95e1e2..54ca6f35e 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -184,7 +184,7 @@ else if ($1)`!p nl(snip)`{
 }
 endsnippet
 
-snippet /el(se)?/ "else" r
+snippet el "else" w
 else`!p nl(snip)`{
 	$0
 }

From 5eaa61ae275931a8336542ddeccb43a6b20e95a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Neum=C3=BCller?= <cn00@gmx.at>
Date: Sat, 26 Jul 2014 10:20:06 +0200
Subject: [PATCH 0377/1587] rst: Make has_cjk() Python 3 compatible.

In Python 3, iterators no longer have a next() method: it has been renamed to
__next__(). This could be worked around by using the builtin function next(),
but a simpler fix is to just use the regex' object search() method instead of
finditer().
---
 UltiSnips/rst.snippets | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 624b201ca..b73a8b931 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -42,18 +42,9 @@ INCLUDABLE_DIRECTIVES = ['image', 'figure', 'include']
 CJK_RE = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-鿃豈-鶴侮-頻並-龎]', re.UNICODE)
 
 
-def has_cjk(char):
-	"""
-	Detect char contains CJK character
-
-	:param char: characters needs to be detect
-	"""
-	try:
-		CJK_RE.finditer(char).next()
-	except StopIteration:
-		return False
-	else:
-		return True
+def has_cjk(s):
+	"""Detect if s contains CJK characters."""
+	return CJK_RE.search(s) is not None
 
 def real_filename(filename):
 	"""pealeextension name off if possible
@@ -182,7 +173,7 @@ endsnippet
 
 snippet em "Emphasize string" i
 `!p
-# dirty but works with CJK charactor detection
+# dirty but works with CJK character detection
 if has_cjk(vim.current.line):
 	snip.rv ="\ "`*${1:${VISUAL:Em}}*`!p
 if has_cjk(vim.current.line):

From c5e6a6d2a70a2b28a0d41b16e2bf5815d2471c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Neum=C3=BCller?= <cn00@gmx.at>
Date: Sat, 26 Jul 2014 11:29:12 +0200
Subject: [PATCH 0378/1587] .gitignore pyc files.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..0d20b6487
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc

From 079710814f8b9855502356a4c59bb650d481848e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Neum=C3=BCller?= <cn00@gmx.at>
Date: Sat, 26 Jul 2014 11:23:03 +0200
Subject: [PATCH 0379/1587] rst: Add $VISUAL.

---
 UltiSnips/rst.snippets | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 624b201ca..476c3e2c8 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -138,43 +138,43 @@ endglobal
 
 snippet part "Part" b
 `!p snip.rv = rst_char_len(t[1])*'#'`
-${1:Part name}
+${1:${VISUAL:Part name}}
 `!p snip.rv = rst_char_len(t[1])*'#'`
 
 $0
 endsnippet
 
+snippet chap "Chapter" b
+`!p snip.rv = rst_char_len(t[1])*'*'`
+${1:${VISUAL:Chapter name}}
+`!p snip.rv = rst_char_len(t[1])*'*'`
+
+$0
+endsnippet
+
 snippet sec "Section" b
-${1:Section name}
+${1:${VISUAL:Section name}}
 `!p snip.rv = rst_char_len(t[1])*'='`
 
 $0
 endsnippet
 
 snippet ssec "Subsection" b
-${1:Section name}
+${1:${VISUAL:Subsection name}}
 `!p snip.rv = rst_char_len(t[1])*'-'`
 
 $0
 endsnippet
 
 snippet sssec "Subsubsection" b
-${1:Section name}
+${1:${VISUAL:Subsubsection name}}
 `!p snip.rv = rst_char_len(t[1])*'^'`
 
 $0
 endsnippet
 
-snippet chap "Chapter" b
-`!p snip.rv = rst_char_len(t[1])*'*'`
-${1:Chapter name}
-`!p snip.rv = rst_char_len(t[1])*'*'`
-
-$0
-endsnippet
-
 snippet para "Paragraph" b
-${1:Paragraph name}
+${1:${VISUAL:Paragraph name}}
 `!p snip.rv = rst_char_len(t[1])*'"'`
 
 $0
@@ -226,7 +226,7 @@ endsnippet
 snippet cb "Code Block" b
 .. code-block:: ${1:`!p snip.rv = get_popular_code_type()`}
 
-	${2:code}
+	${2:${VISUAL:code}}
 
 $0
 endsnippet
@@ -249,7 +249,10 @@ if di == 'fi':
 	:alt: {0}
 	{0}""".format(real_name)
 `
-..`!p snip.rv = " %s" % link if link else ""` $1`!p snip.rv=complete(t[1], INCLUDABLE_DIRECTIVES)`:: ${2:file}`!p if content:
+..`!p snip.rv = " %s" % link if link else ""` $1`!p
+snip.rv=complete(t[1], INCLUDABLE_DIRECTIVES)
+`:: ${2:${VISUAL:file}}`!p
+if content:
 	snip.rv +="    "+content`
 `!p
 # Tip of whether file is exist in comment type
@@ -263,7 +266,7 @@ endsnippet
 snippet di "Directives" b
 .. $1`!p snip.rv=complete(t[1], DIRECTIVES)`:: $2
 
-	${3:Content}
+	${3:${VISUAL:Content}}
 $0
 endsnippet
 
@@ -275,7 +278,7 @@ endsnippet
 snippet sa "Specific Admonitions" b
 .. $1`!p snip.rv =complete(t[1], SPECIFIC_ADMONITIONS)`::
 
-	${2:Content}
+	${2:${VISUAL:Content}}
 
 $0
 endsnippet
@@ -294,6 +297,6 @@ endsnippet
 snippet sid "SideBar" b
 .. sidebar:: ${1:SideBar Title}
 
-	${2:SideBar Content}
+	${2:${VISUAL:SideBar Content}}
 endsnippet
 # vim:ft=snippets:

From 71e770a4d938432f6aaef68c72aa2d65956a73bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Neum=C3=BCller?= <cn00@gmx.at>
Date: Sat, 26 Jul 2014 11:25:41 +0200
Subject: [PATCH 0380/1587] rst: Replace xrange() by Python 3 compatible
 range().

---
 UltiSnips/rst.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index b73a8b931..85ea9fcfd 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -87,7 +87,7 @@ def	make_items(times, leading='+'):
 	times = int(times)
 	if leading == 1:
 		msg = ""
-		for x in xrange(1, times+1):
+		for x in range(1, times+1):
 			msg += "%s. Item\n" % x
 		return msg
 	else:

From 0f712a1423983bb3ad6fcafef4d86c9f66bccc04 Mon Sep 17 00:00:00 2001
From: majjoha <mathias@mjj.io>
Date: Sat, 26 Jul 2014 17:36:16 -0400
Subject: [PATCH 0381/1587] Move the RSpec snippets from rails.snippets to
 ruby.snippets.

---
 snippets/rails.snippets | 50 --------------------------------------
 snippets/ruby.snippets  | 53 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index 44b1598c5..d8fe2be24 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -411,56 +411,6 @@ snippet tctss
 ##########################
 #     Rspec snippets     #
 ##########################
-snippet desc
-	describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
-		${0}
-	end
-snippet descm
-	describe '${1:#method}' do
-		${0:pending 'Not implemented'}
-	end
-snippet cont
-	context '${1:message}' do
-		${0}
-	end
-snippet bef
-	before :${1:each} do
-		${0}
-	end
-snippet aft
-	after :${1:each} do
-		${0}
-	end
-snippet let
-	let(:${1:object}) { ${0} }
-snippet let!
-	let!(:${1:object}) { ${0} }
-snippet subj
-	subject { ${0} }
-snippet s.
-	subject.${0:method}
-snippet spec
-	specify { subject.${0} }
-snippet exp
-	expect(${1:object}).to ${0}
-snippet expb
-	expect { ${1:object} }.to ${0}
-snippet experr
-	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/
-snippet shared
-	shared_examples ${0:'shared examples name'}
-snippet ibl
-	it_behaves_like ${0:'shared examples name'}
-snippet it
-	it '${1:spec_name}' do
-		${0}
-	end
-snippet its
-	its(:${1:method}) { should ${0} }
-snippet is
-	it { should ${0} }
-snippet isn
-	it { should_not ${0} }
 #ShouldaMatchers#ActionController
 snippet isfp
 	it { should filter_param :${0:key} }
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index af75bd086..fd4172c10 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -656,3 +656,56 @@ snippet msend
 	must_send [ ${1:what}, :${2:method}, ${3:args} ]
 snippet mthrow
 	-> { throw :${1:error} }.must_throw :${2:error}
+##########################
+#     Rspec snippets     #
+##########################
+snippet desc
+	describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
+		${0}
+	end
+snippet descm
+	describe '${1:#method}' do
+		${0:pending 'Not implemented'}
+	end
+snippet cont
+	context '${1:message}' do
+		${0}
+	end
+snippet bef
+	before :${1:each} do
+		${0}
+	end
+snippet aft
+	after :${1:each} do
+		${0}
+	end
+snippet let
+	let(:${1:object}) { ${0} }
+snippet let!
+	let!(:${1:object}) { ${0} }
+snippet subj
+	subject { ${0} }
+snippet s.
+	subject.${0:method}
+snippet spec
+	specify { subject.${0} }
+snippet exp
+	expect(${1:object}).to ${0}
+snippet expb
+	expect { ${1:object} }.to ${0}
+snippet experr
+	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/
+snippet shared
+	shared_examples ${0:'shared examples name'}
+snippet ibl
+	it_behaves_like ${0:'shared examples name'}
+snippet it
+	it '${1:spec_name}' do
+		${0}
+	end
+snippet its
+	its(:${1:method}) { should ${0} }
+snippet is
+	it { should ${0} }
+snippet isn
+	it { should_not ${0} }

From 506d5a37282a7ce676bff1de88e731f8e4f5639a Mon Sep 17 00:00:00 2001
From: Nick Janetakis <nick.janetakis@gmail.com>
Date: Sun, 27 Jul 2014 19:20:29 -0400
Subject: [PATCH 0382/1587] Extend html in eruby

---
 UltiSnips/eruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index 118cdfec1..ae58c9f2b 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -1,3 +1,5 @@
+extends html
+
 priority -50
 
 # TextMate added these variables to cope with changes in ERB handling

From a83775cfeb521cc51d92345b32ff5ace89c4fecb Mon Sep 17 00:00:00 2001
From: Tobias Witt <tobias.witt@hhu.de>
Date: Fri, 1 Aug 2014 10:06:40 +0200
Subject: [PATCH 0383/1587] Add snippets for requirejs module definitions for
 coffee- and javascript

The snippet that generates a require block is called `reqjs` in order to
have no collision with the existing `req` snippet.
---
 snippets/coffee/requirejs_coffee.snippets         | 11 +++++++++++
 snippets/javascript/javascript-requirejs.snippets | 14 ++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 snippets/coffee/requirejs_coffee.snippets
 create mode 100644 snippets/javascript/javascript-requirejs.snippets

diff --git a/snippets/coffee/requirejs_coffee.snippets b/snippets/coffee/requirejs_coffee.snippets
new file mode 100644
index 000000000..4130b5e51
--- /dev/null
+++ b/snippets/coffee/requirejs_coffee.snippets
@@ -0,0 +1,11 @@
+snippet def
+  define ["${1:#dependencies1}"], (${2:#dependencies2}) ->
+    ${0:TARGET}
+
+snippet defn
+  define "${1:#name}", ["${2:#dependencies1}"], (${3:#dependencies2}) ->
+    ${0:TARGET}
+
+snippet reqjs
+  require ["${1:#dependencies1}"], (${2:#dependencies2}) ->
+    ${0:TARGET}
diff --git a/snippets/javascript/javascript-requirejs.snippets b/snippets/javascript/javascript-requirejs.snippets
new file mode 100644
index 000000000..c8aab757e
--- /dev/null
+++ b/snippets/javascript/javascript-requirejs.snippets
@@ -0,0 +1,14 @@
+snippet def
+  define(["${1:#dependencies1}"], function (${2:#dependencies2}) {
+    return ${0:TARGET};
+  });
+
+snippet defn
+  define("${1:#name}", ["${2:#dependencies1}"], function (${3:#dependencies2}) {
+    return ${0:TARGET};
+  });
+
+snippet reqjs
+  require(["${1:#dependencies1}"], function (${2:#dependencies2}) {
+    return ${0:TARGET};
+  });

From a7fc95dfbeca4b770d348155ec2fc188e4534bc1 Mon Sep 17 00:00:00 2001
From: Josh Wainwright <jaw097@bham.ac.uk>
Date: Fri, 1 Aug 2014 15:48:11 +0100
Subject: [PATCH 0384/1587] Add VISUAL to several snippets to allow wrapping
 selected text

---
 UltiSnips/java.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 54ca6f35e..2f9dc9b07 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -180,13 +180,13 @@ endsnippet
 
 snippet elif "else if"
 else if ($1)`!p nl(snip)`{
-	$0
+	${0:${VISUAL}}
 }
 endsnippet
 
 snippet el "else" w
 else`!p nl(snip)`{
-	$0
+	${0:${VISUAL}}
 }
 endsnippet
 
@@ -214,7 +214,7 @@ endsnippet
 
 snippet if "if" b
 if ($1)`!p nl(snip)`{
-	$0
+	${0:${VISUAL}}
 }
 endsnippet
 
@@ -303,7 +303,7 @@ endsnippet
 
 snippet try "try/catch" b
 try {
-	$1
+	${0:${VISUAL}}
 } catch(${2:Exception} ${3:e}){
 	${4:e.printStackTrace();}
 }

From ae1631ca09a5f4108bc67be7a6d5e7e8352ee249 Mon Sep 17 00:00:00 2001
From: Josh Wainwright <jaw097@bham.ac.uk>
Date: Fri, 1 Aug 2014 15:51:04 +0100
Subject: [PATCH 0385/1587] Correct anchor

---
 UltiSnips/java.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 2f9dc9b07..c26b6f650 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -303,7 +303,7 @@ endsnippet
 
 snippet try "try/catch" b
 try {
-	${0:${VISUAL}}
+	${1:${VISUAL}}
 } catch(${2:Exception} ${3:e}){
 	${4:e.printStackTrace();}
 }

From 437196368e394c4300271dc42bfeef6cc8436773 Mon Sep 17 00:00:00 2001
From: Josh Wainwright <wainwright.ja@gmail.com>
Date: Fri, 1 Aug 2014 16:26:29 +0100
Subject: [PATCH 0386/1587] Don't highlight selected text after wrapping

---
 UltiSnips/java.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index c26b6f650..e8eb77ccf 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -180,13 +180,13 @@ endsnippet
 
 snippet elif "else if"
 else if ($1)`!p nl(snip)`{
-	${0:${VISUAL}}
+	$0${VISUAL}
 }
 endsnippet
 
 snippet el "else" w
 else`!p nl(snip)`{
-	${0:${VISUAL}}
+	$0${VISUAL}
 }
 endsnippet
 
@@ -214,7 +214,7 @@ endsnippet
 
 snippet if "if" b
 if ($1)`!p nl(snip)`{
-	${0:${VISUAL}}
+	$0${VISUAL}
 }
 endsnippet
 
@@ -303,7 +303,7 @@ endsnippet
 
 snippet try "try/catch" b
 try {
-	${1:${VISUAL}}
+	$1${VISUAL}
 } catch(${2:Exception} ${3:e}){
 	${4:e.printStackTrace();}
 }

From 2f20b96a502dd08ad541080fd55f6ad97b2a8648 Mon Sep 17 00:00:00 2001
From: pydave <pydave@gmail.com>
Date: Fri, 1 Aug 2014 09:30:11 -0700
Subject: [PATCH 0387/1587] Add vim modeline snippets

Add an 'all' and a 'help' snippet for vim modelines.

The 'all' snippet implements the advice in tabstop's docs about setting
softtabstop when using noexpandtab what other variables (expandtab,
shiftwidth, and tabstop) to set. It sets these variables to their
current values.

Vim supports two forms of modelines, but only the second (that includes
the 'set') works in languages with comment terminators (/* like C */).

The 'help' snippet uses exactly what vim help files use (including the
leading space -- I expect users will insert the modeline at the start of
a line).

Does some unnecessary interpolation ('set' and 'vim') to prevent vim
from interpreting the snippet definition as a modeline for the snippets
file.
---
 UltiSnips/all.snippets  | 10 ++++++++++
 UltiSnips/help.snippets |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 532010e7b..f816ba403 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -120,4 +120,14 @@ vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
 no sea takimata sanctus est Lorem ipsum dolor sit amet.
 endsnippet
 
+##########################
+# VIM MODELINE GENERATOR #
+##########################
+# See advice on `:help 'tabstop'` for why these values are set. Uses second
+# modeline form ('set') to work in languages with comment terminators
+# (/* like C */).
+snippet modeline "Vim modeline"
+vim`!v ':set '. (&expandtab ? printf('et sw=%i ts=%i', &sw, &ts) : printf('noet sts=%i sw=%i ts=%i', &sts, &sw, &ts)) . (&tw ? ' tw='. &tw : '') . ':'`
+endsnippet
+
 # vim:ft=snippets:
diff --git a/UltiSnips/help.snippets b/UltiSnips/help.snippets
index 613273856..b07a7de0f 100644
--- a/UltiSnips/help.snippets
+++ b/UltiSnips/help.snippets
@@ -29,4 +29,9 @@ ${1:SubSubsection}:`!p snip.rv = sec_title(snip, t)`
 $0
 endsnippet
 
+# For vim help, follow the same settings as the official docs.
+snippet modeline "Vim help modeline"
+ `!v 'vim'`:tw=78:ts=8:ft=help:norl:
+endsnippet
+
 # vim:ft=snippets:

From 6a91a09d5d09631ed037ed96708867a84e1a13db Mon Sep 17 00:00:00 2001
From: Aydar Khabibullin <aydar.kh@gmail.com>
Date: Mon, 4 Aug 2014 13:03:07 +0600
Subject: [PATCH 0388/1587] Add public class snippet

---
 snippets/java.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index ea2ec7aa7..8971b3d68 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -40,6 +40,8 @@ snippet j.u
 ## Class
 snippet cl
 	class ${1:`vim_snippets#Filename("$1", "untitled")`} ${0}
+snippet pcl
+	public class ${1:`vim_snippets#Filename("$1", "untitled")`} ${0}
 snippet in
 	interface ${1:`vim_snippets#Filename("$1", "untitled")`} ${2:extends Parent}
 snippet tc

From c194e8b6d2c37edbeb4a3c7e6fa9a9045a97541a Mon Sep 17 00:00:00 2001
From: Alex Tan <alex.r.tan@gmail.com>
Date: Wed, 6 Aug 2014 17:03:23 -0400
Subject: [PATCH 0389/1587] Add expect(...).toBe(...) snippet for Jasmine

---
 UltiSnips/javascript_jasmine.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/javascript_jasmine.snippets b/UltiSnips/javascript_jasmine.snippets
index 3a8729857..e392459f4 100644
--- a/UltiSnips/javascript_jasmine.snippets
+++ b/UltiSnips/javascript_jasmine.snippets
@@ -50,6 +50,10 @@ snippet ee "expect to equal (js)" b
 expect(${1:target}).toEqual(${2:value});
 endsnippet
 
+snippet eb "expect to be (js)" b
+expect(${1:target}).toBe(${2:value});
+endsnippet
+
 snippet em "expect to match (js)" b
 expect(${1:target}).toMatch(${2:pattern});
 endsnippet

From 04207c93e30bcf8edb5ec1329a053cb0d56b9215 Mon Sep 17 00:00:00 2001
From: Nick Papanastasiou <Papanastasiou1993@gmail.com>
Date: Mon, 11 Aug 2014 12:23:41 -0400
Subject: [PATCH 0390/1587] added snippets/d.snippets

---
 snippets/d.snippets | 338 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 338 insertions(+)
 create mode 100644 snippets/d.snippets

diff --git a/snippets/d.snippets b/snippets/d.snippets
new file mode 100644
index 000000000..216a4d892
--- /dev/null
+++ b/snippets/d.snippets
@@ -0,0 +1,338 @@
+### Import
+snippet imp
+	import 
+snippet pimp
+	public import
+### My favorite modules
+snippet io
+	std.stdio
+snippet traits
+	std.traits
+snippet conv
+	std.conv
+snippet arr
+	std.array
+snippet algo
+	std.algorithm
+snippet theusual
+	import std.stdio, std.string, std.array;
+	import std.traits, std.conv, std.algorithm;
+	import std.math, std.regex;
+### Control Structures
+snippet for
+	for(int ${1:i} = 0; $1 < ${2:count}; $1++) {
+		${0}
+	}
+snippet fe
+	foreach(${1:elem}; ${2:range}) {
+		${0}
+	}
+snippet fei
+	foreach(${1:i}, ${2:elem}; ${3:range}) {
+		${0}	
+	} 
+snippet fer
+	foreach_reverse(${1:elem}; ${2:range}) {
+		${0}	
+	} 
+snippet feri
+	foreach_reverse(${1:i}, ${2:elem}; ${3:range}) {
+		${0}  
+	}
+snippet sce
+	scope(exit) ${1:f.close();}
+snippet scs
+	scope(success) ${1}
+snippet scf
+	scope(failure) ${1}
+snippet el
+	else {
+		${1}	
+	}
+snippet eif
+	else if(${1}) {
+		${0}
+	}
+snippet if
+	if(${1}) {
+		${0}
+	}
+snippet ife
+	if(${1}) {
+		${2}	
+	} else {
+		${3}	
+	}
+snippet ifee
+	if(${1}) {
+		${2}	
+	} else if(${3}) {
+		${4}
+	} else {
+		${5}
+	}
+snippet sw
+	switch(${1}) {
+		${0}
+	}
+snippet cs
+	case ${1:0}:
+		${2}
+		break;
+snippet def
+	default:
+		${0}
+snippet fsw
+	final switch(${1}) {
+		${0}
+	}
+snippet try
+	try {
+		${1}
+	} catch(${2:Exception} ${3:e}) {
+		${4}
+	}
+snippet tcf
+	try {
+		${0}
+	} catch(${1:Exception} ${2:e}) {
+		${3}
+	} finally {
+		${4}
+	}
+snippet wh
+	while(${1:cond}) {
+		${0}
+	}
+snippet dowh
+	do {
+		${1}
+	} while(${2});
+snippet sif
+	static if(${1:cond}) {
+		${2}
+	}
+snippet sife
+	static if(${1}) {
+		${2}
+	} else {
+		${3}
+	}
+snippet sifee
+	static if(${1}) {
+		${2}
+	} else static if(${3}) {
+		${4}
+	} else {
+		${5}
+	}
+snippet seif
+	else static if(${1}) {
+		${2}
+	} 
+snippet ?
+	(${1: a > b}) ? ${2:a} : ${3:b}; 
+snippet with
+	with(${1:exp}) {
+		${2}
+	} ${0}	
+### Functions
+snippet fun
+	${1:auto} ${2:func}(${3:params}) {
+		${0}
+	}
+snippet contr
+	in {
+		${1}
+	} out {
+		${2}
+	} body {
+		${0}
+	}
+snippet l
+	(${1:x}) => ${2:x}${0:;}
+snippet funl
+	function (${1:int x}) => ${2}${3:;}
+snippet del
+	delegate (${1:int x}) => ${2}${3:;} 
+### Templates
+snippet temp 
+	template ${1:`vim_snippets#Filename("$2", "untitled")`}(${2:T}) {
+		${0}
+	}
+snippet tempif
+	template ${1:`vim_snippets#Filename("$2", "untitled")`}(${2:T}) if(${3:isSomeString!}$2) {
+		${0}	
+	}
+snippet opApply
+	int opApply(Dg)(Dg dg) if(ParameterTypeTuble!Dg.length == 2) {
+		${0}
+	}
+snippet psn
+	pure @safe nothrow
+snippet safe
+	@safe
+snippet trusted
+	@trusted
+snippet	system
+	@system
+### OOPs
+snippet cl
+	class${1:(T)} ${2:`vim_snippets#Filename("$3", "untitled")`} {
+		${0}	
+	}
+snippet str
+	struct${1:(T)} ${2:`vim_snippets#Filename("$3", "untitled")`} {
+		${0}	
+	}
+snippet uni
+	union${1:(T)} ${2:`vim_snippets#Filename("$3", "untitled")`} {
+		${0}	
+	}
+snippet inter
+	interface I${1:`vim_snippets#Filename("$2", "untitled")`} {
+		${0}
+	}
+snippet enum
+	enum ${1} {
+		${0}
+	}
+snippet pu
+	public
+snippet pr
+	private
+snippet po
+	protected
+snippet ctor
+	this(${1}) {
+		${0}
+	} 
+snippet dtor
+	~this(${1}) {
+		${0}
+	}
+### Type Witchery
+snippet al
+	alias ${1:b} = ${2:a};
+	${0}
+snippet alth
+	alias ${1:value} this;
+	${0}
+### The Commonplace
+snippet main
+	void main() {
+		${0}
+	}
+snippet maina
+	void main(string[] args) {
+		${0}
+	}
+snippet mod
+	module ${1:main};${0}
+snippet var
+	${1:auto} ${2:var} = ${0:1};
+snippet new
+	${1:auto} ${2:var} = new ${3:Object}(${4});
+	${0}
+snippet file
+	auto ${1:f} = File(${2:"useful_info.xml"}, ${3:"rw"});
+	${0}
+snippet map
+	map!(${1:f})(${2:xs});
+	${0}
+snippet filter
+	filter!(${1:p})(${2:xs});
+	${0}
+snippet reduce
+	reduce!(${1:f})(${2:xs});
+	${0}
+snippet find
+	find!(${1:p})($2:xs);
+	${0}
+snippet aa
+	${1:int}[${2:string}] ${3:dict} = ${0};
+### Misc
+snippet #!
+	#!/usr/bin/env rdmd
+snippet bang
+	#!/usr/bin/env rdmd
+snippet rdmd
+	#!/usr/bin/env rdmd
+snippet isstr
+	isSomeString!${1:S}
+snippet isnum
+	isNumeric!${1:N}
+snippet tos
+	to!string(${1:x});
+	${0}
+snippet toi
+	to!int(${1:str});
+	${0}
+snippet tod
+	to!double(${1:str});
+	${0}
+snippet un
+	unittest {
+		${0}
+	}
+snippet ver
+	version(${1:Posix}) {
+		${0}
+	}
+snippet de
+	debug {
+		${0}
+	}
+snippet sst
+	shared static this(${1}) {
+		${0}
+	}
+snippet td
+	// Typedef is deprecated. Use alias instead.
+	typedef
+snippet ino
+	inout
+snippet imm
+	immutable
+snippet fin
+	final
+snippet con
+	const
+snippet psi
+	private static immutable ${1:int} ${2:Constant} = ${3:1};
+	${0}
+snippet prag
+	pragma(${1})
+snippet pms
+	pragma(msg, ${1:Warning});
+snippet asm
+	asm {
+		${1}
+	}
+snippet mixin
+	mixin(${1:`writeln("Hello, World!");`});
+snippet over
+	override
+snippet ret
+	return ${1};
+snippet FILE
+	__FILE__
+snippet MOD
+	__MODULE__
+snippet LINE
+	__LINE__
+snippet FUN
+	__FUNCTION__
+snippet PF
+	__PRETTY_FUNCTION__
+snippet cast
+	cast(${1:T})(${2:val});
+snippet /*
+	/*
+	 * ${1}
+	*/
+### Fun stuff
+snippet idk
+	// I don't know how this works. Don't touch it.
+snippet idfk
+	// Don't FUCKING touch this.

From 1f5e1c5fda6296bdbdd76191273c1367015a4664 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <ethervoid@gmail.com>
Date: Thu, 14 Aug 2014 08:36:45 +0200
Subject: [PATCH 0391/1587] Added print_r snippet in php

---
 snippets/php.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 831d53db4..b200463a2 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -347,6 +347,10 @@ snippet vd
 	var_dump(${0});
 snippet vdd
 	var_dump(${1}); die(${0:});
+snippet pr
+	print_r(${0});
+snippet prs
+	print_r(${0}, 1);
 snippet vdf
 	error_log(print_r($${1:foo}, true), 3, '${2:/tmp/debug.log}');
 snippet http_redirect

From 4e13b696d61d2e11b3547af78fd34bf092056fcf Mon Sep 17 00:00:00 2001
From: Mario de Frutos <ethervoid@gmail.com>
Date: Thu, 14 Aug 2014 10:28:31 +0200
Subject: [PATCH 0392/1587] Avoid collision with print_r snippet

---
 UltiSnips/php.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index b71091208..b2e560638 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -240,7 +240,7 @@ public function __construct(${1:$dependencies})
 $0
 endsnippet
 
-snippet pr "Dumb debug helper in HTML"
+snippet prv "Dumb debug helper in HTML"
 echo '<pre>' . var_export($1, 1) . '</pre>';$0
 endsnippet
 

From 5d012dba2900a4d47f090ddb5a5227b5f0a89d77 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <ethervoid@gmail.com>
Date: Thu, 14 Aug 2014 13:26:54 +0200
Subject: [PATCH 0393/1587] More adecuate naming

---
 UltiSnips/php.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index b2e560638..bdefbbbfb 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -240,8 +240,8 @@ public function __construct(${1:$dependencies})
 $0
 endsnippet
 
-snippet prv "Dumb debug helper in HTML"
-echo '<pre>' . var_export($1, 1) . '</pre>';$0
+snippet ve "Dumb debug helper in HTML"
+    echo '<pre>' . var_export($1, 1) . '</pre>';$0
 endsnippet
 
 snippet pc "Dumb debug helper in cli"

From 1972ec10bd0b13bc59f6cd013dc3c54ad32605cd Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Sun, 17 Aug 2014 18:12:58 +0200
Subject: [PATCH 0394/1587] Add tex listings snippets.

---
 snippets/tex.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 87c150ca5..db328e70b 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -263,3 +263,10 @@ snippet col2 two-column environment
 			${0}
 		\end{column}
 	\end{columns}
+# Code listings
+snippet lst
+	\begin{listing}[language=${1:language}]
+		${0}
+	\end{listing}
+snippet lsi
+	\lstinline|${1}| ${0}

From 9cf1d0e50249eaf0f23b3d4a3ba1e31ede2aa034 Mon Sep 17 00:00:00 2001
From: Connor Atherton <c.liam.atherton@gmail.com>
Date: Wed, 20 Aug 2014 20:05:28 +0100
Subject: [PATCH 0395/1587] Modify js proto and add node snippets

---
 snippets/javascript/javascript.node.snippets | 50 ++++++++++++++++++++
 snippets/javascript/javascript.snippets      |  9 ++--
 2 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 snippets/javascript/javascript.node.snippets

diff --git a/snippets/javascript/javascript.node.snippets b/snippets/javascript/javascript.node.snippets
new file mode 100644
index 000000000..4a4295948
--- /dev/null
+++ b/snippets/javascript/javascript.node.snippets
@@ -0,0 +1,50 @@
+# module exports
+snippet ex
+	module.exports = ${1};
+# require
+snippet re
+	var ${1} = require("${2:module_name}");
+# EventEmitter
+snippet on
+	on('${1:event_name}', function(${2:stream}) {
+	  ${3}
+	});
+snippet emit
+	emit('${1:event_name}', ${2:args});
+snippet once
+	once('${1:event_name}', function(${2:stream}) {
+	  ${3}
+	});
+# http. User js function snippet as handler
+snippet http
+	http.createServer(${1:handler}).listen(${2:port_number});
+# net 
+snippet net
+	net.createServer(function(${1:socket}){
+		${1}.on('data', function('data'){
+		  ${2}
+		]});
+		${1}.on('end', function(){
+		  ${3}
+		});
+	}).listen(${4:8124});
+# Stream snippets
+snippet p
+	pipe(${1:stream})${2}
+# Express snippets
+snippet eget
+	${1:app}.get('${2:route}', ${3:handler});
+snippet epost
+	${1:app}.post('${2:route}', ${3:handler});
+snippet eput
+	${1:app}.put('${2:route}', ${3:handler});
+snippet edel
+	${1:app}.delete('${2:route}', ${3:handler});
+# process snippets
+snippet stdin
+	process.stdin
+snippet stdout
+	process.stdout
+snippet stderr
+	process.stderr
+
diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index d20d71363..f4ef351b8 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -1,7 +1,6 @@
-# Prototype
+# prototype
 snippet proto
-	${1:class_name}.prototype.${2:method_name} =
-	function(${3:first_argument}) {
+	${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {
 		${0:// body...}
 	};
 # Function
@@ -11,12 +10,12 @@ snippet fun
 	}
 # Anonymous Function
 snippet f
-	function (${1}) {
+	function(${1}) {
 		${0}
 	}
 # Immediate function
 snippet (f
-	(function (${1}) {
+	(function(${1}) {
 		${0}
 	}(${2}));
 # if

From 1d5ccd6f3f05a0b1c1c5d7b6c84b44744fa6c0ea Mon Sep 17 00:00:00 2001
From: X4fyr <benedikt_v@web.de>
Date: Sat, 23 Aug 2014 01:13:56 +0200
Subject: [PATCH 0396/1587] Changed @todo to TODO

---
 UltiSnips/python.snippets | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 233ad3329..3387533d0 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -84,22 +84,22 @@ def get_style(snip):
 
 def format_arg(arg, style):
 	if style == DOXYGEN:
-		return "@param %s @todo" % arg
+		return "@param %s TODO" % arg
 	elif style == SPHINX:
-		return ":param %s: @todo" % arg
+		return ":param %s: TODO" % arg
 	elif style == NORMAL:
-		return ":%s: @todo" % arg
+		return ":%s: TODO" % arg
 	elif style == GOOGLE:
-		return "%s (@todo): @todo" % arg
+		return "%s (TODO): TODO" % arg
 
 
 def format_return(style):
 	if style == DOXYGEN:
-		return "@return: @todo"
+		return "@return: TODO"
 	elif style in (NORMAL, SPHINX):
-		return ":returns: @todo"
+		return ":returns: TODO"
 	elif style == GOOGLE:
-		return "Returns: @todo"
+		return "Returns: TODO"
 
 
 def write_docstring_args(args, snip):
@@ -169,7 +169,7 @@ class ${1:MyClass}(${2:object}):
 	`!p snip.rv = triple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = triple_quotes(snip)`
 
 	def __init__(self$4):
-		`!p snip.rv = triple_quotes(snip)`${5:@todo: to be defined1.}`!p
+		`!p snip.rv = triple_quotes(snip)`${5:TODO: to be defined1.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -197,7 +197,7 @@ write_slots_args(args, snip)
 `
 
 	def __init__(self$4):
-		`!p snip.rv = triple_quotes(snip)`${5:@todo: to be defined.}`!p
+		`!p snip.rv = triple_quotes(snip)`${5:TODO: to be defined.}`!p
 snip.rv = ""
 snip >> 2
 
@@ -399,7 +399,7 @@ snippet def "function with docstrings" b
 def ${1:function}(`!p
 if snip.indent:
 	snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
-	`!p snip.rv = triple_quotes(snip)`${4:@todo: Docstring for $1.}`!p
+	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
 snip.rv = ""
 snip >> 1
 
@@ -437,7 +437,7 @@ endsnippet
 snippet rwprop "Read write property" b
 def ${1:name}():
 	`!p snip.rv = triple_quotes(snip) if t[2] else ''
-`${2:@todo: Docstring for $1.}`!p
+`${2:TODO: Docstring for $1.}`!p
 if t[2]:
 	snip >> 1
 

From f7d4aa5efaebc5e87ad70c66c2bba84ca58411e4 Mon Sep 17 00:00:00 2001
From: obaoba <obaoba.git@gmail.com>
Date: Sat, 23 Aug 2014 16:13:08 +0200
Subject: [PATCH 0397/1587] adding Ada snippets

---
 UltiSnips/ada.snippets | 324 +++++++++++++++++++++++++++++++++++++++++
 snippets/ada.snippets  | 255 ++++++++++++++++++++++++++++++++
 2 files changed, 579 insertions(+)
 create mode 100644 UltiSnips/ada.snippets
 create mode 100644 snippets/ada.snippets

diff --git a/UltiSnips/ada.snippets b/UltiSnips/ada.snippets
new file mode 100644
index 000000000..d33c77782
--- /dev/null
+++ b/UltiSnips/ada.snippets
@@ -0,0 +1,324 @@
+priority -50
+
+global !p
+
+def ada_case(word):
+	out = word[0].upper()
+	for i in range(1, len(word)):
+		if word[i - 1] == '_':
+			out = out + word[i].upper()
+		else:
+			out = out + word[i]
+	return out
+
+def get_year():
+	import time
+	return time.strftime("%Y")
+
+endglobal
+
+snippet wi "with"
+with $1;$0
+endsnippet
+
+snippet pac "package"
+package ${1:`!p snip.rv = ada_case(snip.basename)`} is
+	$0
+end $1;
+endsnippet
+
+snippet pacb "package body"
+package body ${1:`!p snip.rv = ada_case(snip.basename)`} is
+	$0
+end $1;
+endsnippet
+
+snippet ent "entry ... when"
+entry $1($2) when $3 is
+begin
+	$0
+end $1;
+endsnippet
+
+snippet task "task"
+task $1 is
+	entry $0
+end $1;
+endsnippet
+
+snippet taskb "task body"
+task body $1 is
+	$2
+begin
+	$0
+end $1;
+endsnippet
+
+snippet acc "accept"
+accept $1($2) do
+	$0
+end $1;
+endsnippet
+
+snippet prot "protected type"
+protected type $1($2) is
+	$0
+end $1;
+endsnippet
+
+snippet prob "protected body"
+protected body $1 is
+	$2
+begin
+	$0
+end $1;
+endsnippet
+
+snippet gen "generic type"
+generic
+	type $1 is $2;$0
+endsnippet
+
+snippet ty "type"
+type $1 is $2;$0
+endsnippet
+
+snippet tyd "type with default value"
+type $1 is $2
+	with Default_Value => $3;$0
+endsnippet
+
+snippet subty "subtype"
+subtype $1 is $2;$0
+endsnippet
+
+snippet dec "declare block"
+declare
+	$1
+begin
+	$0
+end;
+endsnippet
+
+snippet decn "declare named block"
+$1:
+declare
+	$2
+begin
+	$0
+end $1;
+endsnippet
+
+snippet ifex "if expression"
+if $1 then $2 else $0
+endsnippet
+
+snippet casex "case expression"
+case $1 is
+	when $2 => $3,$0
+endsnippet
+
+snippet fora "for all"
+for all $1 ${2:in} $3 => $0
+endsnippet
+
+snippet fors "for some"
+for some $1 ${2:in} $3 => $0
+endsnippet
+
+snippet if "if"
+if $1 then
+	$0
+end if;
+endsnippet
+
+snippet ife "if ... else"
+if $1 then
+	$2
+else
+	$0
+end if;
+endsnippet
+
+snippet el "else"
+else
+	$0
+endsnippet
+
+snippet eif "elsif"
+elsif $1 then
+	$0
+endsnippet
+
+snippet wh "while"
+while $1 loop
+	$0
+end loop;
+endsnippet
+
+snippet nwh "named while"
+$1:
+while $2 loop
+	$0
+end loop $1;
+endsnippet
+
+snippet for "for"
+for ${1:I} in $2 loop
+	$0
+end loop;
+endsnippet
+
+snippet fore "for each"
+for $1 of $2 loop
+	$0
+end loop;
+endsnippet
+
+snippet nfor "named for"
+$1:
+for ${2:I} in $3 loop
+	$0
+end loop $1;
+endsnippet
+
+snippet nfore "named for each"
+$1:
+for $2 of $3 loop
+	$0
+end loop $1;
+endsnippet
+
+snippet proc "procedure"
+procedure $1($2) is
+	$3
+begin
+	$0
+end $1;
+endsnippet
+
+snippet procd "procedure declaration"
+procedure $1;$0
+endsnippet
+
+snippet fun "function"
+function $1($2) return $3 is
+	$4
+begin
+	$0
+end $1;
+endsnippet
+
+snippet fune "expression function"
+function $1 return $2 is
+	($3);$0
+endsnippet
+
+snippet fund "function declaration"
+function $1 return $2;$0
+endsnippet
+
+snippet ret "extended return"
+return $1 do
+	$0
+end return;
+endsnippet
+
+snippet rec "record"
+record
+	$0
+end record;
+endsnippet
+
+snippet case "case"
+case $1 is
+	when $2 => $3;$0
+end case;
+endsnippet
+
+snippet whe "when"
+when $1 => $2;$0
+endsnippet
+
+snippet wheo "when others"
+when others => $1;$0
+endsnippet
+
+snippet lo "loop"
+loop
+	$0
+end loop;
+endsnippet
+
+snippet nlo "named loop"
+$1:
+loop
+	$0
+end loop $1;
+endsnippet
+
+snippet ex "exit when"
+exit when $1;$0
+endsnippet
+
+snippet put "Ada.Text_IO.Put"
+Ada.Text_IO.Put($1);$0
+endsnippet
+
+snippet putl "Ada.Text_IO.Put_Line"
+Ada.Text_IO.Put_Line($1);$0
+endsnippet
+
+snippet get "Ada.Text_IO.Get"
+Ada.Text_IO.Get($1);$0
+endsnippet
+
+snippet getl "Ada.Text_IO.Get_Line"
+Ada.Text_IO.Get_Line($1);$0
+endsnippet
+
+snippet newline "Ada.Text_IO.New_Line"
+Ada.Text_IO.New_Line(${1:1});$0
+endsnippet
+
+snippet gpl "GPL license header"
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU ${1}General Public License as published by
+-- the Free Software Foundation; either version ${2:3} of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU $1General Public License for more details.
+--
+-- You should have received a copy of the GNU $1General Public License
+-- along with this program; if not, see <http://www.gnu.org/licenses/>.
+--
+-- Copyright (C) ${3:Author}, ${4:`!p snip.rv = get_year()`}
+
+$0
+endsnippet
+
+snippet gplf "GPL file license header"
+-- This file is part of ${1:Program-Name}.
+-- 
+-- $1 is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU ${2}General Public License as published by
+-- the Free Software Foundation, either version ${3:3} of the License, or
+-- (at your option) any later version.
+-- 
+-- $1 is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU $2General Public License for more details.
+-- 
+-- You should have received a copy of the GNU $2General Public License
+-- along with $1. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Copyright (C) ${4:Author}, ${5:`!p snip.rv = get_year()`}
+
+$0
+endsnippet
+
+# vim:ft=snippets:
diff --git a/snippets/ada.snippets b/snippets/ada.snippets
new file mode 100644
index 000000000..ce377b995
--- /dev/null
+++ b/snippets/ada.snippets
@@ -0,0 +1,255 @@
+snippet wi with
+	with ${1};${0}
+
+snippet pac package
+	package ${1} is
+		${0}
+	end $1;
+
+snippet pacb package body
+	package body ${1} is
+		${0}
+	end $1;
+
+snippet ent entry ... when
+	entry ${1}(${2}) when ${3} is
+	begin
+		${0}
+	end $1;
+
+snippet task task
+	task ${1} is
+		entry ${0}
+	end $1;
+
+snippet taskb task body
+	task body ${1} is
+		${2}
+	begin
+		${0}
+	end $1;
+
+snippet acc accept
+	accept ${1}(${2}) do
+		${0}
+	end $1;
+
+snippet prot protected type
+	protected type ${1}(${2}) is
+		${0}
+	end $1;
+
+snippet prob protected body
+	protected body ${1} is
+		${2}
+	begin
+		${0}
+	end $1;
+
+snippet gen generic type
+	generic
+		type ${1} is ${2};${0}
+
+snippet ty type
+	type ${1} is ${2};${0}
+
+snippet tyd type with default value
+	type ${1} is ${2}
+		with Default_Value => ${3};${0}
+
+snippet subty subtype
+	subtype ${1} is ${2};${0}
+
+snippet dec declare block
+	declare
+		${1}
+	begin
+		${0}
+	end;
+
+snippet decn declare named block
+	${1}:
+	declare
+		${2}
+	begin
+		${0}
+	end $1;
+
+snippet ifex if expression
+	if ${1} then ${2} else ${0}
+
+snippet casex case expression
+	case ${1} is
+		when ${2} => ${3},${0}
+
+snippet fora for all
+	for all ${1} ${2:in} ${3} => ${0}
+
+snippet fors for some
+	for some ${1} ${2:in} ${3} => ${0}
+
+snippet if if
+	if ${1} then
+		${0}
+	end if;
+
+snippet ife if ... else
+	if ${1} then
+		${2}
+	else
+		${0}
+	end if;
+
+snippet el else
+	else
+		${0}
+
+snippet eif elsif
+	elsif ${1} then
+		${0}
+
+snippet wh while
+	while ${1} loop
+		${0}
+	end loop;
+
+snippet nwh named while
+	${1}:
+	while ${2} loop
+		${0}
+	end loop $1;
+
+snippet for for
+	for ${1:I} in ${2} loop
+		${0}
+	end loop;
+
+snippet fore for each
+	for ${1} of ${2} loop
+		${0}
+	end loop;
+
+snippet nfor named for
+	${1}:
+	for ${2:I} in ${3} loop
+		${0}
+	end loop $1;
+
+snippet nfore named for each
+	${1}:
+	for ${2} of ${3} loop
+		${0}
+	end loop $1;
+
+snippet proc procedure
+	procedure ${1}(${2}) is
+		${3}
+	begin
+		${0}
+	end $1;
+
+snippet procd procedure declaration
+	procedure ${1};${0}
+
+snippet fun function
+	function ${1}(${2}) return ${3} is
+		${4}
+	begin
+		${0}
+	end $1;
+
+snippet fune expression function
+	function ${1} return ${2} is
+		(${3});${0}
+
+snippet fund function declaration
+	function ${1} return ${2};${0}
+
+snippet ret extended return
+	return ${1} do
+		${0}
+	end return;
+
+snippet rec record
+	record
+		${0}
+	end record;
+
+snippet case case
+	case ${1} is
+		when ${2} => ${3};${0}
+	end case;
+
+snippet whe when
+	when ${1} => ${2};${0}
+
+snippet wheo when others
+	when others => ${1};${0}
+
+snippet lo loop
+	loop
+		${0}
+	end loop;
+
+snippet nlo named loop
+	${1}:
+	loop
+		${0}
+	end loop $1;
+
+snippet ex exit when
+	exit when ${1};${0}
+
+snippet put Ada.Text_IO.Put
+	Ada.Text_IO.Put(${1});${0}
+
+snippet putl Ada.Text_IO.Put_Line
+	Ada.Text_IO.Put_Line(${1});${0}
+
+snippet get Ada.Text_IO.Get
+	Ada.Text_IO.Get(${1});${0}
+
+snippet getl Ada.Text_IO.Get_Line
+	Ada.Text_IO.Get_Line(${1});${0}
+
+snippet newline Ada.Text_IO.New_Line
+	Ada.Text_IO.New_Line(${1:1});${0}
+
+snippet gpl GPL license header
+	-- This program is free software; you can redistribute it and/or modify
+	-- it under the terms of the GNU ${1}General Public License as published by
+	-- the Free Software Foundation; either version ${2:3} of the License, or
+	-- (at your option) any later version.
+	--
+	-- This program is distributed in the hope that it will be useful,
+	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	-- GNU $1General Public License for more details.
+	--
+	-- You should have received a copy of the GNU $1General Public License
+	-- along with this program; if not, see <http://www.gnu.org/licenses/>.
+	--
+	-- Copyright (C) ${3:Author}, ${4:`strftime("%Y")`}
+
+	${0}
+
+snippet gplf GPL file license header
+	-- This file is part of ${1:Program-Name}.
+	--
+	-- $1 is free software: you can redistribute it and/or modify
+	-- it under the terms of the GNU ${2}General Public License as published by
+	-- the Free Software Foundation, either version ${3:3} of the License, or
+	-- (at your option) any later version.
+	-- 
+	-- $1 is distributed in the hope that it will be useful,
+	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	-- GNU $2General Public License for more details.
+	-- 
+	-- You should have received a copy of the GNU $2General Public License
+	-- along with $1. If not, see <http://www.gnu.org/licenses/>.
+	--
+	-- Copyright (C) ${4:Author}, ${5:`strftime("%Y")`}
+
+	${0}
+

From 703657963531fe43b469bcc92c3301c05c867654 Mon Sep 17 00:00:00 2001
From: "xz.zhang" <yazengo@gmail.com>
Date: Tue, 26 Aug 2014 19:52:53 +0800
Subject: [PATCH 0398/1587] add pandoc snippet for UltiSnips

---
 UltiSnips/pandoc.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/UltiSnips/pandoc.snippets b/UltiSnips/pandoc.snippets
index 157c9ef06..5e62e8f79 100644
--- a/UltiSnips/pandoc.snippets
+++ b/UltiSnips/pandoc.snippets
@@ -1,3 +1,13 @@
 priority -49
 
+snippet title "Title Header"
+% ${1:`!v Filename('', 'title')`}
+% ${2:`!v g:snips_author`}
+% ${3:`!v strftime("%d %B %Y")`}
+
+$0
+endsnippet
+
 extends markdown
+
+# vim:ft=snippets:

From 6145a7cd14c343bed2f87456ab3477cb2d300d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Slint=C3=A1k?= <ondrowan@gmail.com>
Date: Tue, 26 Aug 2014 19:35:30 +0200
Subject: [PATCH 0399/1587] Fixed link to vim-addon-manager in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bf8b3346d..e700766f2 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ which is why Marc Weber thinks that it doesn't make sense to repeat the same
 repetitive information everywhere.
 
 *Recommended way:*
-[vim-addon-manager](vim-addon-manager) (because Marc Weber wrote it for exactly
+[vim-addon-manager](https://github.com/MarcWeber/vim-addon-manager) (because Marc Weber wrote it for exactly
 this reason, it supports simple dependency management). Eg you're done by this
 line in your .vimrc:
 

From 6de139f35d7cae5ae2d55586637ea9dc1bac79a3 Mon Sep 17 00:00:00 2001
From: goonnow <goonnow@rocketmail.com>
Date: Wed, 27 Aug 2014 14:47:11 +0700
Subject: [PATCH 0400/1587] Update snippets.

---
 snippets/perl.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index ea4142712..8fb9c8e19 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -349,3 +349,11 @@ snippet debug_trace
 		require Carp; Carp::confess
 	};
 
+snippet dump
+    use Data::Dump qw(dump);
+    warn dump ${1:variable}
+
+snippet subtest
+    subtest '${1: test_name}' => sub {
+        ${2: #body}
+    };

From 474fbee7314335bbb1af687ee0885d4bbaaff204 Mon Sep 17 00:00:00 2001
From: "xz.zhang" <yazengo@gmail.com>
Date: Thu, 28 Aug 2014 15:27:29 +0800
Subject: [PATCH 0401/1587] pull request review

---
 UltiSnips/pandoc.snippets | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/UltiSnips/pandoc.snippets b/UltiSnips/pandoc.snippets
index 5e62e8f79..a12066772 100644
--- a/UltiSnips/pandoc.snippets
+++ b/UltiSnips/pandoc.snippets
@@ -1,6 +1,6 @@
 priority -49
 
-snippet title "Title Header"
+snippet title "Title Header" -b
 % ${1:`!v Filename('', 'title')`}
 % ${2:`!v g:snips_author`}
 % ${3:`!v strftime("%d %B %Y")`}
@@ -9,5 +9,3 @@ $0
 endsnippet
 
 extends markdown
-
-# vim:ft=snippets:

From fdcacb33afcf9e3575ae3c14a7019ed95c894605 Mon Sep 17 00:00:00 2001
From: goonnow <goonnow@rocketmail.com>
Date: Thu, 28 Aug 2014 16:19:41 +0700
Subject: [PATCH 0402/1587] Remove useless placeholder

---
 snippets/perl.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index 8fb9c8e19..6e0cacba6 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -355,5 +355,5 @@ snippet dump
 
 snippet subtest
     subtest '${1: test_name}' => sub {
-        ${2: #body}
+        ${2}
     };

From 4bc54d660238aef369187b52d82f1a9bb065b692 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Thu, 28 Aug 2014 11:48:55 +0200
Subject: [PATCH 0403/1587] Add tex hyperlink snippets.

---
 snippets/tex.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index db328e70b..d48b263c0 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -270,3 +270,13 @@ snippet lst
 	\end{listing}
 snippet lsi
 	\lstinline|${1}| ${0}
+# Hyperlinks
+snippet url
+	\url{${1}} ${0}
+snippet href
+	\href{${1}}{${2}} ${0}
+# URL from Clipboard.
+snippet urlc
+	\url{`@+`} ${0}
+snippet hrefc
+	\href{`@+`}{${1}} ${0}

From 21790c67c92a0e5092491f76d2f6ba84aa93e7d3 Mon Sep 17 00:00:00 2001
From: "xz.zhang" <yazengo@gmail.com>
Date: Fri, 29 Aug 2014 15:45:25 +0800
Subject: [PATCH 0404/1587] correct option

---
 UltiSnips/pandoc.snippets | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/pandoc.snippets b/UltiSnips/pandoc.snippets
index a12066772..25c3b462e 100644
--- a/UltiSnips/pandoc.snippets
+++ b/UltiSnips/pandoc.snippets
@@ -1,11 +1,14 @@
+priority -50
+
+extends markdown
+
+# overwrite if necessary
 priority -49
 
-snippet title "Title Header" -b
+snippet title "Title Header" b
 % ${1:`!v Filename('', 'title')`}
 % ${2:`!v g:snips_author`}
 % ${3:`!v strftime("%d %B %Y")`}
 
 $0
 endsnippet
-
-extends markdown

From ad79a9a612f739b0c13d8b5cb4a179597a3b6969 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Fri, 29 Aug 2014 10:20:57 +0200
Subject: [PATCH 0405/1587] README improvements: md style, typos, fix links.

---
 README.md | 69 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index e700766f2..bc9dd6919 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Snipmate & UltiSnip Snippets
+snipMate & UltiSnip Snippets
 ============================
 
 This repository contains snippets files for various programming languages.
@@ -9,7 +9,7 @@ other improvements already.
 Contents
 --------
 
-- `snippets/*`: snippets using snipmate format
+- `snippets/*`: snippets using snipMate format
 - `UltiSnips/*`: snippets using UltiSnips format
 
 Snippet engines supporting vim-snippets
@@ -28,8 +28,8 @@ snippets by typing the name of a snippet hitting the expansion mapping.
 - [github.com/drmingdrmer/xptemplate](https://github.com/drmingdrmer/xptemplate):
   Totally different syntax, does not read snippets contained in this file, but
   it is also very powerful. It does not support vim-snippets (just listing it
-  here for completness)
- 
+  here for completeness)
+
 There tries to be a more comprehensive list (which still is incomplete) here:
 http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html
 
@@ -45,16 +45,15 @@ If you have VimL only (vim without python support) your best option is using
 [garbas/vim-snipmate](https://github.com/garbas/vim-snipmate) and cope with the
 minor bugs found in the engine.
 
+Q: Should "snipMate be deprecated in favour of UltiSnips"?
 
-Q: Should "snipmate be deprecated in favour of UltiSnips"?
-
-A: No, because snimpate is VimL, and UltiSnips requires Python.
+A: No, because snipMate is VimL, and UltiSnips requires Python.
 Some people want to use snippets without having to install Vim with Python
-support. Yes - this sucks. 
+support. Yes - this sucks.
 
 One solution would be: Use snippets if they are good enough, but allow overriding them
 in UltiSnips. This would avoid most duplication while still serving most users.
-AFAIK there is a nested-placeholder branch for snipmate too. snipmate is still
+AFAIK there is a nested-placeholder branch for snipMate too. snipMate is still
 improved by Adnan Zafar. So maybe time is not ready to make a final decision yet.
 
 [github issue/discussion](https://github.com/honza/vim-snippets/issues/363)
@@ -69,10 +68,10 @@ repetitive information everywhere.
 
 *Recommended way:*
 [vim-addon-manager](https://github.com/MarcWeber/vim-addon-manager) (because Marc Weber wrote it for exactly
-this reason, it supports simple dependency management). Eg you're done by this
-line in your .vimrc:
+this reason, it supports simple dependency management). E.g. you're done by this
+line in your `.vimrc`:
 
-```
+```vim
 " assuming you want to use snipmate snippet engine
 ActivateAddons vim-snippets snipmate
 ```
@@ -80,16 +79,17 @@ ActivateAddons vim-snippets snipmate
 [vim-pi](https://bitbucket.org/vimcommunity/vim-pi/issue/90/we-really-need-a-web-interface)
 Is the place to discuss plugin managers and repository resources.
 
-About how to install snipate see [snipmate@garbas](https://github.com/garbas/vim-snipmate)
+About how to install snipMate see [snipmate@garbas](https://github.com/garbas/vim-snipmate)
 
 (Bundle, Pathogen, git clone - keywords to make people find this link by ctrl-f search)
-I know that I should be reading the docs of the snippet engine, just let me copy paste into my .vimrc:
+I know that I should be reading the docs of the snippet engine, just let me copy paste into my `.vimrc`:
 [See this pull request](https://github.com/honza/vim-snippets/pull/307/files).
 
 TROUBLE
 =======
-If you still have trouble getting this to work create a github ticket, ask on
-irc or the mailinglist.
+
+If you still have trouble getting this to work create a GitHub ticket, ask on
+IRC or the mailing list.
 
 Policies / for contributors
 ---------------------------
@@ -105,7 +105,8 @@ el  : else ..
 wh  : while (cond) ...
 ```
 
-Don't add useless placeholder default texts like
+Don't add useless placeholder default texts like:
+
 ```
 if (${1:condition}){
   ${2:some code here}
@@ -119,7 +120,7 @@ if (${1}){
 }
 ```
 
-Exception: Functions which are used less often, such as Vim's matchall(), matchstr()
+Exception: Functions which are used less often, such as Vim's `matchall()`, `matchstr()`
 functions which case hints may be helpful to remember order. In the VimL case
 get vim-dev plugin which has function completion
 
@@ -140,15 +141,16 @@ on merging should be done (dropping duplicates etc). Also see engines section ab
 
 Related repositories
 --------------------
+
 We also encourage people to maintain sets of snippets for particular use cases
 so that all users can benefit from them.  People can list their snippet repositories here:
 
-     * https://github.com/rbonvall/snipmate-snippets-bib (snippets for BibTeX files)
-     * https://github.com/sudar/vim-arduino-snippets (snippets for Arduino files)
-     * https://github.com/zedr/zope-snipmate-bundle.git (snippets for Python, TAL and ZCML)
-     * https://github.com/bonsaiben/bootstrap-snippets (snippets for Twitter Bootstrap markup, in HTML and Haml)
+* https://github.com/rbonvall/snipmate-snippets-bib (snippets for BibTeX files)
+* https://github.com/sudar/vim-arduino-snippets (snippets for Arduino files)
+* https://github.com/zedr/zope-snipmate-bundle.git (snippets for Python, TAL and ZCML)
+* https://github.com/bonsaiben/bootstrap-snippets (snippets for Twitter Bootstrap markup, in HTML and Haml)
 
-Installation using VAM: "github:rbonvall/snipmate-snippets-bib"
+Installation using VAM: https://github.com/MarcWeber/vim-addon-manager
 
 Future - ideas - examples
 -------------------------
@@ -156,7 +158,6 @@ Future - ideas - examples
 [overview snippet engines](http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html)
 If you have ideas you can add them to that list of "snippet engine features by example".
 
-
 Historical notes
 ----------------
 
@@ -166,15 +167,15 @@ unfortunately abandoned the project. [Rok Garbas][3] is now maintaining a
 
 Versions / dialects / ..
 ========================
+
 There are some issues, such as newer language versions may require other
 snippets than older. If this exists we currently recommend doing this:
 
-add snippets/ruby.snippets (common snippets)
-add snippets/ruby-1.8.snippets (1.8 only)
-add snippets/ruby-1.9.snippets (1.9 only)
-
-then configure github.com/garbas/vim-snipmate this way:
+* add snippets/ruby.snippets (common snippets)
+* add snippets/ruby-1.8.snippets (1.8 only)
+* add snippets/ruby-1.9.snippets (1.9 only)
 
+then configure https://github.com/garbas/vim-snipmate this way:
 
 ```vim
 let g:snipMate = {}
@@ -183,17 +184,18 @@ let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails,ruby-1.9'
 ```
 
 If it happens that you work on a project requiring ruby-1.8 snippets instead,
-consider using vim-addon-local-vimrc and override the filetypes.
+consider using `vim-addon-local-vimrc` and override the filetypes.
 
 Well - of course it may not make sense to create a new file for each
 ruby-library-version triplet. Sometimes postfixing a name such as
 
-    migrate_lib_20_down
-    migrate_lib_20_up
+```
+migrate_lib_20_down
+migrate_lib_20_up
+```
 
 will do it then if syntax has changed.
 
-
 Language maintainers
 --------------------
 
@@ -219,7 +221,6 @@ License
 Just as the original snipMate plugin, all the snippets are licensed under the
 terms of the MIT license.
 
-
 [1]: http://github.com/garbas/vim-snipmate
 [2]: http://github.com/msanders
 [3]: http://github.com/garbas

From 285d7819793f2f4d8cb126950914c011fd09cc5c Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Fri, 29 Aug 2014 13:31:14 +0200
Subject: [PATCH 0406/1587] Rename node p to pipe.

Otherwise, conflicts with p for paragraph in html with default settings.
---
 snippets/javascript/javascript.node.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.node.snippets b/snippets/javascript/javascript.node.snippets
index 4a4295948..9e7508771 100644
--- a/snippets/javascript/javascript.node.snippets
+++ b/snippets/javascript/javascript.node.snippets
@@ -29,7 +29,7 @@ snippet net
 		});
 	}).listen(${4:8124});
 # Stream snippets
-snippet p
+snippet pipe
 	pipe(${1:stream})${2}
 # Express snippets
 snippet eget

From bc75e48a73a12f0432358d1b549994d31fbfee90 Mon Sep 17 00:00:00 2001
From: Filipe Giusti <filipegiusti@gmail.com>
Date: Fri, 29 Aug 2014 17:44:54 -0300
Subject: [PATCH 0407/1587] Add <th> in html

---
 UltiSnips/html.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 5746feb65..fee451f97 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -253,6 +253,10 @@ snippet td "table cell" w
 <td>$0</td>
 endsnippet
 
+snippet th "table header" w
+<th>$0</th>
+endsnippet
+
 snippet tr "table row" w
 <tr>$0</tr>
 endsnippet

From c2ba253951e424b7c62e684ca7a663d7039f5cda Mon Sep 17 00:00:00 2001
From: Felix Jung <felix@jung.fm>
Date: Sat, 30 Aug 2014 12:35:07 +0200
Subject: [PATCH 0408/1587] Fixes and CSS support

- Removed regular expressions since they break YCM previews
- Extends the CSS snippets so you can use CSS snippets in Sass
---
 UltiSnips/scss.snippets | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/UltiSnips/scss.snippets b/UltiSnips/scss.snippets
index 70a44a076..f21428474 100644
--- a/UltiSnips/scss.snippets
+++ b/UltiSnips/scss.snippets
@@ -1,54 +1,56 @@
+extends css
+
 priority -50
 
-snippet /@?imp/ "@import '...';" br
+snippet imp "@import '...';" b
 @import '${1:file}';
 endsnippet
 
-snippet /@?inc/ "@include mixin(...);" br
+snippet inc "@include mixin(...);" b
 @include ${1:mixin}(${2:arguments});
 endsnippet
 
-snippet /@?ext?/ "@extend %placeholder;" br
+snippet ext "@extend %placeholder;" b
 @extend %${1:placeholder};
 endsnippet
 
-snippet /@?mixin/ "@mixin (...) { ... }" br
+snippet mixin "@mixin (...) { ... }" b
 @mixin ${1:name}(${2:arguments}) {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /@?fun/ "@function (...) { ... }" br
+snippet fun "@function (...) { ... }" b
 @function ${1:name}(${2:arguments}) {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /@?if/ "@if (...) { ... }" br
+snippet if "@if (...) { ... }" b
 @if ${1:condition} {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /(} )?@?else/ "@else { ... }" br
+snippet else "@else { ... }" b
 @else ${1:condition} {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /@?for/ "@for loop" br
+snippet for "@for loop" b
 @for ${1:$i} from ${2:1} through ${3:3} {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /@?each/ "@each loop" br
+snippet each "@each loop" b
 @each ${1:$item} in ${2:item, item, item} {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet /@?while/ "@while loop" br
+snippet while "@while loop" b
 @while ${1:$i} ${2:>} ${3:0} {
 	${VISUAL}$0
 }

From ae27f37aca0e343c5c7efa90c860b0ea5ea52e82 Mon Sep 17 00:00:00 2001
From: Vincent Hsu <vimhsu@gmail.com>
Date: Mon, 1 Sep 2014 19:06:33 +0800
Subject: [PATCH 0409/1587] Correct the indentation of the
 javascript-requirejs.snippets

Will have error without tabs.
---
 .../javascript/javascript-requirejs.snippets   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/snippets/javascript/javascript-requirejs.snippets b/snippets/javascript/javascript-requirejs.snippets
index c8aab757e..8e72ada6c 100644
--- a/snippets/javascript/javascript-requirejs.snippets
+++ b/snippets/javascript/javascript-requirejs.snippets
@@ -1,14 +1,14 @@
 snippet def
-  define(["${1:#dependencies1}"], function (${2:#dependencies2}) {
-    return ${0:TARGET};
-  });
+	define(["${1:#dependencies1}"], function (${2:#dependencies2}) {
+		return ${0:TARGET};
+	});
 
 snippet defn
-  define("${1:#name}", ["${2:#dependencies1}"], function (${3:#dependencies2}) {
-    return ${0:TARGET};
-  });
+	define("${1:#name}", ["${2:#dependencies1}"], function (${3:#dependencies2}) {
+		return ${0:TARGET};
+	});
 
 snippet reqjs
-  require(["${1:#dependencies1}"], function (${2:#dependencies2}) {
-    return ${0:TARGET};
-  });
+	require(["${1:#dependencies1}"], function (${2:#dependencies2}) {
+		return ${0:TARGET};
+	});

From 2f5af90bc7d7d25a2bffd8dcb4ab918827121f53 Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Tue, 2 Sep 2014 20:37:58 +0200
Subject: [PATCH 0410/1587] Update rust snippets

---
 UltiSnips/rust.snippets | 14 +++++++-------
 snippets/rust.snippets  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index d7f0047c0..82a1abb8a 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -73,7 +73,7 @@ endsnippet
 
 snippet ecl "...extern crate log;" b
 #![feature(phase)]
-#[phase(syntax, link)] extern crate log;
+#[phase(plugin, link)] extern crate log;
 endsnippet
 
 snippet mod	 "A module" b
@@ -83,16 +83,16 @@ mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
 endsnippet
 
 snippet crate "Create header information" b
-// Crate ID
-#![crate_id = "${1:crate_name}#${2:0.0.1}"]
+// Crate name
+#![crate_name = "${1:crate_name}"]
 
 // Additional metadata attributes
-#![desc = "${3:Descrption.}"]
-#![license = "${4:BSD}"]
-#![comment = "${5:Comment.}"]
+#![desc = "${2:Descrption.}"]
+#![license = "${3:BSD}"]
+#![comment = "${4:Comment.}"]
 
 // Specify the output type
-#![crate_type = "${6:lib}"]
+#![crate_type = "${5:lib}"]
 endsnippet
 
 snippet allow "#[allow(..)]" b
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index d4b9264d9..f135eb587 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -34,20 +34,20 @@ snippet ec
 	extern crate ${1:sync};
 snippet ecl
 	#![feature(phase)]
-	#[phase(syntax, link)] extern crate log;
+	#[phase(plugin, link)] extern crate log;
 snippet mod
 	mod ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	} /* $1 */
 snippet crate
-	// Crate ID
-	#![crate_id = "${1:crate_name}#${2:0.0.1}"]
+	// Crate name
+	#![crate_name = "${1:crate_name}"]
 	// Additional metadata attributes
-	#![desc = "${3:Descrption.}"]
-	#![license = "${4:BSD}"]
-	#![comment = "${5:Comment.}"]
+	#![desc = "${2:Descrption.}"]
+	#![license = "${3:BSD}"]
+	#![comment = "${4:Comment.}"]
 	// Specify the output type
-	#![crate_type = "${6:lib}"]
+	#![crate_type = "${5:lib}"]
 snippet allow
 	#[allow(${1:unused_variable})]
 snippet feat

From 8ab05aaa9f1d99f511246e8cb3eccc446f72b0b2 Mon Sep 17 00:00:00 2001
From: "xz.zhang" <yazengo@gmail.com>
Date: Thu, 4 Sep 2014 09:03:28 +0800
Subject: [PATCH 0411/1587] remove priority in the first line

---
 UltiSnips/pandoc.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/UltiSnips/pandoc.snippets b/UltiSnips/pandoc.snippets
index 25c3b462e..ad165c564 100644
--- a/UltiSnips/pandoc.snippets
+++ b/UltiSnips/pandoc.snippets
@@ -1,5 +1,3 @@
-priority -50
-
 extends markdown
 
 # overwrite if necessary

From e0b428f1914ba593220fbe26f1cfdf9efd8d1b58 Mon Sep 17 00:00:00 2001
From: Procras <lujing.zui@gmail.com>
Date: Fri, 5 Sep 2014 10:58:09 +0800
Subject: [PATCH 0412/1587] remove last blank line for ONCE snippet

---
 UltiSnips/c.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index e6ea2f9d2..618bfe3d8 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -77,7 +77,6 @@ else:
 ${VISUAL}${0}
 
 #endif /* end of include guard: $1 */
-
 endsnippet
 
 snippet td "Typedef"

From 89f8fa6ba9c1fd279d0fe3af0e72b071975850a4 Mon Sep 17 00:00:00 2001
From: Bernhard Graf <augensalat@gmail.com>
Date: Sun, 7 Sep 2014 14:44:32 +0200
Subject: [PATCH 0413/1587] Bug fix: replace space indention by tab

---
 snippets/perl.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index 6e0cacba6..65120a25d 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -350,10 +350,10 @@ snippet debug_trace
 	};
 
 snippet dump
-    use Data::Dump qw(dump);
-    warn dump ${1:variable}
+	use Data::Dump qw(dump);
+	warn dump ${1:variable}
 
 snippet subtest
-    subtest '${1: test_name}' => sub {
-        ${2}
-    };
+	subtest '${1: test_name}' => sub {
+		${2}
+	};

From 04b34330ee524a26b4c4aa567abb78446c0b52c1 Mon Sep 17 00:00:00 2001
From: Bernhard Graf <augensalat@gmail.com>
Date: Sun, 7 Sep 2014 15:05:37 +0200
Subject: [PATCH 0414/1587] add snippet for until

---
 UltiSnips/perl.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/UltiSnips/perl.snippets b/UltiSnips/perl.snippets
index abaae3f5a..67c7f278d 100644
--- a/UltiSnips/perl.snippets
+++ b/UltiSnips/perl.snippets
@@ -129,4 +129,11 @@ while ($1) {
 
 endsnippet
 
+snippet until "until"
+until ($1) {
+	${2:# body...}
+}
+
+endsnippet
+
 # vim:ft=snippets:

From 56826e4ed6e44a35d04b7c2606006fa49f88de78 Mon Sep 17 00:00:00 2001
From: Mike Foley <mike@polleverywhere.com>
Date: Mon, 8 Sep 2014 14:55:41 -0700
Subject: [PATCH 0415/1587] Add alias_method_chain Ruby snippet

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index fd4172c10..dce18616e 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -209,6 +209,8 @@ snippet defds
 	def_delegators :${1:@del_obj}, :${0:del_methods}
 snippet am
 	alias_method :${1:new_name}, :${0:old_name}
+snippet amc
+	alias_method_chain :${1:name}, :${0:feature}
 snippet app
 	if __FILE__ == $PROGRAM_NAME
 		${0}

From ea32c91de2dd2d2915697951b5fd368e395ac73e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez=20de=20Dios?=
 <deivid.rodriguez@gmail.com>
Date: Tue, 9 Sep 2014 11:45:38 +0200
Subject: [PATCH 0416/1587] Snippets for latests debuggers

---
 snippets/ruby.snippets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index dce18616e..6795653da 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -592,7 +592,11 @@ snippet begin
 
 #debugging
 snippet debug
-	require 'ruby-debug'; debugger; true;
+	require 'byebug'; byebug
+snippet debug19
+	require 'debugger'; debugger
+snippet debug18
+	require 'ruby-debug'; debugger
 snippet pry
 	require 'pry'; binding.pry
 snippet strf

From 314346114854b3728aa0a899c12d3c6890067b2b Mon Sep 17 00:00:00 2001
From: Mike Foley <mike@polleverywhere.com>
Date: Tue, 9 Sep 2014 08:44:36 -0700
Subject: [PATCH 0417/1587] Change variable name in Ruby alias_method_chain

`method_name` is more clear than `name`, and follows the style of the
other snippets.
---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index dce18616e..ba761fd7f 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -210,7 +210,7 @@ snippet defds
 snippet am
 	alias_method :${1:new_name}, :${0:old_name}
 snippet amc
-	alias_method_chain :${1:name}, :${0:feature}
+	alias_method_chain :${1:method_name}, :${0:feature}
 snippet app
 	if __FILE__ == $PROGRAM_NAME
 		${0}

From ef63e32d616ac0621238e02b598c845334ce00b3 Mon Sep 17 00:00:00 2001
From: Mike Foley <mike@polleverywhere.com>
Date: Tue, 9 Sep 2014 09:23:23 -0700
Subject: [PATCH 0418/1587] Move alias_method_chain from Ruby to Rails snippets

It's technically part of Rails ActiveSupport, not base Ruby
---
 snippets/rails.snippets | 2 ++
 snippets/ruby.snippets  | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index d8fe2be24..3a72bfde0 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -109,6 +109,8 @@ snippet dele delegate .. to
 	delegate :${1:methods}, to: :${0:object}
 snippet dele delegate .. to .. prefix .. allow_nil
 	delegate :${1:methods}, to: :${2:object}, prefix: :${3:prefix}, allow_nil: ${0:allow_nil}
+snippet amc
+	alias_method_chain :${1:method_name}, :${0:feature}
 snippet flash
 	flash[:${1:notice}] = '${0}'
 snippet habtm
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index ba761fd7f..fd4172c10 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -209,8 +209,6 @@ snippet defds
 	def_delegators :${1:@del_obj}, :${0:del_methods}
 snippet am
 	alias_method :${1:new_name}, :${0:old_name}
-snippet amc
-	alias_method_chain :${1:method_name}, :${0:feature}
 snippet app
 	if __FILE__ == $PROGRAM_NAME
 		${0}

From 3a480314cc2595171175705c0203cbccd075f617 Mon Sep 17 00:00:00 2001
From: Leonardo B <leonardo@diptongonante.com>
Date: Wed, 10 Sep 2014 09:33:47 -0500
Subject: [PATCH 0419/1587] Fix indentation

---
 snippets/coffee/requirejs_coffee.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/snippets/coffee/requirejs_coffee.snippets b/snippets/coffee/requirejs_coffee.snippets
index 4130b5e51..6dfe1796e 100644
--- a/snippets/coffee/requirejs_coffee.snippets
+++ b/snippets/coffee/requirejs_coffee.snippets
@@ -1,11 +1,11 @@
 snippet def
-  define ["${1:#dependencies1}"], (${2:#dependencies2}) ->
-    ${0:TARGET}
+	define ["${1:#dependencies1}"], (${2:#dependencies2}) ->
+		${0:TARGET}
 
 snippet defn
-  define "${1:#name}", ["${2:#dependencies1}"], (${3:#dependencies2}) ->
-    ${0:TARGET}
+	define "${1:#name}", ["${2:#dependencies1}"], (${3:#dependencies2}) ->
+		${0:TARGET}
 
 snippet reqjs
-  require ["${1:#dependencies1}"], (${2:#dependencies2}) ->
-    ${0:TARGET}
+	require ["${1:#dependencies1}"], (${2:#dependencies2}) ->
+		${0:TARGET}

From 5035531ca89023e57cf6e11fc2745af5592a8542 Mon Sep 17 00:00:00 2001
From: ToruIwashita <toru.iwashita@pixta.co.jp>
Date: Thu, 11 Sep 2014 13:48:54 +0900
Subject: [PATCH 0420/1587] Changed zsh snippet for function

---
 snippets/zsh.snippets | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/snippets/zsh.snippets b/snippets/zsh.snippets
index 04577a968..fc1c8374a 100644
--- a/snippets/zsh.snippets
+++ b/snippets/zsh.snippets
@@ -13,14 +13,14 @@ snippet ife
 		${0:# statements}
 	fi
 snippet eif
-	elif ${1:condition} ; then
+	elif ${1:condition}; then
 		${0:# statements}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
 		${0:# statements}
 	done
 snippet fori
-	for ${1:needle} in ${2:haystack} ; do
+	for ${1:needle} in ${2:haystack}; do
 		${0:#statements}
 	done
 snippet fore
@@ -57,6 +57,10 @@ snippet [
 snippet always
 	{ ${1:try} } always { ${0:always} }
 snippet fun
-	function ${1:name} (${2:args}) {
-		${0:# body}
+	${1:function_name}() {
+		${0:# function_body}
+	}
+snippet ffun
+	function ${1:function_name}() {
+		${0:# function_body}
 	}

From ace1d94dd86ee7dd55b1af57e81c40baef62507d Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Thu, 11 Sep 2014 13:58:01 +0200
Subject: [PATCH 0421/1587] php :: fix do{}while snippet typo, does not end on"

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 UltiSnips/php.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index bdefbbbfb..79e38d6b5 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -14,7 +14,7 @@ endsnippet
 snippet do "do"
 do {
 	${2:// code... }
-} while (${1:/* condition */});"
+} while (${1:/* condition */});
 endsnippet
 
 snippet doc_f "doc_f"

From 9665df2022fe46274a45923703faabf108f03d66 Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Thu, 11 Sep 2014 14:06:36 +0200
Subject: [PATCH 0422/1587] php :: add elseif

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 UltiSnips/php.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index bdefbbbfb..e35d59623 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -67,6 +67,12 @@ if (${1:/* condition */}) {
 }
 endsnippet
 
+snippet elif "elseif"
+elseif (${1:/* condition */}) {
+	${2:// code...}
+}
+endsnippet
+
 snippet inc "inc"
 include '${1:file}';${2}
 endsnippet

From ffcd8b8e2a1900aebf5ecd4f21936d0052954fa5 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 12 Sep 2014 16:56:36 +0100
Subject: [PATCH 0423/1587] Remove useless placeholder text from JS functions

---
 snippets/javascript/javascript.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index f4ef351b8..da6038148 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -1,12 +1,12 @@
 # prototype
 snippet proto
-	${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {
-		${0:// body...}
+	${1}.prototype.${2} = function(${3}) {
+		${0}
 	};
 # Function
 snippet fun
-	function ${1:function_name}(${2:argument}) {
-		${0:// body...}
+	function ${1}(${2}) {
+		${0}
 	}
 # Anonymous Function
 snippet f

From 6448deadba0d0b581840adf352a253ab285a578e Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 12 Sep 2014 17:12:00 +0100
Subject: [PATCH 0424/1587] Add JS function assigned to variable snippet

---
 snippets/javascript/javascript.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index f4ef351b8..89e18d9d3 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -13,6 +13,11 @@ snippet f
 	function(${1}) {
 		${0}
 	}
+# Function assigned to variable
+snippet vf
+	var ${1} = function ${1}(${2}) {
+		${0}
+	}
 # Immediate function
 snippet (f
 	(function(${1}) {

From 00c1711fb6a7dbed299f2d99ae0ae1421e7f165d Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 15 Sep 2014 12:52:04 +0100
Subject: [PATCH 0425/1587] Add missing semicolon to js vf

---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 89e18d9d3..4e4665818 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -17,7 +17,7 @@ snippet f
 snippet vf
 	var ${1} = function ${1}(${2}) {
 		${0}
-	}
+	};
 # Immediate function
 snippet (f
 	(function(${1}) {

From 5aad7a446791c668e3afa3c08841884d126229d8 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <lpil@users.noreply.github.com>
Date: Tue, 16 Sep 2014 09:24:10 +0100
Subject: [PATCH 0426/1587] Correct js vf ${1} snippet syntax error

Use of ${1} twice rather than ${1} followed by $1 caused vim-snipmate to skip this field.
---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 4e4665818..0eb26cbde 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -15,7 +15,7 @@ snippet f
 	}
 # Function assigned to variable
 snippet vf
-	var ${1} = function ${1}(${2}) {
+	var ${1:function_name} = function $1(${2}) {
 		${0}
 	};
 # Immediate function

From 6a4cadf1598ff01f7b951b03ae7375260a1f1530 Mon Sep 17 00:00:00 2001
From: Tony <ikibits@gmail.com>
Date: Thu, 3 Jul 2014 23:08:39 -0500
Subject: [PATCH 0427/1587] Adapt css.snippet and add features for stylus

---
 snippets/stylus.snippets | 991 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 991 insertions(+)
 create mode 100644 snippets/stylus.snippets

diff --git a/snippets/stylus.snippets b/snippets/stylus.snippets
new file mode 100644
index 000000000..45bb458ef
--- /dev/null
+++ b/snippets/stylus.snippets
@@ -0,0 +1,991 @@
+snippet !
+    !important
+snippet bdi:m+
+    -moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:m
+    -moz-border-image ${0}
+snippet bdrz:m
+    -moz-border-radius ${0}
+snippet bxsh:m+
+  -moz-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+snippet bxsh:m
+    -moz-box-shadow ${0}
+snippet bdi:w+
+    -webkit-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:w
+    -webkit-border-image ${0}
+snippet bdrz:w
+    -webkit-border-radius ${0}
+snippet bxsh:w+
+    -webkit-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+snippet bxsh:w
+    -webkit-box-shadow ${0}
+snippet @f
+    @font-face ${0}
+snippet @i
+    @import '${0}'
+snippet @r
+    @require '${0}'
+snippet @m
+    @media ${1:screen}
+snippet @ext
+    @extend .${1}
+    ${0}
+snippet bg+
+    background ${1} url(${2}) ${3:0} ${4:0} ${0:no-repeat}
+snippet bga
+    background-attachment ${0}
+snippet bga:f
+    background-attachment fixed
+snippet bga:s
+    background-attachment scroll
+snippet bgbk
+    background-break ${0}
+snippet bgbk:bb
+    background-break bounding-box
+snippet bgbk:c
+    background-break continuous
+snippet bgbk:eb
+    background-break each-box
+snippet bgcp
+    background-clip ${0}
+snippet bgcp:bb
+    background-clip border-box
+snippet bgcp:cb
+    background-clip content-box
+snippet bgcp:nc
+    background-clip no-clip
+snippet bgcp:pb
+    background-clip padding-box
+snippet bgc
+    background-color ${0}
+snippet bgc:t
+    background-color transparent
+snippet bgi
+    background-image url(${0})
+snippet bgi:n
+    background-image none
+snippet bgo
+    background-origin ${0}
+snippet bgo:bb
+    background-origin border-box
+snippet bgo:cb
+    background-origin content-box
+snippet bgo:pb
+    background-origin padding-box
+snippet bgpx
+    background-position-x ${0}
+snippet bgpy
+    background-position-y ${0}
+snippet bgp
+    background-position ${1:0} ${0:0}
+snippet bgr
+    background-repeat ${0}
+snippet bgr:n
+    background-repeat no-repeat
+snippet bgr:x
+    background-repeat repeat-x
+snippet bgr:y
+    background-repeat repeat-y
+snippet bgr:r
+    background-repeat repeat
+snippet bgz
+    background-size ${0}
+snippet bgz:a
+    background-size auto
+snippet bgz:ct
+    background-size contain
+snippet bgz:cv
+    background-size cover
+snippet bg
+    background ${0}
+snippet bg:ie
+    filter progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
+snippet bg:n
+    background none
+snippet bd+
+    border ${1:1px} ${2:solid} ${0}
+snippet bdb+
+    border-bottom ${1:1px} ${2:solid} ${0}
+snippet bdbc
+    border-bottom-color ${0}
+snippet bdbi
+    border-bottom-image url(${0})
+snippet bdbi:n
+    border-bottom-image none
+snippet bdbli
+    border-bottom-left-image url(${0})
+snippet bdbli:c
+    border-bottom-left-image continue
+snippet bdbli:n
+    border-bottom-left-image none
+snippet bdblrz
+    border-bottom-left-radius ${0}
+snippet bdbri
+    border-bottom-right-image url(${0})
+snippet bdbri:c
+    border-bottom-right-image continue
+snippet bdbri:n
+    border-bottom-right-image none
+snippet bdbrrz
+    border-bottom-right-radius ${0}
+snippet bdbs
+    border-bottom-style ${0}
+snippet bdbs:n
+    border-bottom-style none
+snippet bdbw
+    border-bottom-width ${0}
+snippet bdb
+    border-bottom ${0}
+snippet bdb:n
+    border-bottom none
+snippet bdbk
+    border-break ${0}
+snippet bdbk:c
+    border-break close
+snippet bdcl
+    border-collapse ${0}
+snippet bdcl:c
+    border-collapse collapse
+snippet bdcl:s
+    border-collapse separate
+snippet bdc
+    border-color ${0}
+snippet bdci
+    border-corner-image url(${0})
+snippet bdci:c
+    border-corner-image continue
+snippet bdci:n
+    border-corner-image none
+snippet bdf
+    border-fit ${0}
+snippet bdf:c
+    border-fit clip
+snippet bdf:of
+    border-fit overwrite
+snippet bdf:ow
+    border-fit overwrite
+snippet bdf:r
+    border-fit repeat
+snippet bdf:sc
+    border-fit scale
+snippet bdf:sp
+    border-fit space
+snippet bdf:st
+    border-fit stretch
+snippet bdi
+    border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:n
+    border-image none
+snippet bdl+
+    border-left ${1:1px} ${2:solid} ${0}
+snippet bdlc
+    border-left-color ${0}
+snippet bdli
+    border-left-image url(${0})
+snippet bdli:n
+    border-left-image none
+snippet bdls
+    border-left-style ${0}
+snippet bdls:n
+    border-left-style none
+snippet bdlw
+    border-left-width ${0}
+snippet bdl
+    border-left ${0}
+snippet bdl:n
+    border-left none
+snippet bdlt
+    border-length ${0}
+snippet bdlt:a
+    border-length auto
+snippet bdrz
+    border-radius ${0}
+snippet bdr+
+    border-right ${1:1px} ${2:solid} ${0}
+snippet bdrc
+    border-right-color ${0}
+snippet bdri
+    border-right-image url(${0})
+snippet bdri:n
+    border-right-image none
+snippet bdrs
+    border-right-style ${0}
+snippet bdrs:n
+    border-right-style none
+snippet bdrw
+    border-right-width ${0}
+snippet bdr
+    border-right ${0}
+snippet bdr:n
+    border-right none
+snippet bdsp
+    border-spacing ${0}
+snippet bds
+    border-style ${0}
+snippet bds:ds
+    border-style dashed
+snippet bds:dtds
+    border-style dot-dash
+snippet bds:dtdtds
+    border-style dot-dot-dash
+snippet bds:dt
+    border-style dotted
+snippet bds:db
+    border-style double
+snippet bds:g
+    border-style groove
+snippet bds:h
+    border-style hidden
+snippet bds:i
+    border-style inset
+snippet bds:n
+    border-style none
+snippet bds:o
+    border-style outset
+snippet bds:r
+    border-style ridge
+snippet bds:s
+    border-style solid
+snippet bds:w
+    border-style wave
+snippet bdt+
+    border-top ${1:1px} ${2:solid} ${0}
+snippet bdtc
+    border-top-color ${0}
+snippet bdti
+    border-top-image url(${0})
+snippet bdti:n
+    border-top-image none
+snippet bdtli
+    border-top-left-image url(${0})
+snippet bdtli:c
+    border-corner-image continue
+snippet bdtli:n
+    border-corner-image none
+snippet bdtlrz
+    border-top-left-radius ${0}
+snippet bdtri
+    border-top-right-image url(${0})
+snippet bdtri:c
+    border-top-right-image continue
+snippet bdtri:n
+    border-top-right-image none
+snippet bdtrrz
+    border-top-right-radius ${0}
+snippet bdts
+    border-top-style ${0}
+snippet bdts:n
+    border-top-style none
+snippet bdtw
+    border-top-width ${0}
+snippet bdt
+    border-top ${0}
+snippet bdt:n
+    border-top none
+snippet bdw
+    border-width ${0}
+snippet bd
+    border ${0}
+snippet bd:n
+    border none
+snippet b
+    bottom ${0}
+snippet b:a
+    bottom auto
+snippet bxsh+
+    box-shadow ${1:0} ${2:0} ${3:0} ${0}
+snippet bxsh
+    box-shadow ${0}
+snippet bxsh:n
+    box-shadow none
+snippet bxz
+    box-sizing ${0}
+snippet bxz:bb
+    box-sizing border-box
+snippet bxz:cb
+    box-sizing content-box
+snippet cps
+    caption-side ${0}
+snippet cps:b
+    caption-side bottom
+snippet cps:t
+    caption-side top
+snippet cl
+    clear ${0}
+snippet cl:b
+    clear both
+snippet cl:l
+    clear left
+snippet cl:n
+    clear none
+snippet cl:r
+    clear right
+snippet cp
+    clip ${0}
+snippet cp:a
+    clip auto
+snippet cp:r
+    clip rect(${1:0} ${2:0} ${3:0} ${0:0})
+snippet c
+    color ${0}
+snippet ct
+    content ${0}
+snippet ct:a
+    content attr(${0})
+snippet ct:cq
+    content close-quote
+snippet ct:c
+    content counter(${0})
+snippet ct:cs
+    content counters(${0})
+snippet ct:ncq
+    content no-close-quote
+snippet ct:noq
+    content no-open-quote
+snippet ct:n
+    content normal
+snippet ct:oq
+    content open-quote
+snippet coi
+    counter-increment ${0}
+snippet cor
+    counter-reset ${0}
+snippet cur
+    cursor ${0}
+snippet cur:a
+    cursor auto
+snippet cur:c
+    cursor crosshair
+snippet cur:d
+    cursor default
+snippet cur:ha
+    cursor hand
+snippet cur:he
+    cursor help
+snippet cur:m
+    cursor move
+snippet cur:p
+    cursor pointer
+snippet cur:t
+    cursor text
+snippet d
+    display ${0}
+snippet d:mib
+    display -moz-inline-box
+snippet d:mis
+    display -moz-inline-stack
+snippet d:b
+    display block
+snippet d:cp
+    display compact
+snippet d:ib
+    display inline-block
+snippet d:itb
+    display inline-table
+snippet d:i
+    display inline
+snippet d:li
+    display list-item
+snippet d:n
+    display none
+snippet d:ri
+    display run-in
+snippet d:tbcp
+    display table-caption
+snippet d:tbc
+    display table-cell
+snippet d:tbclg
+    display table-column-group
+snippet d:tbcl
+    display table-column
+snippet d:tbfg
+    display table-footer-group
+snippet d:tbhg
+    display table-header-group
+snippet d:tbrg
+    display table-row-group
+snippet d:tbr
+    display table-row
+snippet d:tb
+    display table
+snippet ec
+    empty-cells ${0}
+snippet ec:h
+    empty-cells hide
+snippet ec:s
+    empty-cells show
+snippet exp
+    expression()
+snippet fl
+    float ${0}
+snippet fl:l
+    float left
+snippet fl:n
+    float none
+snippet fl:r
+    float right
+snippet f+
+    font ${1:1em} ${2:Arial},${0:sans-serif}
+snippet fef
+    font-effect ${0}
+snippet fef:eb
+    font-effect emboss
+snippet fef:eg
+    font-effect engrave
+snippet fef:n
+    font-effect none
+snippet fef:o
+    font-effect outline
+snippet femp
+    font-emphasize-position ${0}
+snippet femp:a
+    font-emphasize-position after
+snippet femp:b
+    font-emphasize-position before
+snippet fems
+    font-emphasize-style ${0}
+snippet fems:ac
+    font-emphasize-style accent
+snippet fems:c
+    font-emphasize-style circle
+snippet fems:ds
+    font-emphasize-style disc
+snippet fems:dt
+    font-emphasize-style dot
+snippet fems:n
+    font-emphasize-style none
+snippet fem
+    font-emphasize ${0}
+snippet ff
+    font-family ${0}
+snippet ff:c
+    font-family ${0:'Monotype Corsiva','Comic Sans MS'},cursive
+snippet ff:f
+    font-family ${0:Capitals,Impact},fantasy
+snippet ff:m
+    font-family ${0:Monaco,'Courier New'},monospace
+snippet ff:ss
+    font-family ${0:Helvetica,Arial},sans-serif
+snippet ff:s
+    font-family ${0:Georgia,'Times New Roman'},serif
+snippet fza
+    font-size-adjust ${0}
+snippet fza:n
+    font-size-adjust none
+snippet fz
+    font-size ${0}
+snippet fsm
+    font-smooth ${0}
+snippet fsm:aw
+    font-smooth always
+snippet fsm:a
+    font-smooth auto
+snippet fsm:n
+    font-smooth never
+snippet fst
+    font-stretch ${0}
+snippet fst:c
+    font-stretch condensed
+snippet fst:e
+    font-stretch expanded
+snippet fst:ec
+    font-stretch extra-condensed
+snippet fst:ee
+    font-stretch extra-expanded
+snippet fst:n
+    font-stretch normal
+snippet fst:sc
+    font-stretch semi-condensed
+snippet fst:se
+    font-stretch semi-expanded
+snippet fst:uc
+    font-stretch ultra-condensed
+snippet fst:ue
+    font-stretch ultra-expanded
+snippet fs
+    font-style ${0}
+snippet fs:i
+    font-style italic
+snippet fs:n
+    font-style normal
+snippet fs:o
+    font-style oblique
+snippet fv
+    font-variant ${0}
+snippet fv:n
+    font-variant normal
+snippet fv:sc
+    font-variant small-caps
+snippet fw
+    font-weight ${0}
+snippet fw:b
+    font-weight bold
+snippet fw:br
+    font-weight bolder
+snippet fw:lr
+    font-weight lighter
+snippet fw:n
+    font-weight normal
+snippet f
+    font ${0}
+snippet h
+    height ${0}
+snippet h:a
+    height auto
+snippet l
+    left ${0}
+snippet l:a
+    left auto
+snippet lts
+    letter-spacing ${0}
+snippet lh
+    line-height ${0}
+snippet lisi
+    list-style-image url(${0})
+snippet lisi:n
+    list-style-image none
+snippet lisp
+    list-style-position ${0}
+snippet lisp:i
+    list-style-position inside
+snippet lisp:o
+    list-style-position outside
+snippet list
+    list-style-type ${0}
+snippet list:c
+    list-style-type circle
+snippet list:dclz
+    list-style-type decimal-leading-zero
+snippet list:dc
+    list-style-type decimal
+snippet list:d
+    list-style-type disc
+snippet list:lr
+    list-style-type lower-roman
+snippet list:n
+    list-style-type none
+snippet list:s
+    list-style-type square
+snippet list:ur
+    list-style-type upper-roman
+snippet lis
+    list-style ${0}
+snippet lis:n
+    list-style none
+snippet mb
+    margin-bottom ${0}
+snippet mb:a
+    margin-bottom auto
+snippet ml
+    margin-left ${0}
+snippet ml:a
+    margin-left auto
+snippet mr
+    margin-right ${0}
+snippet mr:a
+    margin-right auto
+snippet mt
+    margin-top ${0}
+snippet mt:a
+    margin-top auto
+snippet m
+    margin ${0}
+snippet m:4
+    margin ${1:0} ${2:0} ${3:0} ${0:0}
+snippet m:3
+    margin ${1:0} ${2:0} ${0:0}
+snippet m:2
+    margin ${1:0} ${0:0}
+snippet m:0
+    margin 0
+snippet m:a
+    margin auto
+snippet mah
+    max-height ${0}
+snippet mah:n
+    max-height none
+snippet maw
+    max-width ${0}
+snippet maw:n
+    max-width none
+snippet mih
+    min-height ${0}
+snippet miw
+    min-width ${0}
+snippet op
+    opacity ${0}
+snippet op:ie
+    filter progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
+snippet op:ms
+    -ms-filter 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
+snippet orp
+    orphans ${0}
+snippet o+
+    outline ${1:1px} ${2:solid} ${0}
+snippet oc
+    outline-color ${0}
+snippet oc:i
+    outline-color invert
+snippet oo
+    outline-offset ${0}
+snippet os
+    outline-style ${0}
+snippet ow
+    outline-width ${0}
+snippet o
+    outline ${0}
+snippet o:n
+    outline none
+snippet ovs
+    overflow-style ${0}
+snippet ovs:a
+    overflow-style auto
+snippet ovs:mq
+    overflow-style marquee
+snippet ovs:mv
+    overflow-style move
+snippet ovs:p
+    overflow-style panner
+snippet ovs:s
+    overflow-style scrollbar
+snippet ovx
+    overflow-x ${0}
+snippet ovx:a
+    overflow-x auto
+snippet ovx:h
+    overflow-x hidden
+snippet ovx:s
+    overflow-x scroll
+snippet ovx:v
+    overflow-x visible
+snippet ovy
+    overflow-y ${0}
+snippet ovy:a
+    overflow-y auto
+snippet ovy:h
+    overflow-y hidden
+snippet ovy:s
+    overflow-y scroll
+snippet ovy:v
+    overflow-y visible
+snippet ov
+    overflow ${0}
+snippet ov:a
+    overflow auto
+snippet ov:h
+    overflow hidden
+snippet ov:s
+    overflow scroll
+snippet ov:v
+    overflow visible
+snippet pb
+    padding-bottom ${0}
+snippet pl
+    padding-left ${0}
+snippet pr
+    padding-right ${0}
+snippet pt
+    padding-top ${0}
+snippet p
+    padding ${0}
+snippet p:4
+    padding ${1:0} ${2:0} ${3:0} ${0:0}
+snippet p:3
+    padding ${1:0} ${2:0} ${0:0}
+snippet p:2
+    padding ${1:0} ${0:0}
+snippet p:0
+    padding 0
+snippet pgba
+    page-break-after ${0}
+snippet pgba:aw
+    page-break-after always
+snippet pgba:a
+    page-break-after auto
+snippet pgba:l
+    page-break-after left
+snippet pgba:r
+    page-break-after right
+snippet pgbb
+    page-break-before ${0}
+snippet pgbb:aw
+    page-break-before always
+snippet pgbb:a
+    page-break-before auto
+snippet pgbb:l
+    page-break-before left
+snippet pgbb:r
+    page-break-before right
+snippet pgbi
+    page-break-inside ${0}
+snippet pgbi:a
+    page-break-inside auto
+snippet pgbi:av
+    page-break-inside avoid
+snippet pos
+    position ${0}
+snippet pos:a
+    position absolute
+snippet pos:f
+    position fixed
+snippet pos:r
+    position relative
+snippet pos:s
+    position static
+snippet q
+    quotes ${0}
+snippet q:en
+    quotes '\201C' '\201D' '\2018' '\2019'
+snippet q:n
+    quotes none
+snippet q:ru
+    quotes '\00AB' '\00BB' '\201E' '\201C'
+snippet rz
+    resize ${0}
+snippet rz:b
+    resize both
+snippet rz:h
+    resize horizontal
+snippet rz:n
+    resize none
+snippet rz:v
+    resize vertical
+snippet r
+    right ${0}
+snippet r:a
+    right auto
+snippet tbl
+    table-layout ${0}
+snippet tbl:a
+    table-layout auto
+snippet tbl:f
+    table-layout fixed
+snippet tal
+    text-align-last ${0}
+snippet tal:a
+    text-align-last auto
+snippet tal:c
+    text-align-last center
+snippet tal:l
+    text-align-last left
+snippet tal:r
+    text-align-last right
+snippet ta
+    text-align ${0}
+snippet ta:c
+    text-align center
+snippet ta:l
+    text-align left
+snippet ta:r
+    text-align right
+snippet td
+    text-decoration ${0}
+snippet td:l
+    text-decoration line-through
+snippet td:n
+    text-decoration none
+snippet td:o
+    text-decoration overline
+snippet td:u
+    text-decoration underline
+snippet te
+    text-emphasis ${0}
+snippet te:ac
+    text-emphasis accent
+snippet te:a
+    text-emphasis after
+snippet te:b
+    text-emphasis before
+snippet te:c
+    text-emphasis circle
+snippet te:ds
+    text-emphasis disc
+snippet te:dt
+    text-emphasis dot
+snippet te:n
+    text-emphasis none
+snippet th
+    text-height ${0}
+snippet th:a
+    text-height auto
+snippet th:f
+    text-height font-size
+snippet th:m
+    text-height max-size
+snippet th:t
+    text-height text-size
+snippet ti
+    text-indent ${0}
+snippet ti:-
+    text-indent -9999px
+snippet tj
+    text-justify ${0}
+snippet tj:a
+    text-justify auto
+snippet tj:d
+    text-justify distribute
+snippet tj:ic
+    text-justify inter-cluster
+snippet tj:ii
+    text-justify inter-ideograph
+snippet tj:iw
+    text-justify inter-word
+snippet tj:k
+    text-justify kashida
+snippet tj:t
+    text-justify tibetan
+snippet to+
+    text-outline ${1:0} ${2:0} ${0}
+snippet to
+    text-outline ${0}
+snippet to:n
+    text-outline none
+snippet tr
+    text-replace ${0}
+snippet tr:n
+    text-replace none
+snippet tsh+
+    text-shadow ${1:0} ${2:0} ${3:0} ${0}
+snippet tsh
+    text-shadow ${0}
+snippet tsh:n
+    text-shadow none
+snippet tt
+    text-transform ${0}
+snippet tt:c
+    text-transform capitalize
+snippet tt:l
+    text-transform lowercase
+snippet tt:n
+    text-transform none
+snippet tt:u
+    text-transform uppercase
+snippet tw
+    text-wrap ${0}
+snippet tw:no
+    text-wrap none
+snippet tw:n
+    text-wrap normal
+snippet tw:s
+    text-wrap suppress
+snippet tw:u
+    text-wrap unrestricted
+snippet t
+    top ${0}
+snippet t:a
+    top auto
+snippet va
+    vertical-align ${0}
+snippet va:bl
+    vertical-align baseline
+snippet va:b
+    vertical-align bottom
+snippet va:m
+    vertical-align middle
+snippet va:sub
+    vertical-align sub
+snippet va:sup
+    vertical-align super
+snippet va:tb
+    vertical-align text-bottom
+snippet va:tt
+    vertical-align text-top
+snippet va:t
+    vertical-align top
+snippet v
+    visibility ${0}
+snippet v:c
+    visibility collapse
+snippet v:h
+    visibility hidden
+snippet v:v
+    visibility visible
+snippet whsc
+    white-space-collapse ${0}
+snippet whsc:ba
+    white-space-collapse break-all
+snippet whsc:bs
+    white-space-collapse break-strict
+snippet whsc:k
+    white-space-collapse keep-all
+snippet whsc:l
+    white-space-collapse loose
+snippet whsc:n
+    white-space-collapse normal
+snippet whs
+    white-space ${0}
+snippet whs:n
+    white-space normal
+snippet whs:nw
+    white-space nowrap
+snippet whs:pl
+    white-space pre-line
+snippet whs:pw
+    white-space pre-wrap
+snippet whs:p
+    white-space pre
+snippet wid
+    widows ${0}
+snippet w
+    width ${0}
+snippet w:a
+    width auto
+snippet wob
+    word-break ${0}
+snippet wob:ba
+    word-break break-all
+snippet wob:bs
+    word-break break-strict
+snippet wob:k
+    word-break keep-all
+snippet wob:l
+    word-break loose
+snippet wob:n
+    word-break normal
+snippet wos
+    word-spacing ${0}
+snippet wow
+    word-wrap ${0}
+snippet wow:no
+    word-wrap none
+snippet wow:n
+    word-wrap normal
+snippet wow:s
+    word-wrap suppress
+snippet wow:u
+    word-wrap unrestricted
+snippet z
+    z-index ${0}
+snippet z:a
+    z-index auto
+snippet zoo
+    zoom 1
+snippet :h
+    :hover
+snippet :fc
+    :first-child
+snippet :lc
+    :last-child
+snippet :nc
+    :nth-child(${0})
+snippet :nlc
+    :nth-last-child(${0})
+snippet :oc
+    :only-child
+snippet :a
+    :after
+snippet :b
+    :before
+snippet ::a
+    ::after
+snippet ::b
+    ::before
+snippet if
+    if ${0}
+snippet mix
+    ${1}(${0})
+snippet for
+    for ${1:i} in ${0}
+snippet keyf
+    @keyframes ${0}

From 59e9d8e9bd6013d7e8fedcdd820281399d1906d3 Mon Sep 17 00:00:00 2001
From: Tony <ikibits@gmail.com>
Date: Thu, 3 Jul 2014 23:17:37 -0500
Subject: [PATCH 0428/1587] customize attributes

---
 snippets/stylus.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/stylus.snippets b/snippets/stylus.snippets
index 45bb458ef..4a305702d 100644
--- a/snippets/stylus.snippets
+++ b/snippets/stylus.snippets
@@ -28,6 +28,8 @@ snippet @r
     @require '${0}'
 snippet @m
     @media ${1:screen}
+snippet @msmw
+    @media screen and (min-width: ${0}px)
 snippet @ext
     @extend .${1}
     ${0}

From 4343a3c660cb052ee380469edca23416a34ba6ad Mon Sep 17 00:00:00 2001
From: Tony <ikibits@gmail.com>
Date: Fri, 4 Jul 2014 14:10:41 -0500
Subject: [PATCH 0429/1587] customize tags html

---
 snippets/html.snippets | 41 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 3642bbca7..dfba3cd49 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -353,6 +353,14 @@ snippet figcaption
 	<figcaption>${0}</figcaption>
 snippet figure
 	<figure>${0}</figure>
+snippet figure#
+	<figure id="${1}">
+        ${0}
+    </figure>
+snippet figure.
+	<figure class="${1}">
+        ${0}
+    </figure>
 snippet footer
 	<footer>
 		${0}
@@ -454,10 +462,23 @@ snippet html5
 	<!DOCTYPE html>
 	<html>
 		<head>
-			<meta charset="utf-8">
-			<meta name="viewport" content="width=device-width">
+			<meta charset="utf-8" />
+			<meta name="viewport" content="width=device-width" />
 			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
-			${2:meta}
+			${2:link}
+		</head>
+		<body>
+			${0:body}
+		</body>
+	</html>
+snippet html5l
+	<!DOCTYPE html>
+	<html lang="${1:es}">
+		<head>
+			<meta charset="utf-8" />
+			<meta name="viewport" content="width=device-width" />
+			<title>${2:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+			${3:link}
 		</head>
 		<body>
 			${0:body}
@@ -561,6 +582,8 @@ snippet link
 	<link rel="${1}" href="${2}" title="${3}" type="${4}" />
 snippet link:atom
 	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml" />
+snippet link:s
+	<link rel="stylesheet" href="${1:style.css}" />
 snippet link:css
 	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />
 snippet link:favicon
@@ -601,6 +624,10 @@ snippet menu:t
 	</menu>
 snippet meta
 	<meta http-equiv="${1}" content="${2}" />
+snippet meta:s
+	<meta ${0} />
+snippet meta:d
+    <meta name="description" content="${0}" />
 snippet meta:compat
 	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}" />
 snippet meta:refresh
@@ -632,7 +659,7 @@ snippet object
 # Embed QT Movie
 snippet movie
 	<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
-	 codebase="http://www.apple.com/qtactivex/qtplugin.cab">
+	codebase="http://www.apple.com/qtactivex/qtplugin.cab">
 		<param name="src" value="$1" />
 		<param name="controller" value="$4" />
 		<param name="autoplay" value="$5" />
@@ -703,6 +730,12 @@ snippet script
 	<script type="text/javascript" charset="utf-8">
 		${0}
 	</script>
+snippet scripts
+	<script src="${0}.js"></script>
+snippet scriptt
+	<script type="${1}" id="${2}">
+		${0}
+	</script>
 snippet scriptsrc
 	<script src="${0}.js" type="text/javascript" charset="utf-8"></script>
 snippet section

From 1df9d6cc6638b410594e3019c3cdcd03fe9fdfb9 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 18 Sep 2014 15:59:42 +0100
Subject: [PATCH 0430/1587] Replaced documentary js placeholders

---
 snippets/javascript/javascript.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index da6038148..ec0a97f31 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -1,11 +1,11 @@
 # prototype
 snippet proto
-	${1}.prototype.${2} = function(${3}) {
+	${1:class_name}.prototype.${2:method_name} = function(${3}) {
 		${0}
 	};
 # Function
 snippet fun
-	function ${1}(${2}) {
+	function ${1:function_name}(${2}) {
 		${0}
 	}
 # Anonymous Function

From 0b323ed6bea4b33d1f263975fdeffab1c156d19d Mon Sep 17 00:00:00 2001
From: Nguyen Le <nguyentle7@gmail.com>
Date: Sat, 20 Sep 2014 22:08:14 -0700
Subject: [PATCH 0431/1587] Added missing quotes on embed and textarea tags in
 html snippets

---
 snippets/html.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index dfba3cd49..72be8fe53 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -330,7 +330,7 @@ snippet dt+
 snippet em
 	<em>${0}</em>
 snippet embed
-	<embed src=${1} type="${0} />
+	<embed src="${1}" type="${0}" />
 snippet fieldset
 	<fieldset>
 		${0}
@@ -813,7 +813,7 @@ snippet td+
 	<td>${1}</td>
 	td+${0}
 snippet textarea
-	<textarea name="${1}" id=${2:$1} rows="${3:8}" cols="${4:40}">${5}</textarea>
+	<textarea name="${1}" id="${2:$1}" rows="${3:8}" cols="${4:40}">${5}</textarea>
 snippet tfoot
 	<tfoot>
 		${0}

From d515554f169be898e1e8e48cb025a832866ebbd1 Mon Sep 17 00:00:00 2001
From: Thomas Duerr <thomduerr@gmail.com>
Date: Mon, 22 Sep 2014 10:23:37 +0200
Subject: [PATCH 0432/1587] fixed indentation in html snippets

---
 snippets/html.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index dfba3cd49..39b2327d0 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -355,12 +355,12 @@ snippet figure
 	<figure>${0}</figure>
 snippet figure#
 	<figure id="${1}">
-        ${0}
-    </figure>
+		${0}
+	</figure>
 snippet figure.
 	<figure class="${1}">
-        ${0}
-    </figure>
+		${0}
+	</figure>
 snippet footer
 	<footer>
 		${0}
@@ -627,7 +627,7 @@ snippet meta
 snippet meta:s
 	<meta ${0} />
 snippet meta:d
-    <meta name="description" content="${0}" />
+	<meta name="description" content="${0}" />
 snippet meta:compat
 	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}" />
 snippet meta:refresh

From faec22c56df5f899c1bca16405cdd666f325ee21 Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Tue, 23 Sep 2014 09:18:53 +0200
Subject: [PATCH 0433/1587] add simple docblocks for class methods

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 UltiSnips/php.snippets | 42 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index bf450ff08..0139c3794 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -145,49 +145,79 @@ $0
 endsnippet
 
 snippet pub "Public function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
 public function ${1:name}(${2:$param})
 {
-	${VISUAL}${3:return null;}
+	${VISUAL}${5:return null;}
 }
 $0
 endsnippet
 
 snippet pro "Protected function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
 protected function ${1:name}(${2:$param})
 {
-	${VISUAL}${3:return null;}
+	${VISUAL}${5:return null;}
 }
 $0
 endsnippet
 
 snippet pri "Private function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
 private function ${1:name}(${2:$param})
 {
-	${VISUAL}${3:return null;}
+	${VISUAL}${5:return null;}
 }
 $0
 endsnippet
 
 snippet pubs "Public static function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
 public static function ${1:name}(${2:$param})
 {
-	${VISUAL}${3:return null;}
+	${VISUAL}${5:return null;}
 }
 $0
 endsnippet
 
 snippet pros "Protected static function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
 protected static function ${1:name}(${2:$param})
 {
-	${VISUAL}${3:return null;}
+	${VISUAL}${5:return null;}
 }
 $0
 endsnippet
 
 snippet pris "Private static function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
 private static function ${1:name}(${2:$param})
 {
-	${VISUAL}${3:return null;}
+	${VISUAL}${5:return null;}
 }
 $0
 endsnippet

From 6e0180c5fc9ed3733f6bc2cdda6305de9e24c6bc Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Tue, 23 Sep 2014 09:19:26 +0200
Subject: [PATCH 0434/1587] add inheritdoc docblock snippet

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 UltiSnips/php.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 0139c3794..82cdda25b 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -297,4 +297,10 @@ public function $1Action($2)
 }
 endsnippet
 
+snippet inheritdoc "@inheritdoc docblock"
+/**
+ * {@inheritdoc}
+ */
+endsnippet
+
 # :vim:ft=snippets:

From 41f9d7dc5aaa875b4ad47e888ead692c03c9c343 Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Tue, 23 Sep 2014 09:50:51 +0200
Subject: [PATCH 0435/1587] php extend class snippet so you can easily add
 abstract or final

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 UltiSnips/php.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index bf450ff08..4fccbd3f0 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -223,14 +223,14 @@ endsnippet
 
 snippet class "Class declaration template" b
 /**
- * Class ${1:`!p snip.rv=snip.fn.split('.')[0]`}
- * @author ${2:`!v g:snips_author`}
+ * Class ${2:`!p snip.rv=snip.fn.split('.')[0]`}
+ * @author ${3:`!v g:snips_author`}
  */
-class $1
+$1class $2
 {
-	public function ${3:__construct}(${4:$options})
+	public function ${4:__construct}(${5:$options})
 	{
-		${5:// code}
+		${6:// code}
 	}
 }
 $0

From dca6268c24c788b4766aa779aa5590fe6b3c81aa Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Tue, 23 Sep 2014 09:51:44 +0200
Subject: [PATCH 0436/1587] php add interface snippet similar to class snippet

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 UltiSnips/php.snippets | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 4fccbd3f0..8d5555e02 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -236,6 +236,21 @@ $1class $2
 $0
 endsnippet
 
+snippet interface "interface declaration template" b
+/**
+ * Interface ${1:`!p snip.rv=snip.fn.split('.')[0]`}
+ * @author ${2:`!v g:snips_author`}
+ */
+interface $1
+{
+	public function ${3:__construct}(${4:$options})
+	{
+		${5:// code}
+	}
+}
+$0
+endsnippet
+
 snippet construct "__construct()" b
 /**
  * @param $2mixed ${1/, /\n     * \@param mixed /g}

From 2bffc46ecb557ee7c0cb63092bc9357aca598edf Mon Sep 17 00:00:00 2001
From: Vadim Khohlov <xvadima@ukr.net>
Date: Thu, 2 Oct 2014 11:04:56 +0300
Subject: [PATCH 0437/1587] Python: added snippets for classmethod and
 staticmethod

---
 UltiSnips/python.snippets | 43 +++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 3387533d0..b63cf3781 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -157,6 +157,20 @@ def write_slots_args(args, snip):
 	args = ['"_%s"' % arg for arg in args]
 	snip += '__slots__ = (%s,)' % ', '.join(args)
 
+
+def write_function_code(t, snip):
+	snip.rv = ""
+	snip >> 1
+
+	args = get_args(t[2])
+	if args:
+		write_docstring_args(args, snip)
+
+	style = get_style(snip)
+	snip += format_return(style)
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += triple_quotes(snip)
+
 endglobal
 
 ########################################
@@ -395,22 +409,33 @@ def __coerce__(self, other):
 	${25:pass}
 endsnippet
 
+
 snippet def "function with docstrings" b
 def ${1:function}(`!p
 if snip.indent:
 	snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
 	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
-snip.rv = ""
-snip >> 1
+write_function_code(t, snip) `
+	${0:pass}
+endsnippet
+
+
+snippet defc "class method with docstrings" b
+@classmethod
+def ${1:function}(`!p
+if snip.indent:
+	snip.rv = 'cls' + (", " if len(t[2]) else "")`${2:arg1}):
+	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
+write_function_code(t, snip) `
+	${0:pass}
+endsnippet
 
-args = get_args(t[2])
-if args:
-	write_docstring_args(args, snip)
 
-style = get_style(snip)
-snip += format_return(style)
-snip.rv += '\n' + snip.mkline('', indent='')
-snip += triple_quotes(snip) `
+snippet defs "static method with docstrings" b
+@staticmethod
+def ${1:function}(${2:arg1}):
+	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
+write_function_code(t, snip) `
 	${0:pass}
 endsnippet
 

From 0ee4b849023efe1ba190affd851b5aea39473156 Mon Sep 17 00:00:00 2001
From: Andrei Cristian Petcu <andrei@ceata.org>
Date: Sat, 4 Oct 2014 15:42:21 +0300
Subject: [PATCH 0438/1587] added pry to eruby

---
 snippets/eruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index 95418350d..f57d2ca0d 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -125,3 +125,5 @@ snippet ife
 	<% else %>
 		${0}
 	<% end %>
+snippet pry
+  <% require 'pry'; binding.pry %>

From f298510733dce805963af81ec4e8d3e80d8de9bb Mon Sep 17 00:00:00 2001
From: Vadim Khohlov <xvadima@ukr.net>
Date: Sun, 5 Oct 2014 00:25:28 +0300
Subject: [PATCH 0439/1587] Added docstring; removed empty line

---
 UltiSnips/python.snippets | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index b63cf3781..41a3645fa 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -158,7 +158,13 @@ def write_slots_args(args, snip):
 	snip += '__slots__ = (%s,)' % ', '.join(args)
 
 
-def write_function_code(t, snip):
+def write_function_docstring(t, snip):
+	"""
+	Writes a function docstring with the current style.
+
+	:param t: The values of the placeholders
+	:param snip: UltiSnips.TextObjects.SnippetUtil object instance
+	"""
 	snip.rv = ""
 	snip >> 1
 
@@ -409,13 +415,12 @@ def __coerce__(self, other):
 	${25:pass}
 endsnippet
 
-
 snippet def "function with docstrings" b
 def ${1:function}(`!p
 if snip.indent:
 	snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
 	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
-write_function_code(t, snip) `
+write_function_docstring(t, snip) `
 	${0:pass}
 endsnippet
 
@@ -426,7 +431,7 @@ def ${1:function}(`!p
 if snip.indent:
 	snip.rv = 'cls' + (", " if len(t[2]) else "")`${2:arg1}):
 	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
-write_function_code(t, snip) `
+write_function_docstring(t, snip) `
 	${0:pass}
 endsnippet
 
@@ -435,7 +440,7 @@ snippet defs "static method with docstrings" b
 @staticmethod
 def ${1:function}(${2:arg1}):
 	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
-write_function_code(t, snip) `
+write_function_docstring(t, snip) `
 	${0:pass}
 endsnippet
 

From 885fdc4e7591ef1ad99701457b5335204be35dd3 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 8 Oct 2014 09:54:36 +0100
Subject: [PATCH 0440/1587] js node require: Use single quotes to match style

In the other node snippets we are using single quotes. I've changed the
node require snippet to conform to this style.
---
 snippets/javascript/javascript.node.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.node.snippets b/snippets/javascript/javascript.node.snippets
index 9e7508771..97876ab1f 100644
--- a/snippets/javascript/javascript.node.snippets
+++ b/snippets/javascript/javascript.node.snippets
@@ -3,7 +3,7 @@ snippet ex
 	module.exports = ${1};
 # require
 snippet re
-	var ${1} = require("${2:module_name}");
+	var ${1} = require('${2:module_name}');
 # EventEmitter
 snippet on
 	on('${1:event_name}', function(${2:stream}) {

From f488d4842dde9ec22d1ce2f04242ac8dd1546f82 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 8 Oct 2014 10:09:42 +0100
Subject: [PATCH 0441/1587] js define prop: Use single quotes to match style

In the other vanila snippets we are using single quotes. I've changed
the define property snippet to conform to this style.
---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index bfc53ee8a..7d961f7d7 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -191,7 +191,7 @@ snippet props
 snippet prop
 	Object.defineProperty(
 		${1:object},
-		"${2:property}",
+		'${2:property}',
 		{
 			get : function $1_$2_getter() {
 				// getter code

From 9eea45200542ead52b267784de1d3bd1a0873960 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 8 Oct 2014 10:47:31 +0100
Subject: [PATCH 0442/1587] Added JS DOM element selector snippets

So not everyone uses jQuery. Who knew?

I've added snippets for the main vanilla JS DOM element selector
snippets.
---
 snippets/javascript/javascript.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index bfc53ee8a..416be9bad 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -205,3 +205,11 @@ snippet prop
 			configurable : ${0:boolean}
 		}
 	);
+snippet by.
+	${document}.getElementsByClassName('${class name})
+snippet by#
+	${document}.getElementById('${element ID})
+snippet qs
+	${document}.querySelector('${selectors})
+snippet qsa
+	${document}.querySelectorAll('${selectors})

From ea8dc0592f5af2fd52eeb122c13a07ff51529cb2 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 8 Oct 2014 10:52:36 +0100
Subject: [PATCH 0443/1587] Added missing semicolon to JS return statement

---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index bfc53ee8a..3804db8bf 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -103,7 +103,7 @@ snippet cd
 	console.debug(${0});
 # return
 snippet ret
-	return ${0:result}
+	return ${0:result};
 # for (property in object ) { ... }
 snippet fori
 	for (var ${1:prop} in ${2:Things}) {

From 3514b3cb4465d441809c63f744699aef75c2bc9a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 17 Jun 2014 22:52:46 +0200
Subject: [PATCH 0444/1587] Use actual value for SINGLE_QUOTES/DOUBLE_QUOTES

---
 UltiSnips/python.snippets | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 41a3645fa..efca35d27 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -36,8 +36,8 @@ DOXYGEN = 0x2
 SPHINX  = 0x3
 GOOGLE  = 0x4
 
-SINGLE_QUOTES = 0x1
-DOUBLE_QUOTES = 0x2
+SINGLE_QUOTES = "'"
+DOUBLE_QUOTES = '"'
 
 
 class Arg(object):
@@ -69,9 +69,28 @@ def get_quoting_style(snip):
 	return DOUBLE_QUOTES
 
 def triple_quotes(snip):
-	if get_quoting_style(snip) == SINGLE_QUOTES:
-		return "'''"
-	return '"""'
+	return get_quoting_style(snip) * 3
+
+def triple_quotes_handle_trailing(snip, quoting_style):
+	if not hasattr(snip, '_tqt'):
+		_, col = vim.current.window.cursor
+		line = vim.current.line
+
+		# Handle already existing quote chars, usually from an autoclose plugin
+		# like delimitMate.
+		_ret = quoting_style * 3
+		while True:
+			try:
+				nextc = line[col]
+			except IndexError:
+				break
+			if nextc == quoting_style and len(_ret):
+				_ret = _ret[1:]
+				col = col+1
+			else:
+				break
+		snip._tqt = _ret
+	snip.rv = snip._tqt
 
 def get_style(snip):
 	style = snip.opt("g:ultisnips_python_style", "normal")

From 9191e53407f5de257aaa455e5fc946b73f8ba8cc Mon Sep 17 00:00:00 2001
From: Craig Paterson <darksavant@gmail.com>
Date: Thu, 9 Oct 2014 11:01:36 +0200
Subject: [PATCH 0445/1587] Change jsdoc author info to match jsdoc
 documentation format at http://usejsdoc.org/tags-author.html

---
 UltiSnips/javascript_jsdoc.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/javascript_jsdoc.snippets b/UltiSnips/javascript_jsdoc.snippets
index ca943fc7a..959f805d6 100644
--- a/UltiSnips/javascript_jsdoc.snippets
+++ b/UltiSnips/javascript_jsdoc.snippets
@@ -9,7 +9,7 @@ snippet /* "A JSDoc comment" b
 endsnippet
 
 snippet @au "@author email (First Last)"
-@author ${1:`!v g:snips_author_email`} (${2:`!v g:snips_author`})
+@author ${1:`!v g:snips_author`} [${2:`!v g:snips_author_email`}]
 endsnippet
 
 snippet @li "@license Description"

From ff8c1277bea7bb6c956751fea23f276e801618d4 Mon Sep 17 00:00:00 2001
From: Craig Paterson <darksavant@gmail.com>
Date: Thu, 9 Oct 2014 11:26:39 +0200
Subject: [PATCH 0446/1587] Added some additional angular snippets and changed
 the existing ones to use the annotated syntax which supports minifications,
 see: https://docs.angularjs.org/tutorial/step_05 (A note on minification).
 Also added some variants that auto-insert the scope, which is commonly done.

---
 UltiSnips/javascript_angular.snippets | 46 +++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/javascript_angular.snippets b/UltiSnips/javascript_angular.snippets
index 76e9ca1da..61b52293c 100644
--- a/UltiSnips/javascript_angular.snippets
+++ b/UltiSnips/javascript_angular.snippets
@@ -19,7 +19,49 @@ config(function($1) {
 endsnippet
 
 snippet acont "angular controller" i
-controller('${1:name}', function($2) {
+controller('${1:name}', ['${2:param_annotation}', function(${3:param}) {
 	$0
-});
+}]);
+endsnippet
+
+snippet aconts "angular controller with scope" i
+controller('${1:name}', ['$scope', function($scope) {
+	$0
+}]);
+endsnippet
+
+snippet adir "angular directive" i
+directive('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+	$0
+}]);
+endsnippet
+
+snippet adirs "angular directive with scope" i
+directive('${1:name}', ['$scope', function($scope) {
+	$0
+}]);
+endsnippet
+
+snippet afact "angular factory" i
+factory('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+	$0
+}]);
+endsnippet
+
+snippet afacts "angular factory with scope" i
+factory('${1:name}', ['$scope', function($scope) {
+	$0
+}]);
+endsnippet
+
+snippet aserv "angular service" i
+service('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+	$0
+}]);
+endsnippet
+
+snippet aservs "angular service" i
+service('${1:name}', ['$scope', function($scope) {
+	$0
+}]);
 endsnippet

From c34ee98d85fe04954b8ddc3563b22047e3f3ca36 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 9 Oct 2014 10:47:38 +0100
Subject: [PATCH 0447/1587] JS: Group related snippets together.

---
 snippets/javascript/javascript.snippets | 150 ++++++++++++++----------
 1 file changed, 90 insertions(+), 60 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index ee088b9af..ebced4617 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -1,3 +1,5 @@
+# Functions
+
 # prototype
 snippet proto
 	${1:class_name}.prototype.${2:method_name} = function(${3}) {
@@ -23,6 +25,18 @@ snippet (f
 	(function(${1}) {
 		${0}
 	}(${2}));
+# self-defining function
+snippet sdf
+	var ${1:function_name} = function (${2:argument}) {
+		${3}
+
+		$1 = function ($2) {
+			${0}
+		};
+	};
+
+# Flow control
+
 # if
 snippet if
 	if (${1:true}) {
@@ -37,7 +51,7 @@ snippet ife
 	}
 # tertiary conditional
 snippet ter
-	${1:/* condition */} ? ${2:a} : ${0:b}
+	${1:/* condition */} ? ${2:/* if true */} : ${0:/* if false */}
 # switch
 snippet switch
 	switch (${1:expression}) {
@@ -54,89 +68,55 @@ snippet case
 		${2}
 		break;
 	${0}
-# for (...) {...}
+# try
+snippet try
+	try {
+		${1}
+	} catch (${2:e}) {
+		${0:/* handle error */}
+	}
+# return
+snippet ret
+	return ${0:result};
+
+# Loops
+
+# for loop
 snippet for
 	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
 		var ${3:v} = $1[$2];${0:}
 	}
-# for (...) {...} (Improved Native For-Loop)
+# Reversed for loop
 snippet forr
 	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2 --) {
 		var ${3:v} = $1[$2];${0:}
 	}
-# while (...) {...}
+# While loop
 snippet wh
 	while (${1:/* condition */}) {
 		${0}
 	}
-# try
-snippet try
-	try {
-		${1}
-	} catch (${2:e}) {
-		${0:/* handle error */}
-	}
-# do...while
+# Do while loop
 snippet do
 	do {
 		${0}
 	} while (${1:/* condition */});
+# For in loop
+snippet fori
+	for (var ${1:prop} in ${2:object}) {
+		${0:$2[$1]}
+	}
+
+# Objects
+
 # Object Method
 snippet :f
 	${1:method_name}: function (${2:attribute}) {
 		${0}
 	}${3:,}
-# setTimeout function
-snippet timeout
-	setTimeout(function () {${0}}${2}, ${1:10});
-# Get Elements
-snippet get
-	getElementsBy${1:TagName}('${2}')
-# Get Element
-snippet gett
-	getElementBy${1:Id}('${2}')
-# console.log (Firebug)
-snippet cl
-	console.log(${0});
-# console.debug (Firebug)
-snippet cd
-	console.debug(${0});
-# return
-snippet ret
-	return ${0:result};
-# for (property in object ) { ... }
-snippet fori
-	for (var ${1:prop} in ${2:Things}) {
-		${0:$2[$1]}
-	}
 # hasOwnProperty
 snippet has
 	hasOwnProperty(${0})
-# docstring
-snippet /**
-	/**
-	 * ${0:description}
-	 *
-	 */
-snippet @par
-	@param {${1:type}} ${2:name} ${0:description}
-snippet @ret
-	@return {${1:type}} ${0:description}
-# JSON.parse
-snippet jsonp
-	JSON.parse(${0:jstr});
-# JSON.stringify
-snippet jsons
-	JSON.stringify(${0:object});
-# self-defining function
-snippet sdf
-	var ${1:function_name} = function (${2:argument}) {
-		${3}
-
-		$1 = function ($2) {
-			${0}
-		};
-	};
 # singleton
 snippet sing
 	function ${1:Singleton} (${2:argument}) {
@@ -205,11 +185,61 @@ snippet prop
 			configurable : ${0:boolean}
 		}
 	);
+
+# Documentation
+
+# docstring
+snippet /**
+	/**
+	 * ${0:description}
+	 *
+	 */
+snippet @par
+	@param {${1:type}} ${2:name} ${0:description}
+snippet @ret
+	@return {${1:type}} ${0:description}
+
+# JSON
+
+# JSON.parse
+snippet jsonp
+	JSON.parse(${0:jstr});
+# JSON.stringify
+snippet jsons
+	JSON.stringify(${0:object});
+
+# DOM selectors
+
+# Get elements
+snippet get
+	getElementsBy${1:TagName}('${2}')
+# Get element
+snippet gett
+	getElementBy${1:Id}('${2}')
+# Elements by class
 snippet by.
 	${document}.getElementsByClassName('${class name})
+# Element by ID
 snippet by#
 	${document}.getElementById('${element ID})
+# Query selector
 snippet qs
 	${document}.querySelector('${selectors})
+# Query selector all
 snippet qsa
 	${document}.querySelectorAll('${selectors})
+
+# Debugging
+
+# console.log
+snippet cl
+	console.log(${0});
+# console.debug
+snippet cd
+	console.debug(${0});
+
+# Misc
+
+# setTimeout function
+snippet timeout
+	setTimeout(function () {${0}}${2}, ${1:10});

From faeacc8c27094db6ec2176a80af60b97bbe6faf9 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 9 Oct 2014 14:38:25 +0100
Subject: [PATCH 0448/1587] Remove Scala braces to adhere to the style guide

Scala if statements can have braces, but convention is not to use them
except in specific situations; so let's not use them by default.

Let's also add a space before the opening `(`, as this is also
convention.

Lastly, remove the useless placeholder text, as recommende in the
project README. Everyone knows how an if statement works. :)

http://www.codecommit.com/scala-style-guide.pdf
---
 snippets/scala.snippets | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index 09d69ad3a..4e147a0f3 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -6,32 +6,27 @@
 # Scala lang
 #if
 snippet if
-	if(${1:obj}) {
+	if (${1})
 		${0}
-	}
 #if not
 snippet ifn
-	if(!${1:obj}) {
+	if (!${1})
 		${0}
-	}
 #if-else
 snippet ife
-	if(${1:obj}) {
+	if (${1})
 		${2}
-	} else {
+	else
 		${0}
-	}
 #if-else-if
 snippet ifelif
-	if(${1:obj}) {
+	if (${1})
 		${2}
-	} else if(${3:obj}) {
+	else if (${3})
 		${0}
-	}
 snippet eif
-	else if(${3:obj}) {
+	else if (${3})
 		${0}
-	}
 #while loop
 snippet wh
 	while (${1:obj}) {

From 59c1db473fcb8f1b57c12751d5e7b536231da912 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 10 Oct 2014 16:50:51 +0100
Subject: [PATCH 0449/1587] More JS console. snippets

---
 snippets/javascript/javascript.node.snippets |  1 -
 snippets/javascript/javascript.snippets      | 12 ++++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.node.snippets b/snippets/javascript/javascript.node.snippets
index 97876ab1f..abc3b8d89 100644
--- a/snippets/javascript/javascript.node.snippets
+++ b/snippets/javascript/javascript.node.snippets
@@ -47,4 +47,3 @@ snippet stdout
 	process.stdout
 snippet stderr
 	process.stderr
-
diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index ebced4617..350a03128 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -237,6 +237,18 @@ snippet cl
 # console.debug
 snippet cd
 	console.debug(${0});
+# console.trace
+snippet ct
+	console.trace(${0:label});
+# console.time
+snippet ctime
+	console.time(${0:label});
+# console.assert
+snippet ca
+	console.assert(${1:expression}, ${0:obj});
+# console.dir
+snippet cdir
+	console.dir(${0:obj});
 
 # Misc
 

From 3216ac221ef659eff15d3d4b6dff636114db10c2 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 10 Oct 2014 17:19:51 +0100
Subject: [PATCH 0450/1587] Fix Bug in UltiSnips/tex.snippets fig env b

As mmclaren42 seems to be MIA, I've fixed committed the fix they
suggested.

https://github.com/honza/vim-snippets/issues/450
---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index ede9090d9..406948c4a 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -15,7 +15,7 @@ $0${2/((?<=.)c|l|r)|./(?1: & )/g}
 endsnippet
 
 snippet fig "Figure environment" b
-\begin{figure}${2:[htpb]}
+\begin{figure}[${2:htpb}]
 	\centering
 	\includegraphics[width=${3:0.8}\linewidth]{${4:name.ext}}
 	\caption{${4/(\w+)\.\w+/\u$1/}$0}

From e2bd41af02ba31d7b4979013d26d23631d41fe73 Mon Sep 17 00:00:00 2001
From: Louis <louis@lpil.co.uk>
Date: Sat, 11 Oct 2014 13:35:51 +0100
Subject: [PATCH 0451/1587] SCSS snipmate snippes

---
 UltiSnips/scss.snippets |  8 ++++----
 snippets/scss.snippets  | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 snippets/scss.snippets

diff --git a/UltiSnips/scss.snippets b/UltiSnips/scss.snippets
index f21428474..cab17c143 100644
--- a/UltiSnips/scss.snippets
+++ b/UltiSnips/scss.snippets
@@ -7,21 +7,21 @@ snippet imp "@import '...';" b
 endsnippet
 
 snippet inc "@include mixin(...);" b
-@include ${1:mixin}(${2:arguments});
+@include ${1:mixin}(${2});
 endsnippet
 
 snippet ext "@extend %placeholder;" b
-@extend %${1:placeholder};
+@extend %${1:%placeholder};
 endsnippet
 
 snippet mixin "@mixin (...) { ... }" b
-@mixin ${1:name}(${2:arguments}) {
+@mixin ${1:name}(${2}) {
 	${VISUAL}$0
 }
 endsnippet
 
 snippet fun "@function (...) { ... }" b
-@function ${1:name}(${2:arguments}) {
+@function ${1:name}(${2}) {
 	${VISUAL}$0
 }
 endsnippet
diff --git a/snippets/scss.snippets b/snippets/scss.snippets
new file mode 100644
index 000000000..6daee776b
--- /dev/null
+++ b/snippets/scss.snippets
@@ -0,0 +1,36 @@
+snippet $
+	$${1:variable}: ${0:value};
+snippet imp
+	@import '${0}';
+snippet mix
+	@mixin ${1:name}(${2}) {
+		${0}
+	}
+snippet inc
+	@include ${1:mixin}(${2});
+snippet ex
+	@extend ${0};
+snippet fun
+	@function ${1:name}(${2:args}) {
+		${0}
+	}
+snippet if
+	@if ${1:condition} {
+		${0}
+	}
+snippet else
+	@else ${1:condition} {
+		${0}
+	}
+snippet for
+	@for ${1:$i} from ${2:1} through ${3:3} {
+		${0}
+	}
+snippet each
+	@each ${1:$item} in ${2:items} {
+		${0}
+	}
+snippet while
+	@while ${1:$i} ${2:>} ${3:0} {
+		${0}
+	}

From 0373b8400eca49fefac3c9fd450f41dc23202308 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 13 Oct 2014 13:41:52 +0100
Subject: [PATCH 0452/1587] Fix JS DOM selector placeholders

---
 snippets/javascript/javascript.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 350a03128..15faff57c 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -212,22 +212,22 @@ snippet jsons
 
 # Get elements
 snippet get
-	getElementsBy${1:TagName}('${2}')
+	getElementsBy${1:TagName}('${0}')
 # Get element
 snippet gett
-	getElementBy${1:Id}('${2}')
+	getElementBy${1:Id}('${0}')
 # Elements by class
 snippet by.
-	${document}.getElementsByClassName('${class name})
+	${1:document}.getElementsByClassName('${0:class})
 # Element by ID
 snippet by#
-	${document}.getElementById('${element ID})
+	${1:document}.getElementById('${0:element ID})
 # Query selector
 snippet qs
-	${document}.querySelector('${selectors})
+	${1:document}.querySelector('${0:CSS selector})
 # Query selector all
 snippet qsa
-	${document}.querySelectorAll('${selectors})
+	${1:document}.querySelectorAll('${0:CSS selector})
 
 # Debugging
 

From 2d47b8535867b82ee92b949b03234ad3ace61d47 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 13 Oct 2014 13:47:00 +0100
Subject: [PATCH 0453/1587] JS: Add missing closing quotes

---
 snippets/javascript/javascript.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 15faff57c..5012a43a2 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -218,16 +218,16 @@ snippet gett
 	getElementBy${1:Id}('${0}')
 # Elements by class
 snippet by.
-	${1:document}.getElementsByClassName('${0:class})
+	${1:document}.getElementsByClassName('${0:class}')
 # Element by ID
 snippet by#
-	${1:document}.getElementById('${0:element ID})
+	${1:document}.getElementById('${0:element ID}')
 # Query selector
 snippet qs
-	${1:document}.querySelector('${0:CSS selector})
+	${1:document}.querySelector('${0:CSS selector}')
 # Query selector all
 snippet qsa
-	${1:document}.querySelectorAll('${0:CSS selector})
+	${1:document}.querySelectorAll('${0:CSS selector}')
 
 # Debugging
 

From f9109523514c7224f378aaba627c31e022b6c818 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 17 Oct 2014 10:01:51 +0100
Subject: [PATCH 0454/1587] UltiSnips: default to no ID for divs

---
 UltiSnips/html.snippets | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index fee451f97..46325efe2 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -172,7 +172,13 @@ snip.rv = snip.fn and 'Hallo' or 'Nothin'
 </body>
 endsnippet
 
-snippet div "XHTML <div>" w
+snippet div "<div>" w
+<div>
+	$0
+</div>
+endsnippet
+
+snippet div# "<div> with ID & class" w
 <div`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`>
 	$0
 </div>

From 8637c918cef7d3901e3a05b91a0316c58dc6f9fd Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 17 Oct 2014 10:12:50 +0100
Subject: [PATCH 0455/1587] UltiSnips: HTML div with class.

---
 UltiSnips/html.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 46325efe2..4d91e2ea5 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -172,8 +172,8 @@ snip.rv = snip.fn and 'Hallo' or 'Nothin'
 </body>
 endsnippet
 
-snippet div "<div>" w
-<div>
+snippet div. "<div> with class" w
+<div`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`>
 	$0
 </div>
 endsnippet

From 7bdc3b047fbd4663545812b6d4e55cb4ed2fcd50 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 17 Oct 2014 10:19:01 +0100
Subject: [PATCH 0456/1587] UltiSnips HTML: Remove redundant img snippet

---
 UltiSnips/html.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 4d91e2ea5..079db9143 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -160,10 +160,6 @@ snippet base "XHTML <base>" w
 <base href="$1"${2: target="$3"}`!p x(snip)`>
 endsnippet
 
-snippet img "XHTML <img>" w
-<img src="${1:imgsrc}">
-endsnippet
-
 snippet body "XHTML <body>"
 <body id="${1:`!p
 snip.rv = snip.fn and 'Hallo' or 'Nothin'

From d4cb189306ec1f1fdd7d380033ba47bcb87fe975 Mon Sep 17 00:00:00 2001
From: Louis <louis@lpil.co.uk>
Date: Fri, 17 Oct 2014 23:14:35 +0100
Subject: [PATCH 0457/1587] Fix bug #471: Swap spaces for a tab in pry snippet

---
 snippets/eruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index 1b206e3da..00696963c 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -128,4 +128,4 @@ snippet ife
 		${0}
 	<% end %>
 snippet pry
-  <% require 'pry'; binding.pry %>
+	<% require 'pry'; binding.pry %>

From 1bb849e2844e118073cf6ae2fb8a0f299ead98e7 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 17 Jun 2014 22:54:15 +0200
Subject: [PATCH 0458/1587] Add snippets `'`, `"` and `doc`

`'` and `"` use a new function `triple_quotes_handle_trailing` which
handles trailing/existing quotes.

This handles expansion of`"|"`, where the second quote gets automatically
inserted by e.g. delimitMate.
---
 UltiSnips/python.snippets | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index efca35d27..af32c52b3 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -72,12 +72,18 @@ def triple_quotes(snip):
 	return get_quoting_style(snip) * 3
 
 def triple_quotes_handle_trailing(snip, quoting_style):
-	if not hasattr(snip, '_tqt'):
+	"""
+	Generate triple quoted strings and handle any trailing quote char,
+	which might be there from some autoclose/autopair plugin,
+	i.e. when expanding ``"|"``.
+	"""
+	if not snip.c:
+		# Do this only once, otherwise the following error would happen:
+		# RuntimeError: The snippets content did not converge: …
 		_, col = vim.current.window.cursor
 		line = vim.current.line
 
-		# Handle already existing quote chars, usually from an autoclose plugin
-		# like delimitMate.
+		# Handle already existing quote chars after the trigger.
 		_ret = quoting_style * 3
 		while True:
 			try:
@@ -89,8 +95,9 @@ def triple_quotes_handle_trailing(snip, quoting_style):
 				col = col+1
 			else:
 				break
-		snip._tqt = _ret
-	snip.rv = snip._tqt
+		snip.rv = _ret
+	else:
+		snip.rv = snip.c
 
 def get_style(snip):
 	style = snip.opt("g:ultisnips_python_style", "normal")
@@ -632,4 +639,22 @@ class Test${1:Class}(${2:unittest.TestCase}):
 		${7:pass}
 endsnippet
 
+snippet " "triple quoted string (double quotes)" b
+"""
+${1:doc}
+`!p triple_quotes_handle_trailing(snip, '"')`
+endsnippet
+
+snippet ' "triple quoted string (single quotes)" b
+'''
+${1:doc}
+`!p triple_quotes_handle_trailing(snip, "'")`
+endsnippet
+
+snippet doc "doc block (triple quotes)"
+`!p snip.rv = triple_quotes(snip)`
+${1:doc}
+`!p snip.rv = triple_quotes(snip)`
+endsnippet
+
 # vim:ft=snippets:

From 90d9862a90e45d57d11477b6cf4f85f781c0c37e Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 23 Oct 2014 09:30:49 +0100
Subject: [PATCH 0459/1587] Scala for comprehension

---
 snippets/scala.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index 4e147a0f3..f824ee283 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -42,6 +42,11 @@ snippet fori
 	for (${1:i} <- ${2:0} to ${3:obj}.length) {
 		${0}
 	}
+#for comprehension
+snippet fory
+	for {
+		${1:item} <- ${2:obj}
+	} yield ${0}
 #exceptions
 snippet try
 	try {

From ae0cca3345ea6a4f91ceb0b52698ec70a5bbd789 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 23 Oct 2014 10:00:12 +0100
Subject: [PATCH 0460/1587] Ultisnips: Common CSS snippets

These already exist in the `snippets` style, but thse will not be loaded
by Ultisnips when working with SCSS files, due to how the extend feature
works.
---
 UltiSnips/css.snippets | 96 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 91 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/css.snippets b/UltiSnips/css.snippets
index 32c3f217e..ac9fb57a3 100644
--- a/UltiSnips/css.snippets
+++ b/UltiSnips/css.snippets
@@ -1,13 +1,99 @@
-###########################################################################
-#                    Most of these came from TextMate                     #
-###########################################################################
-
 priority -50
 
+snippet . "selector { }"
+$1 {
+	$0
+}
+endsnippet
+
+snippet p "padding"
+padding: ${1:0};$0
+endsnippet
+
+snippet m "margin"
+margin: ${1:0};$0
+endsnippet
+
+snippet bd "border"
+border: ${1:0};$0
+endsnippet
+
+snippet d "display"
+display: ${1:none};$0
+endsnippet
+
+snippet bg "background"
+background: ${1:none};$0
+endsnippet
+
+snippet ff "font-family"
+font-family: ${1:"Helvetica Neue", Helvetica, Arial, sans-serif};$0
+endsnippet
+
+snippet h "height"
+height: ${1:auto};$0
+endsnippet
+
+snippet w "width"
+width: ${1:auto};$0
+endsnippet
+
+snippet pos "position"
+position: ${1:relative};$0
+endsnippet
+
 snippet ! "!important CSS (!)"
-${1:!important}
+!important
+endsnippet
+
+#
+# Selectors
+#
+
+snippet :fc
+:first-child
 endsnippet
 
+snippet :lc
+:last-child
+endsnippet
+
+snippet :nc
+:nth-child($0)
+endsnippet
+
+snippet :nlc
+:nth-last-child($0)
+endsnippet
+
+snippet :oc
+:only-child
+endsnippet
+
+#
+# Pseudo-elements
+#
+
+snippet :a
+:after
+endsnippet
+
+snippet :b
+:before
+endsnippet
+
+snippet ::a
+::after
+endsnippet
+
+snippet ::b
+::before
+endsnippet
+
+###########################################################################
+#                    Most of these came from TextMate                     #
+###########################################################################
+
 snippet fixed "Fixed Position Bottom 100% wide IE6"
 ${2:bottom: auto;}top: expression(eval(document.documentElement.scrollTop+document.documentElement.clientHeight-${1:THE HEIGHT OF THIS THING IN PIXELS}));
 ${3:left: expression(eval(document.documentElement.scrollLeft));

From c1ee0ed08ad64b57e750980ad8f281402b1a7fc5 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 23 Oct 2014 10:26:28 +0100
Subject: [PATCH 0461/1587] Ultisnips: CSS. Colours, shadows, text-transform.

Also remove IE6 specific fixed position snippet.
---
 UltiSnips/css.snippets | 58 +++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/UltiSnips/css.snippets b/UltiSnips/css.snippets
index ac9fb57a3..d1a310e9f 100644
--- a/UltiSnips/css.snippets
+++ b/UltiSnips/css.snippets
@@ -42,10 +42,42 @@ snippet pos "position"
 position: ${1:relative};$0
 endsnippet
 
+snippet tt "text-transform"
+text-transform: ${1:none};$0
+endsnippet
+
 snippet ! "!important CSS (!)"
 !important
 endsnippet
 
+snippet tsh "text-shadow: color-hex x y blur (text)"
+text-shadow: ${1:${2:color} ${3:offset-x} ${4:offset-y} ${5:blur}};$0
+endsnippet
+
+snippet bxsh "box-shadow: color-hex x y blur (text)"
+box-shadow: ${1:${2:offset-x} ${3:offset-y} ${4:blur} ${5:spread} ${6:color}};$0
+endsnippet
+
+#
+# Colors
+#
+
+snippet rgb "color rgb"
+rgb(${1:255},${2:255},${3:255})$0
+endsnippet
+
+snippet rgba "color rgba"
+rgb(${1:255},${2:255},${3:255},${4:0.5})$0
+endsnippet
+
+snippet hsl "color hsl"
+hsl(${1:360},${2:100}%,${3:100}%)$0
+endsnippet
+
+snippet hsla "color hsla"
+hsla(${1:360},${2:100}%,${3:100}%,${4:0.5})$0
+endsnippet
+
 #
 # Selectors
 #
@@ -94,12 +126,6 @@ endsnippet
 #                    Most of these came from TextMate                     #
 ###########################################################################
 
-snippet fixed "Fixed Position Bottom 100% wide IE6"
-${2:bottom: auto;}top: expression(eval(document.documentElement.scrollTop+document.documentElement.clientHeight-${1:THE HEIGHT OF THIS THING IN PIXELS}));
-${3:left: expression(eval(document.documentElement.scrollLeft));
-}${4:width: expression(eval(document.documentElement.clientWidth));}$0
-endsnippet
-
 snippet background "background-attachment: scroll:fixed (background)"
 background-attachment: ${1:scroll/fixed};$0
 endsnippet
@@ -446,26 +472,10 @@ snippet text "text-indent: length (text)"
 text-indent: ${1:10}px;$0
 endsnippet
 
-snippet text "text-shadow: color-hex x y blur (text)"
-text-shadow: #${1:DDD} ${2:10px} ${3:10px} ${4:2px};$0
-endsnippet
-
-snippet text "text-shadow: color-rgb x y blur (text)"
-text-shadow: rgb(${1:255},${2:255},${3:255}) ${4:10px} ${5:10px} ${6:2px};$0
-endsnippet
-
-snippet text "text-shadow: none (text)"
-text-shadow: none;$0
-endsnippet
-
 snippet text "text-transform: capitalize:upper:lower (text)"
 text-transform: ${1:capitalize/uppercase/lowercase};$0
 endsnippet
 
-snippet text "text-transform: none (text)"
-text-transform: none;$0
-endsnippet
-
 snippet vertical "vertical-align: type (vertical)"
 vertical-align: ${1:baseline/sub/super/top/text-top/middle/bottom/text-bottom/length/%};$0
 endsnippet
@@ -482,10 +492,6 @@ snippet word "word-spacing:  length (word)"
 word-spacing: ${1:10px};$0
 endsnippet
 
-snippet word "word-spacing:  normal (word)"
-word-spacing: normal;$0
-endsnippet
-
 snippet z "z-index: index (z)"
 z-index: $1;$0
 endsnippet

From ad46f8d93485cd17e3f34360d86bf684805fcfdf Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 23 Oct 2014 10:32:11 +0100
Subject: [PATCH 0462/1587] ${1:text} snippets snippet

---
 snippets/snippets.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/snippets.snippets b/snippets/snippets.snippets
index a97c01698..dc8de42fc 100644
--- a/snippets/snippets.snippets
+++ b/snippets/snippets.snippets
@@ -7,3 +7,5 @@ snippet msnip
 		${0}
 snippet v
 	{VISUAL}
+snippet $
+	${${1:1}:${0:text}}

From d3f033b21df5f61f811f0c462f79c295d67b7559 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 24 Oct 2014 10:46:36 +0100
Subject: [PATCH 0463/1587] Ultisnips CSS colour spacing

---
 UltiSnips/css.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/css.snippets b/UltiSnips/css.snippets
index d1a310e9f..ff2650935 100644
--- a/UltiSnips/css.snippets
+++ b/UltiSnips/css.snippets
@@ -63,19 +63,19 @@ endsnippet
 #
 
 snippet rgb "color rgb"
-rgb(${1:255},${2:255},${3:255})$0
+rgb(${1:255}, ${2:255}, ${3:255})$0
 endsnippet
 
 snippet rgba "color rgba"
-rgb(${1:255},${2:255},${3:255},${4:0.5})$0
+rgba(${1:255}, ${2:255}, ${3:255}, ${4:0.5})$0
 endsnippet
 
 snippet hsl "color hsl"
-hsl(${1:360},${2:100}%,${3:100}%)$0
+hsl(${1:360}, ${2:100}%, ${3:100}%)$0
 endsnippet
 
 snippet hsla "color hsla"
-hsla(${1:360},${2:100}%,${3:100}%,${4:0.5})$0
+hsla(${1:360}, ${2:100}%, ${3:100}%, ${4:0.5})$0
 endsnippet
 
 #

From 1bdc25f4c36ed171c36bbc11cc0d4cb3da13caed Mon Sep 17 00:00:00 2001
From: yerv000 <yerv000@gmail.com>
Date: Fri, 24 Oct 2014 22:13:42 -0700
Subject: [PATCH 0464/1587] ol. and ol# are missing a double quote

ol. and ol# snippets are missing a double quote.
---
 snippets/html.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 5fb4aa921..7cb33dde1 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -674,11 +674,11 @@ snippet ol
 		${0}
 	</ol>
 snippet ol.
-	<ol class="${1}>
+	<ol class="${1}">
 		${0}
 	</ol>
 snippet ol#
-	<ol id="${1}>
+	<ol id="${1}">
 		${0}
 	</ol>
 snippet ol+

From 3c15b603228da5261864d51a15d1589dab657f35 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 28 Oct 2014 16:13:17 +0000
Subject: [PATCH 0465/1587] snippets haskell lambda

---
 snippets/haskell.snippets | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index ddb89d9ab..99cc5cd86 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -52,9 +52,11 @@ snippet do
 	do
 
 snippet λ
-	\${1:x} -> ${0}
+	\ ${1:x} -> ${0:expression}
 snippet \
-	\${1:x} -> ${0}
+	\${1:x} -> ${0:expression}
+snippet (\
+	(\${1:x} -> ${0:expression})
 snippet <-
 	${1:a} <- ${0:m a}
 snippet ←

From dd8afe92c7fa7ba362ce9fe5a2cf7f6dbf7df755 Mon Sep 17 00:00:00 2001
From: Craig Paterson <darksavant@gmail.com>
Date: Wed, 29 Oct 2014 16:21:34 +0200
Subject: [PATCH 0466/1587] Additional jasmine snippets for the following
 completions:

* toHaveBeenCalled
* toHaveBeenCalledWith
* not.toHaveBeenCalled
---
 UltiSnips/javascript_jasmine.snippets | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/UltiSnips/javascript_jasmine.snippets b/UltiSnips/javascript_jasmine.snippets
index e392459f4..e3f3ad70f 100644
--- a/UltiSnips/javascript_jasmine.snippets
+++ b/UltiSnips/javascript_jasmine.snippets
@@ -169,3 +169,16 @@ endsnippet
 snippet noscw "expect was not called with (js)" b
 expect(${1:target}).wasNotCalledWith(${2:arguments});
 endsnippet
+
+snippet ethbc "expect to have been called (js)" b
+expect(${1:target}).toHaveBeenCalled();
+endsnippet
+
+snippet nthbc "expect not to have been called (js)" b
+expect(${1:target}).not.toHaveBeenCalled();
+endsnippet
+
+snippet ethbcw "expect to have been called with (js)" b
+expect(${1:target}).toHaveBeenCalledWith(${2:arguments});
+endsnippet
+

From e00538f7724afb1af3884bf0255a497843fccfdd Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 30 Oct 2014 16:11:58 +0000
Subject: [PATCH 0467/1587] Debug Haskell lambda ultisnips

---
 snippets/haskell.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 99cc5cd86..20428303a 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -52,11 +52,11 @@ snippet do
 	do
 
 snippet λ
-	\ ${1:x} -> ${0:expression}
+	\\${1:x} -> ${0:expression}
 snippet \
-	\${1:x} -> ${0:expression}
+	\\${1:x} -> ${0:expression}
 snippet (\
-	(\${1:x} -> ${0:expression})
+	(\\${1:x} -> ${0:expression})
 snippet <-
 	${1:a} <- ${0:m a}
 snippet ←

From b1d1961540daee26f3cddd3062898c9b1f3cf22a Mon Sep 17 00:00:00 2001
From: Brian Hogan <brianhogan@napcs.com>
Date: Thu, 30 Oct 2014 16:56:52 -0500
Subject: [PATCH 0468/1587] Remove self-closing meta tags on HTML5 templates

In HTML5, it's not necessary, or common, to have self-closing tags. This
commit removes the self-closing meta tags for the html5 and html5l
Snipmate snippets.
---
 snippets/html.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 7cb33dde1..089a55202 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -462,8 +462,8 @@ snippet html5
 	<!DOCTYPE html>
 	<html>
 		<head>
-			<meta charset="utf-8" />
-			<meta name="viewport" content="width=device-width" />
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width">
 			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${2:link}
 		</head>
@@ -475,8 +475,8 @@ snippet html5l
 	<!DOCTYPE html>
 	<html lang="${1:es}">
 		<head>
-			<meta charset="utf-8" />
-			<meta name="viewport" content="width=device-width" />
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width">
 			<title>${2:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${3:link}
 		</head>

From ba1cc93be6e96f9729a49b27234de38e3bff828b Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 31 Oct 2014 11:31:03 +0000
Subject: [PATCH 0469/1587] Haskell Ultisnips type var cleanup

---
 UltiSnips/haskell.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets
index ad217fd8e..081734156 100644
--- a/UltiSnips/haskell.snippets
+++ b/UltiSnips/haskell.snippets
@@ -17,7 +17,7 @@ ${1:name} :: ${2:Type} -> ${3:Type}
 endsnippet
 
 snippet => "Type constraint"
-(${1:Class} ${2:Type var}) => ${3:$2}
+(${1:Class} ${2:a}) => $2
 endsnippet
 
 snippet def "Function definition"

From b788a4384e9ef700e089477792f1663839f81425 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 31 Oct 2014 11:47:01 +0000
Subject: [PATCH 0470/1587] Ultisnips haskell where, lambda nospace

---
 UltiSnips/haskell.snippets | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets
index 081734156..419edb4b7 100644
--- a/UltiSnips/haskell.snippets
+++ b/UltiSnips/haskell.snippets
@@ -50,7 +50,7 @@ snippet | "Guard"
 endsnippet
 
 snippet \ "Lambda expression"
-\ ${1:pattern} -> ${2:expression}
+\\${1:pattern} -> ${2:expression}
 endsnippet
 
 snippet [|] "List comprehension"
@@ -61,3 +61,8 @@ snippet let "let ... in ..."
 let ${1:name} = ${2:expression}
 in ${3:expression}
 endsnippet
+
+snippet wh "where x = expression"
+where
+	${1:name} = ${2:expression}
+endsnippet

From 73c6057cfd41c164621e352e613fe25a7515bc24 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 31 Oct 2014 12:43:46 +0000
Subject: [PATCH 0471/1587] Shorthand haskell import

---
 snippets/haskell.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 20428303a..4fecc9985 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -14,10 +14,14 @@ snippet info
 	--
 	-- ${0:Description}
 	--
+snippet imp
+	import ${0:Data.Text}
 snippet import
 	import           ${0:Data.Text}
 snippet import2
 	import           ${1:Data.Text} (${0:head})
+snippet impq
+	import qualified ${1:Data.Text} as ${0:T}
 snippet importq
 	import qualified ${1:Data.Text} as ${0:T}
 snippet inst

From 48118a1afc0208bfeaccf100219802bf728aaa39 Mon Sep 17 00:00:00 2001
From: Philipp Jovanovic <philipp@jovanovic.io>
Date: Sun, 2 Nov 2014 21:30:45 +0100
Subject: [PATCH 0472/1587] Add TeX Table environment

---
 UltiSnips/tex.snippets | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 406948c4a..4c7e44b45 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -14,6 +14,17 @@ $0${2/((?<=.)c|l|r)|./(?1: & )/g}
 \end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 endsnippet
 
+snippet table "Table environment" b
+\begin{table}[${1:htpb}]
+	\centering
+	\caption{${2:caption}}
+	\label{tab:${3:label}}
+	\begin{${4:t}${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${5:c}}
+	$0${5/((?<=.)c|l|r)|./(?1: & )/g}
+	\end{$4${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
+\end{table}
+endsnippet
+
 snippet fig "Figure environment" b
 \begin{figure}[${2:htpb}]
 	\centering

From db48e036a60ea976bcfd78760518cbeed8865fd4 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 3 Nov 2014 11:31:06 +0000
Subject: [PATCH 0473/1587] Scala: Tests add missing }, use === in assert

---
 snippets/scala.snippets | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index f824ee283..003081ef1 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -298,19 +298,25 @@ snippet scalatest
 	${0:import org.scalatest.FunSuite}
 #assert
 snippet assert
-	assert(${1:a}==${0:b})
+	assert(${1:a} === ${0:b})
 #ensuring(p 296)
 snippet ensuring
 	ifel ensuring(${1:a}==${0:b})
 #expect
 snippet expect
-	expect(${0:what}) {
+	expect(${1:what}) {
+		${0}
+	}
 #intercept
 snippet intercept
-	intercept[${0:IllegalArgumentException}] {
+	intercept[${1:IllegalArgumentException}] {
+		${0}
+	}
 #test
 snippet test
-	test("${0:description}") {
+	test("${1:description}") {
+		${0}
+	}
 #suite
 snippet suite
 	class ${0:name} extends Suite {

From 20c097830a1a5a313f764509a30890aaaf3d0343 Mon Sep 17 00:00:00 2001
From: rtorralba <rtorralba@nrs-group.com>
Date: Tue, 4 Nov 2014 12:59:18 +0100
Subject: [PATCH 0474/1587] added codeigniter snippets

---
 snippets/ci.snippets | 103 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 snippets/ci.snippets

diff --git a/snippets/ci.snippets b/snippets/ci.snippets
new file mode 100644
index 000000000..cb0e86255
--- /dev/null
+++ b/snippets/ci.snippets
@@ -0,0 +1,103 @@
+# Based on nebjak/snipmate.vim/snippets/php.snippets
+
+# Controller
+snippet cic
+	class ${1:ClassName} extends CI_Controller {
+		function __construct() {
+			parent::__construct();
+			${2:// code...}
+		}
+
+		function ${3:index}() {
+			${4:// code...}
+		}
+	}
+# Model
+snippet cim
+	class ${1:ClassName_model} extends CI_Model {
+		function __construct() {
+			parent::__construct();
+			${2:// code...}
+		}
+	} 
+# Load view
+snippet cilv
+	$this->load->view("${1:view_name}", $${2:data});${3}
+# DB Class snippets
+snippet cidbi
+	$this->db->insert("${1:table}", $${2:data});${3}
+snippet cidbs
+	$this->db->select("${1:id, ...}");${2}
+snippet cidbf
+	$this->db->from("${1:table}");${2}
+snippet cidbj
+	$this->db->join("${1:table}", "${2:condition}", "${3:type}");${4}
+snippet cidbw
+	$this->db->where("${1:key}", "${2:value}");${3}
+snippet cidbow
+	$this->db->or_where("${1:key}", "${2:value}");${3}
+snippet cidbg
+	$this->db->get("${1:table}", ${2:limit}, ${3:offset});${4}
+snippet cidbd
+	$this->db->delete("${1:table}", "${2:where}");${3}
+snippet cidbu
+	$this->db->update("${1:table}", $${2:set}, $${3:where});${4}
+# Input Class snippets
+snippet ciip
+	$this->input->post("${1:index}");${2}
+snippet ciig
+	$this->input->get("${1:index}");${2}
+snippet ciic
+	$this->input->cookie("${1:index}");${2}
+snippet ciis
+	$this->input->server("${1:index}");${2}
+snippet ciiua
+	$this->input->user_agent();${1}
+snippet ciiajax
+	$this->input->is_ajax_request();${1}
+snippet ciicli
+	$this->input->is_cli_request();${1}
+# Form Validation Class and Form Helper snippets
+snippet cifvsr
+	$this->form_validation->set_rules("${1:field}", "${2:label}", "${3:trim|required}");${4}
+snippet cifo
+	form_open("${1:action}");${2}
+snippet cifom
+	form_open_multipart("${1:action}");${2}
+snippet cifh
+	form_hidden("${1:name}", "${2:value}");${3}
+snippet cifi
+	form_input("${1:name}", "${2:value}");${3}
+snippet cifp
+	form_password("${1:name}", "${2:value}");${3}
+snippet cifu
+	form_upload("${1:name}", "${2:value}");${3}
+snippet cifta
+	form_textarea("${1:name}", "${2:value}");${3}
+snippet cifdd
+	form_dropdown("${1:name}", $${2:options}, $${3:selected);${4}
+snippet cifcb
+	form_checkbox("${1:name}", "${2:value}");${3}
+snippet cifr
+	form_radio("${1:name}", "${2:value}");${3}
+snippet cifsub
+	form_submit("${1:name}", "${2:value}");${3}
+snippet cifres
+	form_reset("${1:name}", "${2:value}");${3}
+snippet cifbut
+	form_button("${1:name}", "${2:value}");${3}
+snippet ciflab
+	form_label("${1:label text}", "${2:id}");${3}
+snippet cifc
+	form_close();${1}
+snippet civerr
+	validation_errors();${1}
+# Session Class snippets
+snippet cisud
+	$this->session->userdata("${1:item}");${2}
+snippet cissud
+	$this->session->set_userdata($${1:array});${2}
+snippet cisfd
+	$this->session->flashdata("${1:item}");${2}
+snippet cissfd
+	$this->session->set_flashdata("${1:item}", "${2:value}");${3}

From dc2db83d140fe6e51b47e65c33e3f0cad92d0f27 Mon Sep 17 00:00:00 2001
From: rtorralba <rtorralba@nrs-group.com>
Date: Tue, 4 Nov 2014 13:22:29 +0100
Subject: [PATCH 0475/1587] rename ci.snippets to codeigniter.snippets

---
 snippets/{ci.snippets => codeigniter.snippets} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename snippets/{ci.snippets => codeigniter.snippets} (100%)

diff --git a/snippets/ci.snippets b/snippets/codeigniter.snippets
similarity index 100%
rename from snippets/ci.snippets
rename to snippets/codeigniter.snippets

From ba77d58d08bb706df7c5240edde073883f9f12df Mon Sep 17 00:00:00 2001
From: rtorralba <raul.torralba@artansoft.com>
Date: Wed, 5 Nov 2014 00:03:21 +0100
Subject: [PATCH 0476/1587] rename snippets key for to give more information
 about snippet

---
 snippets/codeigniter.snippets | 80 +++++++++++++++++------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/snippets/codeigniter.snippets b/snippets/codeigniter.snippets
index cb0e86255..5dcd2da15 100644
--- a/snippets/codeigniter.snippets
+++ b/snippets/codeigniter.snippets
@@ -1,7 +1,7 @@
 # Based on nebjak/snipmate.vim/snippets/php.snippets
 
 # Controller
-snippet cic
+snippet ci_controller
 	class ${1:ClassName} extends CI_Controller {
 		function __construct() {
 			parent::__construct();
@@ -13,7 +13,7 @@ snippet cic
 		}
 	}
 # Model
-snippet cim
+snippet ci_model
 	class ${1:ClassName_model} extends CI_Model {
 		function __construct() {
 			parent::__construct();
@@ -21,83 +21,83 @@ snippet cim
 		}
 	} 
 # Load view
-snippet cilv
+snippet ci_load-view
 	$this->load->view("${1:view_name}", $${2:data});${3}
 # DB Class snippets
-snippet cidbi
+snippet ci_db-insert
 	$this->db->insert("${1:table}", $${2:data});${3}
-snippet cidbs
+snippet ci_db-select
 	$this->db->select("${1:id, ...}");${2}
-snippet cidbf
+snippet ci_db-from
 	$this->db->from("${1:table}");${2}
-snippet cidbj
+snippet ci_db-join
 	$this->db->join("${1:table}", "${2:condition}", "${3:type}");${4}
-snippet cidbw
+snippet ci_db-where
 	$this->db->where("${1:key}", "${2:value}");${3}
-snippet cidbow
+snippet ci_db-or_where
 	$this->db->or_where("${1:key}", "${2:value}");${3}
-snippet cidbg
+snippet ci_db-get
 	$this->db->get("${1:table}", ${2:limit}, ${3:offset});${4}
-snippet cidbd
+snippet ci_db-delete
 	$this->db->delete("${1:table}", "${2:where}");${3}
-snippet cidbu
+snippet ci_db-update
 	$this->db->update("${1:table}", $${2:set}, $${3:where});${4}
 # Input Class snippets
-snippet ciip
+snippet ci_input-post
 	$this->input->post("${1:index}");${2}
-snippet ciig
+snippet ci_input-get
 	$this->input->get("${1:index}");${2}
-snippet ciic
+snippet ci_input-cookie
 	$this->input->cookie("${1:index}");${2}
-snippet ciis
+snippet ci_input-server
 	$this->input->server("${1:index}");${2}
-snippet ciiua
+snippet ci_input-user_agent
 	$this->input->user_agent();${1}
-snippet ciiajax
+snippet ci_input-is_ajax_request
 	$this->input->is_ajax_request();${1}
-snippet ciicli
+snippet ci_input-is_cli_request
 	$this->input->is_cli_request();${1}
 # Form Validation Class and Form Helper snippets
-snippet cifvsr
+snippet ci_form_validation-set_rules
 	$this->form_validation->set_rules("${1:field}", "${2:label}", "${3:trim|required}");${4}
-snippet cifo
+snippet ci_form_open
 	form_open("${1:action}");${2}
-snippet cifom
+snippet ci_form_open_multipart
 	form_open_multipart("${1:action}");${2}
-snippet cifh
+snippet ci_form_hidden
 	form_hidden("${1:name}", "${2:value}");${3}
-snippet cifi
+snippet ci_form_input
 	form_input("${1:name}", "${2:value}");${3}
-snippet cifp
+snippet ci_form_password
 	form_password("${1:name}", "${2:value}");${3}
-snippet cifu
+snippet ci_form_upload
 	form_upload("${1:name}", "${2:value}");${3}
-snippet cifta
+snippet ci_form_textarea
 	form_textarea("${1:name}", "${2:value}");${3}
-snippet cifdd
+snippet ci_form_dropdown
 	form_dropdown("${1:name}", $${2:options}, $${3:selected);${4}
-snippet cifcb
+snippet ci_form_checkbox
 	form_checkbox("${1:name}", "${2:value}");${3}
-snippet cifr
+snippet ci_form_radio
 	form_radio("${1:name}", "${2:value}");${3}
-snippet cifsub
+snippet ci_form_submit
 	form_submit("${1:name}", "${2:value}");${3}
-snippet cifres
+snippet ci_form_reset
 	form_reset("${1:name}", "${2:value}");${3}
-snippet cifbut
+snippet ci_form_button
 	form_button("${1:name}", "${2:value}");${3}
-snippet ciflab
+snippet ci_form_label
 	form_label("${1:label text}", "${2:id}");${3}
-snippet cifc
+snippet ci_form_close
 	form_close();${1}
-snippet civerr
+snippet ci_validation_errors
 	validation_errors();${1}
 # Session Class snippets
-snippet cisud
+snippet ci_session_userdata
 	$this->session->userdata("${1:item}");${2}
-snippet cissud
+snippet ci_session_set_userdata
 	$this->session->set_userdata($${1:array});${2}
-snippet cisfd
+snippet ci_session_flashdata
 	$this->session->flashdata("${1:item}");${2}
-snippet cissfd
+snippet ci_session_set_flashdata
 	$this->session->set_flashdata("${1:item}", "${2:value}");${3}

From 2297e3f411503dd60875d017fa129815506a8123 Mon Sep 17 00:00:00 2001
From: Alexey Shevchenko <thefelikz@gmail.com>
Date: Thu, 6 Nov 2014 13:12:19 +0200
Subject: [PATCH 0477/1587] Actionscript: remove duplicate warning for 
 statement

---
 snippets/actionscript.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/snippets/actionscript.snippets b/snippets/actionscript.snippets
index 6b1d8ebe6..b7aa7cb33 100644
--- a/snippets/actionscript.snippets
+++ b/snippets/actionscript.snippets
@@ -75,10 +75,6 @@ snippet do
 	do {
 		${0}
 	} while (${1:cond})
-snippet wh
-	while ${1:cond}{
-		${0}
-	}
 snippet for enumerate names
 	for (${1:var} in ${2:object}){
 		${0}

From 5271ea5a1d8710bfd123801fb45742ff3a60a3e6 Mon Sep 17 00:00:00 2001
From: rtorralba <rtorralba@nrs-group.com>
Date: Fri, 7 Nov 2014 15:48:03 +0100
Subject: [PATCH 0478/1587] improved some snippets

---
 snippets/codeigniter.snippets | 58 ++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/snippets/codeigniter.snippets b/snippets/codeigniter.snippets
index 5dcd2da15..0fabcc579 100644
--- a/snippets/codeigniter.snippets
+++ b/snippets/codeigniter.snippets
@@ -2,24 +2,72 @@
 
 # Controller
 snippet ci_controller
-	class ${1:ClassName} extends CI_Controller {
-		function __construct() {
+	<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+	class ${1:ClassName} extends CI_Controller
+	{
+		function __construct()
+		{
 			parent::__construct();
 			${2:// code...}
 		}
 
-		function ${3:index}() {
+		function ${3:index}()
+		{
 			${4:// code...}
 		}
 	}
 # Model
 snippet ci_model
-	class ${1:ClassName_model} extends CI_Model {
-		function __construct() {
+	<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+	class ${1:ClassName_model} extends CI_Model
+	{
+		function __construct()
+		{
 			parent::__construct();
 			${2:// code...}
 		}
 	} 
+snippet ci_model_complet
+	<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+	class ${1:ClassName_model} extends CI_Model
+	{
+		private $table = '${2:table_name}';
+
+		function __construct()
+		{
+			parent::__construct();
+			${2:// code...}
+		}
+
+		public function getRows()
+		{
+			return $this->db->get($table)->result();
+		}
+
+		public function getRow($id)
+		{
+			return $this->db->get_where($table, array('id', $id))->result();
+		}
+
+		public function insert($data)
+		{
+			if($this->db->insert($table, $data))
+				return true;
+			else
+				return false;
+		}
+
+		public function update($id, $data)
+		{
+			if($this->db->where('id', $id)->update($table, $data))
+				return true;
+			else
+				return false;
+		}
+	}
 # Load view
 snippet ci_load-view
 	$this->load->view("${1:view_name}", $${2:data});${3}

From 45d25d84cc2e1f4ac76cc236a72820cb064c5188 Mon Sep 17 00:00:00 2001
From: rtorralba <raul.torralba@artansoft.com>
Date: Sat, 8 Nov 2014 11:19:31 +0100
Subject: [PATCH 0479/1587] renamed ci_model_complet to ci_model_crudl and
 improved

---
 snippets/codeigniter.snippets | 89 ++++++++++++++++++++++++++++++-----
 1 file changed, 78 insertions(+), 11 deletions(-)

diff --git a/snippets/codeigniter.snippets b/snippets/codeigniter.snippets
index 0fabcc579..7adf1e954 100644
--- a/snippets/codeigniter.snippets
+++ b/snippets/codeigniter.snippets
@@ -29,7 +29,7 @@ snippet ci_model
 			${2:// code...}
 		}
 	} 
-snippet ci_model_complet
+snippet ci_model_crudl
 	<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
 	class ${1:ClassName_model} extends CI_Model
@@ -39,34 +39,101 @@ snippet ci_model_complet
 		function __construct()
 		{
 			parent::__construct();
-			${2:// code...}
+			${3:// code...}
 		}
 
-		public function getRows()
+		// public create(data) {{{
+		/**
+		 * create
+		 *
+		 * @param mixed $data
+		 * @access public
+		 * @return boolean
+		 */
+		public function create($data)
 		{
-			return $this->db->get($table)->result();
+			if($this->db->insert($table, $data))
+				return true;
+			else
+				return false;
 		}
+		// }}}
 
-		public function getRow($id)
+		// public read(id) {{{
+		/**
+		 * read
+		 *
+		 * @param int $id
+		 * @access public
+		 * @return boolean
+		 */
+		public function read($id)
 		{
 			return $this->db->get_where($table, array('id', $id))->result();
 		}
+		// }}}
 
-		public function insert($data)
+		// public update(id,data) {{{
+		/**
+		 * update
+		 *
+		 * @param int $id
+		 * @param mixed $data
+		 * @access public
+		 * @return boolean
+		 */
+		public function update($id, $data)
 		{
-			if($this->db->insert($table, $data))
+			if($this->db->update($table, $data, array('id' => $id)))
 				return true;
 			else
 				return false;
 		}
+		// }}}
 
-		public function update($id, $data)
+		// public delete(id) {{{
+		/**
+		 * delete
+		 *
+		 * @param mixed $id (int o array of int)
+		 * @access public
+		 * @return boolean
+		 */
+		public function delete($id)
 		{
-			if($this->db->where('id', $id)->update($table, $data))
-				return true;
+			if(is_array($id))
+			{
+				$this->db->trans_start();
+				foreach($id as $elem)
+					$this->db->delete($table, array('id' => $elem));
+				$this->db->trans_complete();
+			}
 			else
-				return false;
+			{
+				if($this->db->delete($table, array('id' => $id)))
+					return true;
+				else
+					return false;
+			}
+		}
+		// }}}
+
+		// public listRows(limit=null,offset=0) {{{
+		/**
+		 * listRows
+		 *
+		 * @param int $limit
+		 * @param int $offset
+		 * @access public
+		 * @return boolean
+		 */
+		public function listRows($limit = null, $offset = 0)
+		{
+			if(!is_null($limit))
+				$this->db->limit($limit, $offset);
+			return $this->db->get($table)->result();
 		}
+		// }}}
 	}
 # Load view
 snippet ci_load-view

From 03d94e780d38e4188590e2fd8c1b6998057924ad Mon Sep 17 00:00:00 2001
From: Mario de Frutos <ethervoid@gmail.com>
Date: Tue, 11 Nov 2014 17:28:53 +0100
Subject: [PATCH 0480/1587] Added phpunit comment with group option

---
 UltiSnips/php_phpunit.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/php_phpunit.snippets b/UltiSnips/php_phpunit.snippets
index 1a310a191..e928bb1e7 100644
--- a/UltiSnips/php_phpunit.snippets
+++ b/UltiSnips/php_phpunit.snippets
@@ -30,3 +30,9 @@ expects($this->${1:once}())
 	->with($this->equalTo(${3})${4})
 	->will($this->returnValue(${5}));
 endsnippet
+
+snippet testcmt "phpunit comment with group" b
+/**
+* @group ${1}
+*/
+endsnippet

From a7231e85657ff272bf6ee82842685d182471b138 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 14 Nov 2014 12:39:59 +0000
Subject: [PATCH 0481/1587] Javascrip: vf, make "var" optional

---
 UltiSnips/javascript.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 5889e0591..ee9a98771 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -52,6 +52,12 @@ function ${1:function_name}(${2:argument}) {
 }
 endsnippet
 
+snippet vf "Function assigned to var"
+${1:var }${2:function_name} = function $2(${3}) {
+	${VISUAL}$0
+};
+endsnippet
+
 snippet iife "Immediately-Invoked Function Expression (iife)"
 (function (${1:argument}) {
 	${VISUAL}$0

From 7f315def33b9b8200fc012da0298d21f1f7b9fe2 Mon Sep 17 00:00:00 2001
From: Chris Dueck <cdueck93@hotmail.com>
Date: Wed, 19 Nov 2014 16:44:39 -0500
Subject: [PATCH 0482/1587] add INLINE snippet for Haskell

---
 snippets/haskell.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 4fecc9985..633c9aaf7 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -2,6 +2,8 @@ snippet lang
 	{-# LANGUAGE ${0:OverloadedStrings} #-}
 snippet haddock
 	{-# OPTIONS_HADDOCK ${0:hide} #-}
+snippet inline
+	{-# INLINE ${0:name} #-}
 snippet info
 	-- |
 	-- Module      :  ${1:Module.Namespace}

From 3ecf47c131d8f98a08a0a468af9ee450f1f40d8b Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Thu, 20 Nov 2014 18:45:34 +0100
Subject: [PATCH 0483/1587] Markdown autolinks <url>

---
 snippets/markdown.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index fd2f29718..a72d7710d 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -22,6 +22,12 @@ snippet ![:
 snippet ![:*
 	![${1:id}]: ${2:`@*`} "${0:title}"
 
+snippet <
+	<http://${1:url}>
+snippet <*
+	<`@*`>
+snippet <c
+	<`@+`>
 snippet ===
 	`repeat('=', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 

From e3ea6460fe42f07022a821727039072af6c79264 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Thu, 20 Nov 2014 19:06:47 +0100
Subject: [PATCH 0484/1587] Let the short version of links not have title

and create versions with title with "

Rationale: it is more common to have links without title in Markdown.
---
 snippets/markdown.snippets | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index fd2f29718..915a06f54 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -3,23 +3,43 @@
 # Includes octopress (http://octopress.org/) snippets
 
 snippet [
-	[${1:text}](http://${2:address} "${0:title}")
+	[${1:text}](http://${2:address})
 snippet [*
+	[${1:link}](${2:`@*`})
+
+snippet ["
+	[${1:text}](http://${2:address} "${0:title}")
+snippet ["*
 	[${1:link}](${2:`@*`} "${3:title}")
 
 snippet [:
-	[${1:id}]: http://${2:url} "${0:title}"
+	[${1:id}]: http://${2:url}
 snippet [:*
+	[${1:id}]: ${2:`@*`}
+
+snippet [:"
+	[${1:id}]: http://${2:url} "${0:title}"
+snippet [:"*
 	[${1:id}]: ${2:`@*`} "${0:title}"
 
 snippet ![
-	![${1:alttext}](${2:/images/image.jpg} "${0:title}")
+	![${1:alttext}](${2:/images/image.jpg})
 snippet ![*
+	![${1:alt}](${2:`@*`})
+
+snippet !["
+	![${1:alttext}](${2:/images/image.jpg} "${0:title}")
+snippet !["*
 	![${1:alt}](${2:`@*`} "${3:title}")
 
 snippet ![:
-	![${1:id}]: ${2:url} "${0:title}"
+	![${1:id}]: ${2:url}
 snippet ![:*
+	![${1:id}]: ${2:`@*`}
+
+snippet ![:"
+	![${1:id}]: ${2:url} "${0:title}"
+snippet ![:"*
 	![${1:id}]: ${2:`@*`} "${0:title}"
 
 snippet ===

From fbbe71e534ea621ad022c6c44649ce20dd4f334b Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Thu, 20 Nov 2014 19:17:18 +0100
Subject: [PATCH 0485/1587] Fix markdown fenced code blocks.

Broken because backticks were interpreted as vim code execution.

Also simplified the trigger which was too long and unintuitive.
---
 snippets/markdown.snippets | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index fd2f29718..b353569f0 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -46,15 +46,16 @@ snippet blockquote-link
 	${0:quote}
 	{% endblockquote %}
 
-snippet bt-codeblock-short
-	```
-	${0:code_snippet}
-	```
-
-snippet bt-codeblock-full
-	``` ${1:language} ${2:title} ${3:URL} ${4:link_text}
-	${0:code_snippet}
-	```
+snippet ```
+	\`\`\`
+	${1:code}
+	\`\`\`
+
+# Language.
+snippet ```l
+	\`\`\`${1:language}
+	${2:code}
+	\`\`\`
 
 snippet codeblock-short
 	{% codeblock %}

From 2b09325fc161a1715f26d669537ae0cce6ef8d40 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Thu, 20 Nov 2014 18:55:42 +0100
Subject: [PATCH 0486/1587] Make markdown links consistent on cursor exits

Make the versions of link with and without * behave alike:

-   don't set the 0 location so that the cursor exits.
    Having a 0 in the title is bad because titles are short.

-   either open a new line at end for both, or for neither

    The only case where the newline is certain is for link definitions.
---
 snippets/markdown.snippets | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index 147a41cc1..e93cee1f4 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -6,41 +6,41 @@ snippet [
 	[${1:text}](http://${2:address})
 snippet [*
 	[${1:link}](${2:`@*`})
-
 snippet ["
-	[${1:text}](http://${2:address} "${0:title}")
+	[${1:text}](http://${2:address} "${3:title}")
 snippet ["*
 	[${1:link}](${2:`@*`} "${3:title}")
-
 snippet [:
 	[${1:id}]: http://${2:url}
+
 snippet [:*
 	[${1:id}]: ${2:`@*`}
 
 snippet [:"
-	[${1:id}]: http://${2:url} "${0:title}"
+	[${1:id}]: http://${2:url} "${3:title}"
+
 snippet [:"*
-	[${1:id}]: ${2:`@*`} "${0:title}"
+	[${1:id}]: ${2:`@*`} "${3:title}"
 
 snippet ![
 	![${1:alttext}](${2:/images/image.jpg})
 snippet ![*
 	![${1:alt}](${2:`@*`})
-
 snippet !["
-	![${1:alttext}](${2:/images/image.jpg} "${0:title}")
+	![${1:alttext}](${2:/images/image.jpg} "${3:title}")
 snippet !["*
 	![${1:alt}](${2:`@*`} "${3:title}")
-
 snippet ![:
 	![${1:id}]: ${2:url}
+
 snippet ![:*
 	![${1:id}]: ${2:`@*`}
 
 snippet ![:"
-	![${1:id}]: ${2:url} "${0:title}"
+	![${1:id}]: ${2:url} "${3:title}"
+
 snippet ![:"*
-	![${1:id}]: ${2:`@*`} "${0:title}"
+	![${1:id}]: ${2:`@*`} "${3:title}"
 
 snippet <
 	<http://${1:url}>

From d00ca9f573405e61ea4af5a2101e7b697d6bd8be Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Thu, 20 Nov 2014 18:37:46 +0100
Subject: [PATCH 0487/1587] Markdown links from the clipboard

---
 snippets/markdown.snippets | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index e93cee1f4..08cdb45ed 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -2,34 +2,50 @@
 
 # Includes octopress (http://octopress.org/) snippets
 
+# The suffix `c` stands for "Clipboard".
+
 snippet [
 	[${1:text}](http://${2:address})
 snippet [*
 	[${1:link}](${2:`@*`})
+snippet [c
+	[${1:link}](${2:`@+`})
 snippet ["
 	[${1:text}](http://${2:address} "${3:title}")
 snippet ["*
 	[${1:link}](${2:`@*`} "${3:title}")
+snippet ["c
+	[${1:link}](${2:`@+`} "${3:title}")
 snippet [:
 	[${1:id}]: http://${2:url}
 
 snippet [:*
 	[${1:id}]: ${2:`@*`}
 
+snippet [:c
+	[${1:id}]: ${2:`@+`}
+
 snippet [:"
 	[${1:id}]: http://${2:url} "${3:title}"
 
 snippet [:"*
 	[${1:id}]: ${2:`@*`} "${3:title}"
 
+snippet [:"c
+	[${1:id}]: ${2:`@+`} "${3:title}"
+
 snippet ![
 	![${1:alttext}](${2:/images/image.jpg})
 snippet ![*
 	![${1:alt}](${2:`@*`})
+snippet ![c
+	![${1:alt}](${2:`@+`})
 snippet !["
 	![${1:alttext}](${2:/images/image.jpg} "${3:title}")
 snippet !["*
 	![${1:alt}](${2:`@*`} "${3:title}")
+snippet !["c
+	![${1:alt}](${2:`@+`} "${3:title}")
 snippet ![:
 	![${1:id}]: ${2:url}
 
@@ -42,6 +58,9 @@ snippet ![:"
 snippet ![:"*
 	![${1:id}]: ${2:`@*`} "${3:title}"
 
+snippet ![:"c
+	![${1:id}]: ${2:`@+`} "${3:title}"
+
 snippet <
 	<http://${1:url}>
 snippet <*

From 3b1f079e2d4fef41b84fbedbf5bcc385e389dc60 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Thu, 20 Nov 2014 19:22:29 +0100
Subject: [PATCH 0488/1587] Markdown bold and italic

---
 snippets/markdown.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index 147a41cc1..5bed6cdc1 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -48,6 +48,10 @@ snippet <*
 	<`@*`>
 snippet <c
 	<`@+`>
+snippet **
+	**${1:bold}**
+snippet __
+	__${1:bold}__
 snippet ===
 	`repeat('=', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 

From 78c2c1dc3be4709930a3a8efe0ce8ca3456a510e Mon Sep 17 00:00:00 2001
From: Louis Pilfold <lpil@users.noreply.github.com>
Date: Tue, 25 Nov 2014 10:52:27 +0000
Subject: [PATCH 0489/1587] Remove duplicated html5 snippet

Exists in snipmate form
---
 UltiSnips/html.snippets | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 079db9143..cc20e3449 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -287,22 +287,4 @@ snippet movie "Embed QT movie (movie)" b
 	`!p x(snip)`>
 </object>
 endsnippet
-
-snippet html5 "HTML5 Template"
-<!DOCTYPE html>
-<html>
-<head>
-	<title>${1}</title>
-	<meta charset="utf-8" />
-</head>
-<body>
-	<header>
-		${2}
-	</header>
-	<footer>
-		${4}
-	</footer>
-</body>
-</html>
-endsnippet
 # vim:ft=snippets:

From 4c988d2012a36ae57d83cefb03f9278d7d8493b8 Mon Sep 17 00:00:00 2001
From: Gustavo Chain <gchain@gmail.com>
Date: Wed, 26 Nov 2014 11:46:41 +0000
Subject: [PATCH 0490/1587] Add receiver to fum snippet

---
 snippets/go.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 8623eda28..dafc6e4dc 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -148,8 +148,8 @@ snippet fun
 	${0}
 # function on receiver
 snippet fum
-	func (self ${1:type}) ${2:funcName}(${3}) ${4:error} {
-		${5}
+	func (${1:receiver} ${2:type}) ${3:funcName}(${4}) ${5:error} {
+		${6}
 	}
 	${0}
 # log printf

From b7fb63cd150e3e26792ad5e66cb3d15f6e279259 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 27 Nov 2014 13:45:32 +0000
Subject: [PATCH 0491/1587] Ruby: def with params to fill style guide

---
 UltiSnips/ruby.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index 09a114f6c..72d5bb344 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -86,7 +86,7 @@ endsnippet
 
 
 snippet "\b(de)?f" "def <name>..." r
-def ${1:function_name}${2: ${3:*args}}
+def ${1:function_name}${2:(${3:*args})}
 	${0:# TODO}
 end
 endsnippet
@@ -94,7 +94,7 @@ endsnippet
 
 
 snippet defi "def initialize ..."
-def initialize${1: ${2:*args}}
+def initialize${1:(${2:*args})}
 	${0:# TODO}
 end
 endsnippet
@@ -102,7 +102,7 @@ endsnippet
 
 
 snippet defr "def <name> ... rescue ..."
-def ${1:function_name}${2: ${3:*args}}
+def ${1:function_name}${2:(${3:*args})}
 	${4:# TODO}
 rescue
 	${0:# TODO}
@@ -545,7 +545,7 @@ endsnippet
 
 snippet class "class <class_name> def initialize ... end end"
 class ${1:class_name}
-	def initialize ${2:*args}
+	def initialize(${2:*args})
 		$0
 	end
 end

From c46251515f433350fdda4ffa6122c9d3ffd613e1 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 27 Nov 2014 13:48:28 +0000
Subject: [PATCH 0492/1587] Ruby: Remove excessive whitespace

---
 UltiSnips/ruby.snippets | 131 ----------------------------------------
 1 file changed, 131 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index 72d5bb344..e3cc1b24f 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -5,34 +5,25 @@ snippet "^#!" "#!/usr/bin/env ruby" r
 $0
 endsnippet
 
-
 snippet "^# ?[uU][tT][fF]-?8" "# encoding: UTF-8" r
 # encoding: UTF-8
 $0
 endsnippet
 
-
-
 snippet If "<command> if <expression>"
 ${1:command} if ${0:expression}
 endsnippet
 
-
-
 snippet Unless "<command> unless <expression>"
 ${1:command} unless ${0:expression}
 endsnippet
 
-
-
 snippet if "if <condition> ... end"
 if ${1:condition}
 	${2:# TODO}
 end
 endsnippet
 
-
-
 snippet ife "if <condition> ... else ... end"
 if ${1:condition}
 	${2:# TODO}
@@ -41,8 +32,6 @@ else
 end
 endsnippet
 
-
-
 snippet ifee "if <condition> ... elseif <condition> ... else ... end"
 if ${1:condition}
 	${2:# TODO}
@@ -53,16 +42,12 @@ else
 end
 endsnippet
 
-
-
 snippet unless "unless <condition> ... end"
 unless ${1:condition}
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet unlesse "unless <condition> ... else ... end"
 unless ${1:condition}
 	${2:# TODO}
@@ -71,8 +56,6 @@ else
 end
 endsnippet
 
-
-
 snippet unlesee "unless <condition> ... elseif <condition> ... else ... end"
 unless ${1:condition}
 	${2:# TODO}
@@ -83,24 +66,18 @@ else
 end
 endsnippet
 
-
-
 snippet "\b(de)?f" "def <name>..." r
 def ${1:function_name}${2:(${3:*args})}
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet defi "def initialize ..."
 def initialize${1:(${2:*args})}
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet defr "def <name> ... rescue ..."
 def ${1:function_name}${2:(${3:*args})}
 	${4:# TODO}
@@ -109,163 +86,116 @@ rescue
 end
 endsnippet
 
-
-
 snippet For "(<from>..<to>).each { |<i>| <block> }"
 (${1:from}..${2:to}).each { |${3:i}| ${4:# TODO} }
 endsnippet
 
-
-
 snippet for "(<from>..<to>).each do |<i>| <block> end"
 (${1:from}..${2:to}).each do |${3:i}|
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Merge!" ".merge!(<other_hash>) { |<key>,<oldval>,<newval>| <block> }" r
 `!p snip.rv=match.group(1)`.merge!(${1:other_hash}) { |${2:key},${3:oldval},${4:newval}| ${5:block} }
 endsnippet
 
-
-
 snippet "(\S+)\.merge!" ".merge!(<other_hash>) do |<key>,<oldval>,<newval>| <block> end" r
 `!p snip.rv=match.group(1)`.merge!(${1:other_hash}) do |${2:key},${3:oldval},${4:newval}|
 	${0:block}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Del(ete)?_?if" ".delete_if { |<key>,<value>| <block> }" r
 `!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3:# TODO} }
 endsnippet
 
-
-
 snippet "(\S+)\.del(ete)?_?if" ".delete_if do |<key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.delete_if do |${1:key},${2:value}|
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Keep_?if" ".keep_if { |<key>,<value>| <block> }" r
 `!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3:# TODO} }
 endsnippet
 
-
-
 snippet "(\S+)\.keep_?if" ".keep_if do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.keep_if do |${1:key},${2:value}|
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Reject" ".reject { |<key>,<value>| <block> }" r
 `!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3:# TODO} }
 endsnippet
 
-
-
 snippet "(\S+)\.reject" ".reject do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.reject do |${1:key},${2:value}|
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Select" ".select { |<item>| <block>}" r
 `!p snip.rv=match.group(1)`.select { |${1:item}| ${2:block} }
 endsnippet
 
-
-
 snippet "(\S+)\.select" ".select do |<item>| <block> end" r
 `!p snip.rv=match.group(1)`.select do |${1:item}|
 	${0:block}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Sort" ".sort { |<a>,<b>| <block> }" r
 `!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3:# TODO} }
 endsnippet
 
-
-
 snippet "(\S+)\.sort" ".sort do |<a>,<b>| <block> end" r
 `!p snip.rv=match.group(1)`.sort do |${1:a},${2:b}|
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Each_?k(ey)?" ".each_key { |<key>| <block> }" r
 `!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2:# TODO} }
 endsnippet
 
-
-
 snippet "(\S+)\.each_?k(ey)?" ".each_key do |key| <block> end" r
 `!p snip.rv=match.group(1)`.each_key do |${1:key}|
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Each_?val(ue)?" ".each_value { |<value>| <block> }" r
 `!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2:# TODO} }
 endsnippet
 
-
-
 snippet "(\S+)\.each_?val(ue)?" ".each_value do |<value>| <block> end" r
 `!p snip.rv=match.group(1)`.each_value do |${1:value}|
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet Each "<elements>.each { |<element>| <block> }"
 ${1:elements}.each { |${2:${1/s$//}}| ${3:# TODO} }
 endsnippet
 
-
-
 snippet each "<elements>.each do |<element>| <block> end"
 ${1:elements}.each do |${2:${1/s$//}}|
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet "each_?s(lice)?" "<array>.each_slice(n) do |slice| <block> end" r
 ${1:elements}.each_slice(${2:2}) do |${3:slice}|
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet "Each_?s(lice)?" "<array>.each_slice(n) { |slice| <block> }" r
 ${1:elements}.each_slice(${2:2}) { |${3:slice}| ${0:# TODO} }
 endsnippet
 
-
-
-
 snippet "(\S+)\.Map" ".map { |<element>| <block> }" r
 `!p snip.rv=match.group(1)`.map { |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -278,8 +208,6 @@ except:
 `}| ${2:# TODO} }
 endsnippet
 
-
-
 snippet "(\S+)\.map" ".map do |<element>| <block> end" r
 `!p snip.rv=match.group(1)`.map do |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -294,8 +222,6 @@ except:
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Rev(erse)?_?each" ".reverse_each { |<element>| <block> }" r
 `!p snip.rv=match.group(1)`.reverse_each { |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -308,8 +234,6 @@ except:
 `}| ${2:# TODO} }
 endsnippet
 
-
-
 snippet "(\S+)\.rev(erse)?_?each" ".reverse_each do |<element>| <block> end" r
 `!p snip.rv=match.group(1)`.reverse_each do |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -324,8 +248,6 @@ except:
 end
 endsnippet
 
-
-
 snippet "(\S+)\.Each" ".each { |<element>| <block> }" r
 `!p snip.rv=match.group(1)`.each { |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -338,8 +260,6 @@ except:
 `}| ${2:# TODO} }
 endsnippet
 
-
-
 snippet "(\S+)\.each" ".each do |<element>| <block> end" r
 `!p snip.rv=match.group(1)`.each do |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -354,9 +274,6 @@ except:
 end
 endsnippet
 
-
-
-
 snippet "(\S+)\.Each_?w(ith)?_?i(ndex)?" ".each_with_index { |<element>,<i>| <block> }" r
 `!p snip.rv=match.group(1)`.each_with_index { |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -369,8 +286,6 @@ except:
 `},${2:i}| ${3:# TODO} }$0
 endsnippet
 
-
-
 snippet "(\S+)\.each_?w(ith)?_?i(ndex)?" ".each_with_index do |<element>,<i>| <block> end" r
 `!p snip.rv=match.group(1)`.each_with_index do |${1:`!p
 element_name = match.group(1).lstrip('$@')
@@ -385,114 +300,82 @@ except:
 end
 endsnippet
 
-
-
-
 snippet "(\S+)\.Each_?p(air)?"  ".each_pair { |<key>,<value>| <block> }" r
 `!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3:# TODO} }
 endsnippet
 
-
-
 snippet "(\S+)\.each_?p(air)?" ".each_pair do |<key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.each_pair do |${1:key},${2:value}|
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet "(\S+)\.sub" ".sub(<expression>) { <block> }" r
 `!p snip.rv=match.group(1)`.sub(${1:expression}) { ${2:"replace_with"} }
 endsnippet
 
-
-
 snippet "(\S+)\.gsub" ".gsub(<expression>) { <block> }" r
 `!p snip.rv=match.group(1)`.gsub(${1:expression}) { ${2:"replace_with"} }
 endsnippet
 
-
-
 snippet "(\S+)\.index" ".index { |item| <block> }" r
 `!p snip.rv=match.group(1)`.index { |${1:item}| ${2:block} }
 endsnippet
 
-
-
 snippet "(\S+)\.Index" ".index do |item| ... end" r
 `!p snip.rv=match.group(1)`.index do |${1:item}|
 	${0:block}
 end
 endsnippet
 
-
-
 snippet do "do |<key>| ... end" i
 do |${1:args}|
 	$0
 end
 endsnippet
 
-
-
 snippet Do "do ... end" i
 do
 	$0
 end
 endsnippet
 
-
 snippet until "until <expression> ... end"
 until ${1:expression}
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet Until "begin ... end until <expression>"
 begin
 	${0:# TODO}
 end until ${1:expression}
 endsnippet
 
-
-
 snippet while "while <expression> ... end"
 while ${1:expression}
 	${0:# TODO}
 end
 endsnippet
 
-
-
 snippet While "begin ... end while <expression>"
 begin
 	${0:# TODO}
 end while ${1:expression}
 endsnippet
 
-
-
 snippet "\b(r|attr)" "attr_reader :<attr_names>" r
 attr_reader :${0:attr_names}
 endsnippet
 
-
-
 snippet "\b(w|attr)" "attr_writer :<attr_names>" r
 attr_writer :${0:attr_names}
 endsnippet
 
-
-
 snippet "\b(rw|attr)" "attr_accessor :<attr_names>" r
 attr_accessor :${0:attr_names}
 endsnippet
 
-
-
 snippet begin "begin ... rescue ... end"
 begin
 	${1:# TODO}
@@ -501,8 +384,6 @@ rescue
 end
 endsnippet
 
-
-
 snippet begin "begin ... rescue ... else ... ensure ... end"
 begin
 	${1:# Raise exception}
@@ -517,8 +398,6 @@ ensure
 end
 endsnippet
 
-
-
 snippet rescue
 rescue Exception => e
 	puts e.message
@@ -526,8 +405,6 @@ rescue Exception => e
 	${0:# Rescue}
 endsnippet
 
-
-
 snippet "\b(case|sw(itch)?)" "case <variable> when <expression> ... end" r
 case ${1:variable}
 when ${2:expression}
@@ -535,14 +412,10 @@ $0
 end
 endsnippet
 
-
-
 snippet alias "alias :<new_name> :<old_name>"
 alias :${1:new_name} :${2:old_name}
 endsnippet
 
-
-
 snippet class "class <class_name> def initialize ... end end"
 class ${1:class_name}
 	def initialize(${2:*args})
@@ -551,16 +424,12 @@ class ${1:class_name}
 end
 endsnippet
 
-
-
 snippet module "module"
 module ${1:module_name}
 	$0
 end
 endsnippet
 
-
-
 snippet ###
 =begin
 	$0

From 1d9afe253bcd18b81bfe62ce11fe28ea1cf01b5d Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 27 Nov 2014 14:00:34 +0000
Subject: [PATCH 0493/1587] Ruby: Remove lots of placeholder text

---
 UltiSnips/ruby.snippets | 100 ++++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index e3cc1b24f..7fdcafd37 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -20,79 +20,79 @@ endsnippet
 
 snippet if "if <condition> ... end"
 if ${1:condition}
-	${2:# TODO}
+	$0
 end
 endsnippet
 
 snippet ife "if <condition> ... else ... end"
 if ${1:condition}
-	${2:# TODO}
+	$2
 else
-	${3:# TODO}
+	$0
 end
 endsnippet
 
 snippet ifee "if <condition> ... elseif <condition> ... else ... end"
 if ${1:condition}
-	${2:# TODO}
+	$2
 elsif ${3:condition}
-	${4:# TODO}
+	$4
 else
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet unless "unless <condition> ... end"
 unless ${1:condition}
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet unlesse "unless <condition> ... else ... end"
 unless ${1:condition}
-	${2:# TODO}
+	$2
 else
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet unlesee "unless <condition> ... elseif <condition> ... else ... end"
 unless ${1:condition}
-	${2:# TODO}
+	$2
 elsif ${3:condition}
-	${4:# TODO}
+	$4
 else
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet "\b(de)?f" "def <name>..." r
 def ${1:function_name}${2:(${3:*args})}
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet defi "def initialize ..."
 def initialize${1:(${2:*args})}
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet defr "def <name> ... rescue ..."
 def ${1:function_name}${2:(${3:*args})}
-	${4:# TODO}
+	$4
 rescue
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet For "(<from>..<to>).each { |<i>| <block> }"
-(${1:from}..${2:to}).each { |${3:i}| ${4:# TODO} }
+(${1:from}..${2:to}).each { |${3:i}| $0 }
 endsnippet
 
 snippet for "(<from>..<to>).each do |<i>| <block> end"
 (${1:from}..${2:to}).each do |${3:i}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
@@ -107,32 +107,32 @@ end
 endsnippet
 
 snippet "(\S+)\.Del(ete)?_?if" ".delete_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| $0 }
 endsnippet
 
 snippet "(\S+)\.del(ete)?_?if" ".delete_if do |<key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.delete_if do |${1:key},${2:value}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet "(\S+)\.Keep_?if" ".keep_if { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| $0 }
 endsnippet
 
 snippet "(\S+)\.keep_?if" ".keep_if do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.keep_if do |${1:key},${2:value}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet "(\S+)\.Reject" ".reject { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| $0 }
 endsnippet
 
 snippet "(\S+)\.reject" ".reject do <key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.reject do |${1:key},${2:value}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
@@ -147,53 +147,53 @@ end
 endsnippet
 
 snippet "(\S+)\.Sort" ".sort { |<a>,<b>| <block> }" r
-`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| $0 }
 endsnippet
 
 snippet "(\S+)\.sort" ".sort do |<a>,<b>| <block> end" r
 `!p snip.rv=match.group(1)`.sort do |${1:a},${2:b}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet "(\S+)\.Each_?k(ey)?" ".each_key { |<key>| <block> }" r
-`!p snip.rv=match.group(1)`.each_key { |${1:key}| ${2:# TODO} }
+`!p snip.rv=match.group(1)`.each_key { |${1:key}| $0 }
 endsnippet
 
 snippet "(\S+)\.each_?k(ey)?" ".each_key do |key| <block> end" r
 `!p snip.rv=match.group(1)`.each_key do |${1:key}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet "(\S+)\.Each_?val(ue)?" ".each_value { |<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_value { |${1:value}| ${2:# TODO} }
+`!p snip.rv=match.group(1)`.each_value { |${1:value}| $0 }
 endsnippet
 
 snippet "(\S+)\.each_?val(ue)?" ".each_value do |<value>| <block> end" r
 `!p snip.rv=match.group(1)`.each_value do |${1:value}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet Each "<elements>.each { |<element>| <block> }"
-${1:elements}.each { |${2:${1/s$//}}| ${3:# TODO} }
+${1:elements}.each { |${2:${1/s$//}}| $0 }
 endsnippet
 
 snippet each "<elements>.each do |<element>| <block> end"
 ${1:elements}.each do |${2:${1/s$//}}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet "each_?s(lice)?" "<array>.each_slice(n) do |slice| <block> end" r
 ${1:elements}.each_slice(${2:2}) do |${3:slice}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet "Each_?s(lice)?" "<array>.each_slice(n) { |slice| <block> }" r
-${1:elements}.each_slice(${2:2}) { |${3:slice}| ${0:# TODO} }
+${1:elements}.each_slice(${2:2}) { |${3:slice}| $0 }
 endsnippet
 
 snippet "(\S+)\.Map" ".map { |<element>| <block> }" r
@@ -205,7 +205,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| $0 }
 endsnippet
 
 snippet "(\S+)\.map" ".map do |<element>| <block> end" r
@@ -218,7 +218,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
@@ -231,7 +231,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| $0 }
 endsnippet
 
 snippet "(\S+)\.rev(erse)?_?each" ".reverse_each do |<element>| <block> end" r
@@ -244,7 +244,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
@@ -257,7 +257,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`}| ${2:# TODO} }
+`}| $0 }
 endsnippet
 
 snippet "(\S+)\.each" ".each do |<element>| <block> end" r
@@ -270,7 +270,7 @@ try:
 except:
 	snip.rv = 'element'
 `}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
@@ -283,7 +283,7 @@ try:
 	snip.rv = wmatch.group(1).lower()
 except:
 	snip.rv = 'element'
-`},${2:i}| ${3:# TODO} }$0
+`},${2:i}| $0 }
 endsnippet
 
 snippet "(\S+)\.each_?w(ith)?_?i(ndex)?" ".each_with_index do |<element>,<i>| <block> end" r
@@ -296,17 +296,17 @@ try:
 except:
 	snip.rv = 'element'
 `},${2:i}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet "(\S+)\.Each_?p(air)?"  ".each_pair { |<key>,<value>| <block> }" r
-`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| ${3:# TODO} }
+`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| $0 }
 endsnippet
 
 snippet "(\S+)\.each_?p(air)?" ".each_pair do |<key>,<value>| <block> end" r
 `!p snip.rv=match.group(1)`.each_pair do |${1:key},${2:value}|
-	${0:# TODO}
+	$0
 end
 endsnippet
 
@@ -342,25 +342,25 @@ endsnippet
 
 snippet until "until <expression> ... end"
 until ${1:expression}
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet Until "begin ... end until <expression>"
 begin
-	${0:# TODO}
+	$0
 end until ${1:expression}
 endsnippet
 
 snippet while "while <expression> ... end"
 while ${1:expression}
-	${0:# TODO}
+	$0
 end
 endsnippet
 
 snippet While "begin ... end while <expression>"
 begin
-	${0:# TODO}
+	$0
 end while ${1:expression}
 endsnippet
 
@@ -378,9 +378,9 @@ endsnippet
 
 snippet begin "begin ... rescue ... end"
 begin
-	${1:# TODO}
+	$1
 rescue
-	${0:# TODO}
+	$0
 end
 endsnippet
 

From 2796cf66de6912dba531b43a14c34297e59379d6 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 27 Nov 2014 14:06:46 +0000
Subject: [PATCH 0494/1587] Ruby: Remove 2 snippets that save a negative number
 of keypresses

---
 UltiSnips/ruby.snippets | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index 7fdcafd37..604b18c4d 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -10,14 +10,6 @@ snippet "^# ?[uU][tT][fF]-?8" "# encoding: UTF-8" r
 $0
 endsnippet
 
-snippet If "<command> if <expression>"
-${1:command} if ${0:expression}
-endsnippet
-
-snippet Unless "<command> unless <expression>"
-${1:command} unless ${0:expression}
-endsnippet
-
 snippet if "if <condition> ... end"
 if ${1:condition}
 	$0

From b988fb9576db2990eb96db14eee2e0f5ec4841e4 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 27 Nov 2014 14:27:01 +0000
Subject: [PATCH 0495/1587] Ruby: Remove some duplication

---
 UltiSnips/ruby.snippets | 62 +++--------------------------------------
 snippets/ruby.snippets  | 22 +++++++++++++++
 2 files changed, 26 insertions(+), 58 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index 604b18c4d..6114cfaf8 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -10,54 +10,6 @@ snippet "^# ?[uU][tT][fF]-?8" "# encoding: UTF-8" r
 $0
 endsnippet
 
-snippet if "if <condition> ... end"
-if ${1:condition}
-	$0
-end
-endsnippet
-
-snippet ife "if <condition> ... else ... end"
-if ${1:condition}
-	$2
-else
-	$0
-end
-endsnippet
-
-snippet ifee "if <condition> ... elseif <condition> ... else ... end"
-if ${1:condition}
-	$2
-elsif ${3:condition}
-	$4
-else
-	$0
-end
-endsnippet
-
-snippet unless "unless <condition> ... end"
-unless ${1:condition}
-	$0
-end
-endsnippet
-
-snippet unlesse "unless <condition> ... else ... end"
-unless ${1:condition}
-	$2
-else
-	$0
-end
-endsnippet
-
-snippet unlesee "unless <condition> ... elseif <condition> ... else ... end"
-unless ${1:condition}
-	$2
-elsif ${3:condition}
-	$4
-else
-	$0
-end
-endsnippet
-
 snippet "\b(de)?f" "def <name>..." r
 def ${1:function_name}${2:(${3:*args})}
 	$0
@@ -82,12 +34,6 @@ snippet For "(<from>..<to>).each { |<i>| <block> }"
 (${1:from}..${2:to}).each { |${3:i}| $0 }
 endsnippet
 
-snippet for "(<from>..<to>).each do |<i>| <block> end"
-(${1:from}..${2:to}).each do |${3:i}|
-	$0
-end
-endsnippet
-
 snippet "(\S+)\.Merge!" ".merge!(<other_hash>) { |<key>,<oldval>,<newval>| <block> }" r
 `!p snip.rv=match.group(1)`.merge!(${1:other_hash}) { |${2:key},${3:oldval},${4:newval}| ${5:block} }
 endsnippet
@@ -168,12 +114,12 @@ snippet "(\S+)\.each_?val(ue)?" ".each_value do |<value>| <block> end" r
 end
 endsnippet
 
-snippet Each "<elements>.each { |<element>| <block> }"
-${1:elements}.each { |${2:${1/s$//}}| $0 }
+snippet "(\S+)\.ea" "<elements>.each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.each { |${1:e}| $0 }
 endsnippet
 
-snippet each "<elements>.each do |<element>| <block> end"
-${1:elements}.each do |${2:${1/s$//}}|
+snippet "(\S+)\.ead" "<elements>.each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.each do |${1:e}|
 	$0
 end
 endsnippet
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 7097c6d6d..c4bcc43d2 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -73,10 +73,32 @@ snippet ife
 snippet eif
 	elsif ${1:condition}
 		${0}
+snippet ifee
+	if ${1:condition}
+		$2
+	elsif ${3:condition}
+		$4
+	else
+		$0
+	end
 snippet unless
 	unless ${1:condition}
 		${0}
 	end
+snippet unlesse
+	unless ${1:condition}
+		$2
+	else
+		$0
+	end
+snippet unlesee
+	unless ${1:condition}
+		$2
+	elsif ${3:condition}
+		$4
+	else
+		$0
+	end
 snippet wh
 	while ${1:condition}
 		${0}

From 588cbd29f758470b8e05ec7090ca5c6654221044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20L=C3=A9vigne?= <florent.levigne@obspm.fr>
Date: Fri, 28 Nov 2014 17:03:48 +0100
Subject: [PATCH 0496/1587] snippets: add p. and p#

---
 snippets/html.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 089a55202..dcc28e749 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -702,6 +702,10 @@ snippet output
 	<output>${0}</output>
 snippet p
 	<p>${0}</p>
+snippet p.
+	<p class="${1}">${0}</p>
+snippet p#
+	<p id="${1}">${0}</p>
 snippet param
 	<param name="${1}" value="${2}" />
 snippet pre

From 9f7ec8c42157fbced89c3516e2014fc90a6c16f5 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 3 Dec 2014 11:31:01 +0000
Subject: [PATCH 0497/1587] SCSS ife

---
 snippets/scss.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/scss.snippets b/snippets/scss.snippets
index 6daee776b..2c49224ed 100644
--- a/snippets/scss.snippets
+++ b/snippets/scss.snippets
@@ -18,6 +18,12 @@ snippet if
 	@if ${1:condition} {
 		${0}
 	}
+snippet ife
+	@if ${1:condition} {
+		${2}
+	} @else {
+		${0}
+	}
 snippet else
 	@else ${1:condition} {
 		${0}

From 67eba0b787a2452eaef88d6888c248c55dfa6b43 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 3 Dec 2014 11:32:03 +0000
Subject: [PATCH 0498/1587] SCSS: eif bug fix

---
 snippets/scss.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/scss.snippets b/snippets/scss.snippets
index 2c49224ed..9a208cab7 100644
--- a/snippets/scss.snippets
+++ b/snippets/scss.snippets
@@ -24,8 +24,8 @@ snippet ife
 	} @else {
 		${0}
 	}
-snippet else
-	@else ${1:condition} {
+snippet eif
+	@else if ${1:condition} {
 		${0}
 	}
 snippet for

From b1a62cfb14130e7a81fefe80f79099266fe89378 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 4 Dec 2014 13:45:16 +0000
Subject: [PATCH 0499/1587] Remove duplicate JS if ife

---
 UltiSnips/javascript.snippets | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index ee9a98771..6c177bc1b 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -64,21 +64,6 @@ snippet iife "Immediately-Invoked Function Expression (iife)"
 }(${2:$1}));
 endsnippet
 
-snippet ife "if ___ else"
-if (${1:condition}) {
-	${2://code}
-}
-else {
-	${3://code}
-}
-endsnippet
-
-snippet if "if"
-if (${1:condition}) {
-	${VISUAL}$0
-}
-endsnippet
-
 snippet timeout "setTimeout function"
 setTimeout(function() {
 	${VISUAL}$0

From ac2db9ee7a72aa7532c03cf09a21a3642e2b6e82 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 9 Dec 2014 11:00:42 +0000
Subject: [PATCH 0500/1587] Ultisnips HTML: H1s should not always have IDs.

Who on thought that was a good idea..?
---
 UltiSnips/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index cc20e3449..674985c7a 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -191,7 +191,7 @@ snip.rv = (snip.basename or 'unnamed') + '_submit'
 endsnippet
 
 snippet h1 "XHTML <h1>" w
-<h1 id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}">${1}</h1>
+<h1>$0</h1>
 endsnippet
 
 snippet head "XHTML <head>"

From e82994ff5ac8f65c01da72543727f29f7e100b38 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 10 Dec 2014 10:42:44 +0000
Subject: [PATCH 0501/1587] Clojure: letfn bugfix. Clean up ns

---
 snippets/clojure.snippets | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/snippets/clojure.snippets b/snippets/clojure.snippets
index 6fd653fcc..3cd658b5c 100644
--- a/snippets/clojure.snippets
+++ b/snippets/clojure.snippets
@@ -54,7 +54,7 @@ snippet let
 	(let [${1:name} ${2:expr}]
 		${0})
 snippet letfn
-	(letfn [(${1:name) [${2:args}]
+	(letfn [(${1:name}) [${2:args}]
 	          ${0})])
 snippet map
 	(map ${1:func} ${0:coll})
@@ -64,8 +64,7 @@ snippet met
 	(${1:name} [${2:this} ${3:args}]
 	  ${0})
 snippet ns
-	(ns ${1:name}
-	  ${0})
+	(ns ${0:name})
 snippet dotimes
 	(dotimes [_ 10]
 	  (time

From 9935a55edb4b7dd2b599ff9992dad49d18ffeca6 Mon Sep 17 00:00:00 2001
From: guneysus <serefguneysu@gmail.com>
Date: Fri, 12 Dec 2014 14:06:06 +0200
Subject: [PATCH 0502/1587] Fortran snippets initial commit

---
 snippets/fortran.snippets | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 snippets/fortran.snippets

diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
new file mode 100644
index 000000000..966a0e020
--- /dev/null
+++ b/snippets/fortran.snippets
@@ -0,0 +1,21 @@
+snippet mod
+	MODULE ${1:modulename}
+		${0}
+	END MODULE $1
+
+snippet doc
+	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+	! File: ${2:`vim_snippets#Filename('$1')`}
+	! Author: `g:snips_author`
+	! Email: `g:snips_email`
+	! Github: `g:snips_github`
+	! Description: ${1}
+	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+	${0}
+
+snippet prog
+	PROGRAM ${1:main}
+		${0}
+	END PROGRAM $1
+
+

From d42e376cc85d8b384ca6149ac0f19ca75611c09e Mon Sep 17 00:00:00 2001
From: guneysus <serefguneysu@gmail.com>
Date: Sat, 13 Dec 2014 13:38:01 +0200
Subject: [PATCH 0503/1587] Fortran variable definitions

---
 snippets/fortran.snippets | 51 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
index 966a0e020..465f0cc37 100644
--- a/snippets/fortran.snippets
+++ b/snippets/fortran.snippets
@@ -1,3 +1,12 @@
+snippet impl
+	IMPLICIT NONE
+	${0}
+
+snippet prog
+	PROGRAM ${1:main}
+		${0}
+	END PROGRAM $1
+
 snippet mod
 	MODULE ${1:modulename}
 		${0}
@@ -13,9 +22,43 @@ snippet doc
 	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 	${0}
 
-snippet prog
-	PROGRAM ${1:main}
-		${0}
-	END PROGRAM $1
+# Variables defs
+# Boolean
+snippet logic
+	logical :: ${0:names}
+
+# Integer
+snippet int
+	integer :: ${0:names}
+snippet intp
+	integer, parameter :: ${0:names}
+snippet inta
+	integer, allocatable, dimension(${1::}) :: ${0:names}
+
+# Real
+snippet real
+	real :: ${0:names}
+snippet realp
+	real,parameter :: ${0:names}
+snippet reala
+	real, allocatable, dimension(${1::}) :: ${0:names}
+
+# Double Precision
+snippet double
+	double precision :: ${0:names}
+snippet doublep
+	double precision, parameter :: ${0:names}
+snippet doublea
+	double precision, allocatable, dimension(${1::}) :: ${0:names}
+
+# Char
+snippet char
+	character(len=${1:*}) :: ${0:names}
 
+# Types
+snippet type
+	type(${1:name}) :: ${0:names}
 
+# Array
+snippet arr
+	(/ (${0:}) /)

From 4833a35bec14ae8cc332850f7ba1f35d730ac4da Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 13 Dec 2014 13:47:44 +0000
Subject: [PATCH 0504/1587] Clojure bugfix, remove extra )

---
 snippets/clojure.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/clojure.snippets b/snippets/clojure.snippets
index 3cd658b5c..dd4e0912c 100644
--- a/snippets/clojure.snippets
+++ b/snippets/clojure.snippets
@@ -26,7 +26,7 @@ snippet defr
 	  ${0})
 snippet deft
 	(deftest ${1:name}
-	    (is (= ${2:assertion})))
+	    (is (= ${2:assertion}))
 	  ${0})
 snippet is
 	(is (= ${1} ${0}))

From 06b67db1d5b21a133d53ccbc3e9a13dcfd1ce963 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 13 Dec 2014 14:15:50 +0000
Subject: [PATCH 0505/1587] Clojure, don't indent with spaces!

---
 snippets/clojure.snippets | 42 +++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/snippets/clojure.snippets b/snippets/clojure.snippets
index dd4e0912c..ca8abd054 100644
--- a/snippets/clojure.snippets
+++ b/snippets/clojure.snippets
@@ -1,75 +1,75 @@
 snippet comm
 	(comment
-	  ${0}
-	  )
+		${0}
+		)
 snippet condp
 	(condp ${1:pred} ${2:expr}
-	  ${0})
+		${0})
 snippet def
 	(def ${0})
 snippet defm
 	(defmethod ${1:multifn} "${2:doc-string}" ${3:dispatch-val} [${4:args}]
-	  ${0})
+		${0})
 snippet defmm
 	(defmulti ${1:name} "${2:doc-string}" ${0:dispatch-fn})
 snippet defma
 	(defmacro ${1:name} "${2:doc-string}" ${0:dispatch-fn})
 snippet defn
 	(defn ${1:name} "${2:doc-string}" [${3:arg-list}]
-	  ${0})
+		${0})
 snippet defp
 	(defprotocol ${1:name}
-	  ${0})
+		${0})
 snippet defr
 	(defrecord ${1:name} [${2:fields}]
-	  ${3:protocol}
-	  ${0})
+		${3:protocol}
+		${0})
 snippet deft
 	(deftest ${1:name}
-	    (is (= ${2:assertion}))
-	  ${0})
+		(is (= ${2:assertion}))
+		${0})
 snippet is
 	(is (= ${1} ${0}))
 snippet defty
 	(deftype ${1:Name} [${2:fields}]
-	  ${3:Protocol}
-	  ${0})
+		${3:Protocol}
+		${0})
 snippet doseq
 	(doseq [${1:elem} ${2:coll}]
-	  ${0})
+		${0})
 snippet fn
 	(fn [${1:arg-list}] ${0})
 snippet if
 	(if ${1:test-expr}
-	  ${2:then-expr}
-	  ${0:else-expr})
+		${2:then-expr}
+		${0:else-expr})
 snippet if-let
 	(if-let [${1:result} ${2:test-expr}]
 		(${3:then-expr} $1)
 		(${0:else-expr}))
 snippet imp
 	(:import [${1:package}])
-	& {:keys [${1:keys}] :or {${0:defaults}}}
+		& {:keys [${1:keys}] :or {${0:defaults}}}
 snippet let
 	(let [${1:name} ${2:expr}]
 		${0})
 snippet letfn
 	(letfn [(${1:name}) [${2:args}]
-	          ${0})])
+		${0})])
 snippet map
 	(map ${1:func} ${0:coll})
 snippet mapl
 	(map #(${1:lambda}) ${0:coll})
 snippet met
 	(${1:name} [${2:this} ${3:args}]
-	  ${0})
+		${0})
 snippet ns
 	(ns ${0:name})
 snippet dotimes
 	(dotimes [_ 10]
-	  (time
-	    (dotimes [_ ${1:times}]
-	      ${0})))
+		(time
+			(dotimes [_ ${1:times}]
+				${0})))
 snippet pmethod
 	(${1:name} [${2:this} ${0:args}])
 snippet refer

From bf2712e432df9b267bd83470a5b236237cb1546f Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 13 Dec 2014 14:17:16 +0000
Subject: [PATCH 0506/1587] Add lpil as Clojure maintainer

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index bc9dd6919..2cb78ca5d 100644
--- a/README.md
+++ b/README.md
@@ -205,15 +205,16 @@ to maintain snippets for a language, please get in touch.
 Notes: People are interested in snippets - and their interest may wane again.
 This list is kept up-to-date on a best effort basis.
 
-* Python - [honza](http://github.com/honza)
-* Javascript - [honza](http://github.com/honza)
+* Clojure - [lpil](https://github.com/lpil)
+* Elixir - [iurifq](https://github.com/iurifq)
+* Falcon - [steveno](https://github.com/steveno)
 * HTML Django - [honza](http://github.com/honza)
+* Javascript - [honza](http://github.com/honza)
 * Markdown - [honza](http://github.com/honza)
-* Ruby - [taq](http://github.com/taq)
 * PHP - [chrisyue](http://github.com/chrisyue)
+* Python - [honza](http://github.com/honza)
+* Ruby - [taq](http://github.com/taq)
 * Scala - [gorodinskiy](https://github.com/gorodinskiy)
-* Falcon - [steveno](https://github.com/steveno)
-* Elixir - [iurifq](https://github.com/iurifq)
 
 License
 -------

From d70a75bd65b092bd82f14f6445ff57749f9f26e1 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 13 Dec 2014 14:20:16 +0000
Subject: [PATCH 0507/1587] Clojure: Move trailing )s onto previous line

---
 snippets/clojure.snippets | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/snippets/clojure.snippets b/snippets/clojure.snippets
index ca8abd054..152f896e9 100644
--- a/snippets/clojure.snippets
+++ b/snippets/clojure.snippets
@@ -1,7 +1,6 @@
 snippet comm
 	(comment
-		${0}
-		)
+		${0})
 snippet condp
 	(condp ${1:pred} ${2:expr}
 		${0})
@@ -26,8 +25,7 @@ snippet defr
 		${0})
 snippet deft
 	(deftest ${1:name}
-		(is (= ${2:assertion}))
-		${0})
+		(is (= ${0:assertion})))
 snippet is
 	(is (= ${1} ${0}))
 snippet defty

From 511c42177f03559c092fad2bfa661a5aa72abbab Mon Sep 17 00:00:00 2001
From: guneysus <serefguneysu@gmail.com>
Date: Sun, 14 Dec 2014 03:27:11 +0200
Subject: [PATCH 0508/1587] Fortran snippets finished

---
 snippets/fortran.snippets | 115 ++++++++++++++++++++++++--------------
 1 file changed, 72 insertions(+), 43 deletions(-)

diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
index 465f0cc37..c9ab0602e 100644
--- a/snippets/fortran.snippets
+++ b/snippets/fortran.snippets
@@ -1,64 +1,93 @@
 snippet impl
-	IMPLICIT NONE
-	${0}
-
+	implicit none
+		$0
 snippet prog
-	PROGRAM ${1:main}
-		${0}
-	END PROGRAM $1
-
+	program ${1:main}
+		$0
+	end program $1
 snippet mod
-	MODULE ${1:modulename}
+	module ${1:modulename}
+		$0
+	end module $1
+snippet proc
+	procedure ${1:name}
+		${0}
+	end procedure $1
+snippet iface
+	interface ${1:name}
 		${0}
-	END MODULE $1
-
+	end interface $1
 snippet doc
 	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 	! File: ${2:`vim_snippets#Filename('$1')`}
 	! Author: `g:snips_author`
 	! Email: `g:snips_email`
 	! Github: `g:snips_github`
-	! Description: ${1}
+	! Description: $1
 	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-	${0}
-
-# Variables defs
+	$0
+# Variables definitions
 # Boolean
-snippet logic
-	logical :: ${0:names}
-
+snippet bool
+	logical :: $0
 # Integer
 snippet int
-	integer :: ${0:names}
-snippet intp
-	integer, parameter :: ${0:names}
-snippet inta
-	integer, allocatable, dimension(${1::}) :: ${0:names}
-
-# Real
+	integer :: $0
 snippet real
-	real :: ${0:names}
-snippet realp
-	real,parameter :: ${0:names}
-snippet reala
-	real, allocatable, dimension(${1::}) :: ${0:names}
-
+	real :: $0
 # Double Precision
 snippet double
-	double precision :: ${0:names}
-snippet doublep
-	double precision, parameter :: ${0:names}
-snippet doublea
-	double precision, allocatable, dimension(${1::}) :: ${0:names}
-
+	double precision :: $0
 # Char
-snippet char
-	character(len=${1:*}) :: ${0:names}
-
+snippet str
+	character(len=${1:*}) :: ${0:}
 # Types
 snippet type
-	type(${1:name}) :: ${0:names}
-
-# Array
+	type(${1:name})
+		$0
+	end type
+snippet const
+	${1:type}, parameter :: $2 = $0
 snippet arr
-	(/ (${0:}) /)
+	${1:type}, allocatable, dimension(${2::}) :: $0
+snippet intent
+	${1:type}, intent(inout) :: $0
+# Array
+snippet /
+	(/ $1 /) ${2:,&} $0
+snippet if
+	if (${1:condition}) then
+		$2
+	end if
+snippet case
+	select case (${1:expr})
+		case ($2)
+		case default
+			$3
+	end select $0
+snippet do
+	do ${1:i} = ${2:start},${3:end}, ${4:incr}
+		$4
+	end do
+snippet dow
+	do while (${1:condition})
+		$2
+	end do
+snippet sub
+	subroutine ${1:name}($2)
+		$0
+	end subroutine $1
+snippet func
+	function ${1:name}($2) result($3)
+		$0
+	end function $1
+snippet pr
+	write(*,*) $0
+snippet read
+	read( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0
+snippet write
+	write( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0
+snippet open
+	open (unit = ${1:fp}, file = ${2:filename}, status = unknown${3:, iostat = IERR }) $0
+snippet close
+	close ( unit = ${1:fp} ) $0

From 97f7941a6d10a2503eada91ade16a724af99e0a3 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 14 Dec 2014 10:35:38 +0000
Subject: [PATCH 0509/1587] Add MPL2 snippet

---
 snippets/_.snippets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index 856160181..0f539f517 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -257,3 +257,12 @@ snippet WTFPL
 	TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
 	 0. You just DO WHAT THE FUCK YOU WANT TO.
+snippet MPL2
+	${2:one line to give the program's name and a brief description}
+	Copyright `strftime("%Y")` ${3:`g:snips_author`}
+
+	This Source Code Form is subject to the terms of the Mozilla Public
+	License, v. 2.0. If a copy of the MPL was not distributed with this
+	file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+	${0}

From e096d0e191d5cffba7e1cf7fb22aac816351a4ce Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 14 Dec 2014 10:45:47 +0000
Subject: [PATCH 0510/1587] Use g:snip_author in LICENCE snips

---
 snippets/_.snippets | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index 0f539f517..bdc34c56f 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -15,7 +15,7 @@ snippet lorem
 	Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 snippet GPL2
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ snippet GPL2
 	${0}
 snippet LGPL2
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	This library is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as published
@@ -51,7 +51,7 @@ snippet LGPL2
 	${0}
 snippet GPL3
 	${1:one line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -69,7 +69,7 @@ snippet GPL3
 	${0}
 snippet LGPL3
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	This library is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as published
@@ -87,7 +87,7 @@ snippet LGPL3
 	${0}
 snippet AGPL3
 	${1:one line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as
@@ -105,7 +105,7 @@ snippet AGPL3
 	${0}
 snippet BSD2
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -135,7 +135,7 @@ snippet BSD2
 	${0}
 snippet BSD3
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -163,7 +163,7 @@ snippet BSD3
 	${0}
 snippet BSD4
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -194,7 +194,7 @@ snippet BSD4
 	${0}
 snippet MIT
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:copyright holder}
+	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
 
 	Permission is hereby granted, free of charge, to any person obtaining
 	a copy of this software and associated documentation files (the "Software"),
@@ -217,7 +217,7 @@ snippet MIT
 	${0}
 snippet APACHE
 	${1:one line to give the program's name and a brief description}
-	Copyright `strftime("%Y")` ${2:copyright holder}
+	Copyright `strftime("%Y")` ${2:`g:snips_author`}
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -233,21 +233,20 @@ snippet APACHE
 
 	${0}
 snippet BEERWARE
-	${2:one line to give the program's name and a brief description}
-	Copyright `strftime("%Y")` ${3:copyright holder}
+	${1:one line to give the program's name and a brief description}
+	Copyright `strftime("%Y")` ${2:`g:snips_author`}
 
 	Licensed under the "THE BEER-WARE LICENSE" (Revision 42):
-	${1:`g:snips_author`} wrote this file. As long as you retain this notice you
+	$2 wrote this file. As long as you retain this notice you
 	can do whatever you want with this stuff. If we meet some day, and you think
 	this stuff is worth it, you can buy me a beer or coffee in return
 
 	${0}
-
 snippet WTFPL
 			DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 					Version 2, December 2004
 
-	Copyright `strftime("%Y")` ${0:copyright holder}
+	Copyright `strftime("%Y")` ${0:`g:snips_author`}
 
 	Everyone is permitted to copy and distribute verbatim or modified
 	copies of this license document, and changing it is allowed as long
@@ -257,9 +256,11 @@ snippet WTFPL
 	TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
 	 0. You just DO WHAT THE FUCK YOU WANT TO.
+
+	${0}
 snippet MPL2
-	${2:one line to give the program's name and a brief description}
-	Copyright `strftime("%Y")` ${3:`g:snips_author`}
+	${1:one line to give the program's name and a brief description}
+	Copyright `strftime("%Y")` ${2:`g:snips_author`}
 
 	This Source Code Form is subject to the terms of the Mozilla Public
 	License, v. 2.0. If a copy of the MPL was not distributed with this

From 9b59e9639863ce31771999eac3c3621e8eaf7da5 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 15 Dec 2014 19:06:50 +0000
Subject: [PATCH 0511/1587] Edit MPL2 licence to match Mozilla header

---
 snippets/_.snippets | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index bdc34c56f..a4032558c 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -259,9 +259,6 @@ snippet WTFPL
 
 	${0}
 snippet MPL2
-	${1:one line to give the program's name and a brief description}
-	Copyright `strftime("%Y")` ${2:`g:snips_author`}
-
 	This Source Code Form is subject to the terms of the Mozilla Public
 	License, v. 2.0. If a copy of the MPL was not distributed with this
 	file, You can obtain one at http://mozilla.org/MPL/2.0/.

From e0b29dd5536deaa586ffcb452bf6f1efad81d723 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 16 Dec 2014 17:04:36 +0000
Subject: [PATCH 0512/1587] Ultisnips eruby: Start removing snippets
 duplication

---
 UltiSnips/eruby.snippets | 57 ++--------------------------------------
 1 file changed, 2 insertions(+), 55 deletions(-)

diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index ae58c9f2b..d1a26df36 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -44,66 +44,13 @@ snippet fi "<%= Fixtures.identify(:symbol) %>"
 endsnippet
 
 snippet ft "form_tag"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => "${5:update}"}${6:, {:${8:class} => "${9:form}"\}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => '${5:update}'}${6:, {:${8:class} => '${9:form}'\}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
-snippet end "end (ERB)"
-<% end -%>
-endsnippet
-
-snippet for "for loop (ERB)"
-<% if !${1:list}.blank? %>
-	<% for ${2:item} in ${1} %>
-		$3
-	<% end %>
-<% else %>
-	$4
-<% end %>
-
-endsnippet
-
-snippet ffcb "form_for check_box"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.check_box :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffff "form_for file_field 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.file_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffhf "form_for hidden_field 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.hidden_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffl "form_for label 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.label :${1:attribute}${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffpf "form_for password_field 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.password_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffrb "form_for radio_box 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_box :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
 snippet ffs "form_for submit 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.submit "${1:Submit}"${2:, :disable_with => '${3:$1ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet ffta "form_for text_area 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_area :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet fftf "form_for text_field 2"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
-endsnippet
-
-snippet fields "fields_for"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`fields_for :${1:model}, @${2:$1} do |$1|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
-	$0
-`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${1:f}.submit '${2:Submit}'${3:, :disable_with => '${4:$2ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet f. "f_fields_for (nff)"

From 4f2e0a03f14a8aa90515a58cb5948fc3e233fd04 Mon Sep 17 00:00:00 2001
From: guneysus <serefguneysu@gmail.com>
Date: Thu, 18 Dec 2014 18:21:43 +0200
Subject: [PATCH 0513/1587] Python args and kwargs snippets

---
 snippets/python.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index c221f466e..a93b6549c 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -208,3 +208,9 @@ snippet kwg
 	self.${1:var_name} = kwargs.get('$1', ${2:None})
 snippet lkwg
 	${1:var_name} = kwargs.get('$1', ${2:None})
+snippet args
+	*args${1:,}${0}
+snippet kwargs
+	**kwargs${1:,}${0}
+snippet akw
+	*args, **kwargs${1:,}${0}

From 6a679df97f4058d5c59d972a7b3029598da5dd67 Mon Sep 17 00:00:00 2001
From: Marcelo D Montu <marcmontu@yahoo.com.br>
Date: Fri, 19 Dec 2014 15:00:31 -0200
Subject: [PATCH 0514/1587] Fix box and bbox snippets outside the first column

---
 UltiSnips/all.snippets | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index f816ba403..e33d2c517 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -78,10 +78,12 @@ endglobal
 snippet box "A nice box with the current comment symbol" b
 `!p
 box = make_box(len(t[1]))
-snip.rv = box[0] + '\n' + box[1]
+snip.rv = box[0]
+snip += box[1]
 `${1:content}`!p
 box = make_box(len(t[1]))
-snip.rv = box[2] + '\n' + box[3]`
+snip.rv = box[2]
+snip += box[3]`
 $0
 endsnippet
 
@@ -89,10 +91,12 @@ snippet bbox "A nice box over the full width" b
 `!p
 width = int(vim.eval("&textwidth")) or 71
 box = make_box(len(t[1]), width)
-snip.rv = box[0] + '\n' + box[1]
+snip.rv = box[0]
+snip += box[1]
 `${1:content}`!p
 box = make_box(len(t[1]), width)
-snip.rv = box[2] + '\n' + box[3]`
+snip.rv = box[2]
+snip += box[3]`
 $0
 endsnippet
 

From 60be56203393825044b2b7613fc01161f60ca381 Mon Sep 17 00:00:00 2001
From: Gustavo Chain <gchain@gmail.com>
Date: Sun, 28 Dec 2014 13:18:45 +0100
Subject: [PATCH 0515/1587] Added package snippet for Go

---
 snippets/go.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index dafc6e4dc..af76e7249 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -173,6 +173,9 @@ snippet main
 # new
 snippet nw
 	new(${0:type})
+# package
+snippet pa
+	package ${1:main}
 # panic
 snippet pn
 	panic("${0:msg}")

From e0fff1575abb816606c729751c8507c74e17c3cd Mon Sep 17 00:00:00 2001
From: Gilad Peleg <giladp007@gmail.com>
Date: Mon, 5 Jan 2015 09:46:19 +0200
Subject: [PATCH 0516/1587] Convert stylus snippet spaces to tabs. Fixes #499

---
 snippets/stylus.snippets | 994 +++++++++++++++++++--------------------
 1 file changed, 497 insertions(+), 497 deletions(-)

diff --git a/snippets/stylus.snippets b/snippets/stylus.snippets
index 4a305702d..d03d1781e 100644
--- a/snippets/stylus.snippets
+++ b/snippets/stylus.snippets
@@ -1,993 +1,993 @@
 snippet !
-    !important
+		!important
 snippet bdi:m+
-    -moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+		-moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:m
-    -moz-border-image ${0}
+		-moz-border-image ${0}
 snippet bdrz:m
-    -moz-border-radius ${0}
+		-moz-border-radius ${0}
 snippet bxsh:m+
-  -moz-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+		-moz-box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh:m
-    -moz-box-shadow ${0}
+		-moz-box-shadow ${0}
 snippet bdi:w+
-    -webkit-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+		-webkit-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:w
-    -webkit-border-image ${0}
+		-webkit-border-image ${0}
 snippet bdrz:w
-    -webkit-border-radius ${0}
+		-webkit-border-radius ${0}
 snippet bxsh:w+
-    -webkit-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+		-webkit-box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh:w
-    -webkit-box-shadow ${0}
+		-webkit-box-shadow ${0}
 snippet @f
-    @font-face ${0}
+		@font-face ${0}
 snippet @i
-    @import '${0}'
+		@import '${0}'
 snippet @r
-    @require '${0}'
+		@require '${0}'
 snippet @m
-    @media ${1:screen}
+		@media ${1:screen}
 snippet @msmw
-    @media screen and (min-width: ${0}px)
+		@media screen and (min-width: ${0}px)
 snippet @ext
-    @extend .${1}
-    ${0}
+		@extend .${1}
+		${0}
 snippet bg+
-    background ${1} url(${2}) ${3:0} ${4:0} ${0:no-repeat}
+		background ${1} url(${2}) ${3:0} ${4:0} ${0:no-repeat}
 snippet bga
-    background-attachment ${0}
+		background-attachment ${0}
 snippet bga:f
-    background-attachment fixed
+		background-attachment fixed
 snippet bga:s
-    background-attachment scroll
+		background-attachment scroll
 snippet bgbk
-    background-break ${0}
+		background-break ${0}
 snippet bgbk:bb
-    background-break bounding-box
+		background-break bounding-box
 snippet bgbk:c
-    background-break continuous
+		background-break continuous
 snippet bgbk:eb
-    background-break each-box
+		background-break each-box
 snippet bgcp
-    background-clip ${0}
+		background-clip ${0}
 snippet bgcp:bb
-    background-clip border-box
+		background-clip border-box
 snippet bgcp:cb
-    background-clip content-box
+		background-clip content-box
 snippet bgcp:nc
-    background-clip no-clip
+		background-clip no-clip
 snippet bgcp:pb
-    background-clip padding-box
+		background-clip padding-box
 snippet bgc
-    background-color ${0}
+		background-color ${0}
 snippet bgc:t
-    background-color transparent
+		background-color transparent
 snippet bgi
-    background-image url(${0})
+		background-image url(${0})
 snippet bgi:n
-    background-image none
+		background-image none
 snippet bgo
-    background-origin ${0}
+		background-origin ${0}
 snippet bgo:bb
-    background-origin border-box
+		background-origin border-box
 snippet bgo:cb
-    background-origin content-box
+		background-origin content-box
 snippet bgo:pb
-    background-origin padding-box
+		background-origin padding-box
 snippet bgpx
-    background-position-x ${0}
+		background-position-x ${0}
 snippet bgpy
-    background-position-y ${0}
+		background-position-y ${0}
 snippet bgp
-    background-position ${1:0} ${0:0}
+		background-position ${1:0} ${0:0}
 snippet bgr
-    background-repeat ${0}
+		background-repeat ${0}
 snippet bgr:n
-    background-repeat no-repeat
+		background-repeat no-repeat
 snippet bgr:x
-    background-repeat repeat-x
+		background-repeat repeat-x
 snippet bgr:y
-    background-repeat repeat-y
+		background-repeat repeat-y
 snippet bgr:r
-    background-repeat repeat
+		background-repeat repeat
 snippet bgz
-    background-size ${0}
+		background-size ${0}
 snippet bgz:a
-    background-size auto
+		background-size auto
 snippet bgz:ct
-    background-size contain
+		background-size contain
 snippet bgz:cv
-    background-size cover
+		background-size cover
 snippet bg
-    background ${0}
+		background ${0}
 snippet bg:ie
-    filter progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
+		filter progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
 snippet bg:n
-    background none
+		background none
 snippet bd+
-    border ${1:1px} ${2:solid} ${0}
+		border ${1:1px} ${2:solid} ${0}
 snippet bdb+
-    border-bottom ${1:1px} ${2:solid} ${0}
+		border-bottom ${1:1px} ${2:solid} ${0}
 snippet bdbc
-    border-bottom-color ${0}
+		border-bottom-color ${0}
 snippet bdbi
-    border-bottom-image url(${0})
+		border-bottom-image url(${0})
 snippet bdbi:n
-    border-bottom-image none
+		border-bottom-image none
 snippet bdbli
-    border-bottom-left-image url(${0})
+		border-bottom-left-image url(${0})
 snippet bdbli:c
-    border-bottom-left-image continue
+		border-bottom-left-image continue
 snippet bdbli:n
-    border-bottom-left-image none
+		border-bottom-left-image none
 snippet bdblrz
-    border-bottom-left-radius ${0}
+		border-bottom-left-radius ${0}
 snippet bdbri
-    border-bottom-right-image url(${0})
+		border-bottom-right-image url(${0})
 snippet bdbri:c
-    border-bottom-right-image continue
+		border-bottom-right-image continue
 snippet bdbri:n
-    border-bottom-right-image none
+		border-bottom-right-image none
 snippet bdbrrz
-    border-bottom-right-radius ${0}
+		border-bottom-right-radius ${0}
 snippet bdbs
-    border-bottom-style ${0}
+		border-bottom-style ${0}
 snippet bdbs:n
-    border-bottom-style none
+		border-bottom-style none
 snippet bdbw
-    border-bottom-width ${0}
+		border-bottom-width ${0}
 snippet bdb
-    border-bottom ${0}
+		border-bottom ${0}
 snippet bdb:n
-    border-bottom none
+		border-bottom none
 snippet bdbk
-    border-break ${0}
+		border-break ${0}
 snippet bdbk:c
-    border-break close
+		border-break close
 snippet bdcl
-    border-collapse ${0}
+		border-collapse ${0}
 snippet bdcl:c
-    border-collapse collapse
+		border-collapse collapse
 snippet bdcl:s
-    border-collapse separate
+		border-collapse separate
 snippet bdc
-    border-color ${0}
+		border-color ${0}
 snippet bdci
-    border-corner-image url(${0})
+		border-corner-image url(${0})
 snippet bdci:c
-    border-corner-image continue
+		border-corner-image continue
 snippet bdci:n
-    border-corner-image none
+		border-corner-image none
 snippet bdf
-    border-fit ${0}
+		border-fit ${0}
 snippet bdf:c
-    border-fit clip
+		border-fit clip
 snippet bdf:of
-    border-fit overwrite
+		border-fit overwrite
 snippet bdf:ow
-    border-fit overwrite
+		border-fit overwrite
 snippet bdf:r
-    border-fit repeat
+		border-fit repeat
 snippet bdf:sc
-    border-fit scale
+		border-fit scale
 snippet bdf:sp
-    border-fit space
+		border-fit space
 snippet bdf:st
-    border-fit stretch
+		border-fit stretch
 snippet bdi
-    border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+		border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:n
-    border-image none
+		border-image none
 snippet bdl+
-    border-left ${1:1px} ${2:solid} ${0}
+		border-left ${1:1px} ${2:solid} ${0}
 snippet bdlc
-    border-left-color ${0}
+		border-left-color ${0}
 snippet bdli
-    border-left-image url(${0})
+		border-left-image url(${0})
 snippet bdli:n
-    border-left-image none
+		border-left-image none
 snippet bdls
-    border-left-style ${0}
+		border-left-style ${0}
 snippet bdls:n
-    border-left-style none
+		border-left-style none
 snippet bdlw
-    border-left-width ${0}
+		border-left-width ${0}
 snippet bdl
-    border-left ${0}
+		border-left ${0}
 snippet bdl:n
-    border-left none
+		border-left none
 snippet bdlt
-    border-length ${0}
+		border-length ${0}
 snippet bdlt:a
-    border-length auto
+		border-length auto
 snippet bdrz
-    border-radius ${0}
+		border-radius ${0}
 snippet bdr+
-    border-right ${1:1px} ${2:solid} ${0}
+		border-right ${1:1px} ${2:solid} ${0}
 snippet bdrc
-    border-right-color ${0}
+		border-right-color ${0}
 snippet bdri
-    border-right-image url(${0})
+		border-right-image url(${0})
 snippet bdri:n
-    border-right-image none
+		border-right-image none
 snippet bdrs
-    border-right-style ${0}
+		border-right-style ${0}
 snippet bdrs:n
-    border-right-style none
+		border-right-style none
 snippet bdrw
-    border-right-width ${0}
+		border-right-width ${0}
 snippet bdr
-    border-right ${0}
+		border-right ${0}
 snippet bdr:n
-    border-right none
+		border-right none
 snippet bdsp
-    border-spacing ${0}
+		border-spacing ${0}
 snippet bds
-    border-style ${0}
+		border-style ${0}
 snippet bds:ds
-    border-style dashed
+		border-style dashed
 snippet bds:dtds
-    border-style dot-dash
+		border-style dot-dash
 snippet bds:dtdtds
-    border-style dot-dot-dash
+		border-style dot-dot-dash
 snippet bds:dt
-    border-style dotted
+		border-style dotted
 snippet bds:db
-    border-style double
+		border-style double
 snippet bds:g
-    border-style groove
+		border-style groove
 snippet bds:h
-    border-style hidden
+		border-style hidden
 snippet bds:i
-    border-style inset
+		border-style inset
 snippet bds:n
-    border-style none
+		border-style none
 snippet bds:o
-    border-style outset
+		border-style outset
 snippet bds:r
-    border-style ridge
+		border-style ridge
 snippet bds:s
-    border-style solid
+		border-style solid
 snippet bds:w
-    border-style wave
+		border-style wave
 snippet bdt+
-    border-top ${1:1px} ${2:solid} ${0}
+		border-top ${1:1px} ${2:solid} ${0}
 snippet bdtc
-    border-top-color ${0}
+		border-top-color ${0}
 snippet bdti
-    border-top-image url(${0})
+		border-top-image url(${0})
 snippet bdti:n
-    border-top-image none
+		border-top-image none
 snippet bdtli
-    border-top-left-image url(${0})
+		border-top-left-image url(${0})
 snippet bdtli:c
-    border-corner-image continue
+		border-corner-image continue
 snippet bdtli:n
-    border-corner-image none
+		border-corner-image none
 snippet bdtlrz
-    border-top-left-radius ${0}
+		border-top-left-radius ${0}
 snippet bdtri
-    border-top-right-image url(${0})
+		border-top-right-image url(${0})
 snippet bdtri:c
-    border-top-right-image continue
+		border-top-right-image continue
 snippet bdtri:n
-    border-top-right-image none
+		border-top-right-image none
 snippet bdtrrz
-    border-top-right-radius ${0}
+		border-top-right-radius ${0}
 snippet bdts
-    border-top-style ${0}
+		border-top-style ${0}
 snippet bdts:n
-    border-top-style none
+		border-top-style none
 snippet bdtw
-    border-top-width ${0}
+		border-top-width ${0}
 snippet bdt
-    border-top ${0}
+		border-top ${0}
 snippet bdt:n
-    border-top none
+		border-top none
 snippet bdw
-    border-width ${0}
+		border-width ${0}
 snippet bd
-    border ${0}
+		border ${0}
 snippet bd:n
-    border none
+		border none
 snippet b
-    bottom ${0}
+		bottom ${0}
 snippet b:a
-    bottom auto
+		bottom auto
 snippet bxsh+
-    box-shadow ${1:0} ${2:0} ${3:0} ${0}
+		box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh
-    box-shadow ${0}
+		box-shadow ${0}
 snippet bxsh:n
-    box-shadow none
+		box-shadow none
 snippet bxz
-    box-sizing ${0}
+		box-sizing ${0}
 snippet bxz:bb
-    box-sizing border-box
+		box-sizing border-box
 snippet bxz:cb
-    box-sizing content-box
+		box-sizing content-box
 snippet cps
-    caption-side ${0}
+		caption-side ${0}
 snippet cps:b
-    caption-side bottom
+		caption-side bottom
 snippet cps:t
-    caption-side top
+		caption-side top
 snippet cl
-    clear ${0}
+		clear ${0}
 snippet cl:b
-    clear both
+		clear both
 snippet cl:l
-    clear left
+		clear left
 snippet cl:n
-    clear none
+		clear none
 snippet cl:r
-    clear right
+		clear right
 snippet cp
-    clip ${0}
+		clip ${0}
 snippet cp:a
-    clip auto
+		clip auto
 snippet cp:r
-    clip rect(${1:0} ${2:0} ${3:0} ${0:0})
+		clip rect(${1:0} ${2:0} ${3:0} ${0:0})
 snippet c
-    color ${0}
+		color ${0}
 snippet ct
-    content ${0}
+		content ${0}
 snippet ct:a
-    content attr(${0})
+		content attr(${0})
 snippet ct:cq
-    content close-quote
+		content close-quote
 snippet ct:c
-    content counter(${0})
+		content counter(${0})
 snippet ct:cs
-    content counters(${0})
+		content counters(${0})
 snippet ct:ncq
-    content no-close-quote
+		content no-close-quote
 snippet ct:noq
-    content no-open-quote
+		content no-open-quote
 snippet ct:n
-    content normal
+		content normal
 snippet ct:oq
-    content open-quote
+		content open-quote
 snippet coi
-    counter-increment ${0}
+		counter-increment ${0}
 snippet cor
-    counter-reset ${0}
+		counter-reset ${0}
 snippet cur
-    cursor ${0}
+		cursor ${0}
 snippet cur:a
-    cursor auto
+		cursor auto
 snippet cur:c
-    cursor crosshair
+		cursor crosshair
 snippet cur:d
-    cursor default
+		cursor default
 snippet cur:ha
-    cursor hand
+		cursor hand
 snippet cur:he
-    cursor help
+		cursor help
 snippet cur:m
-    cursor move
+		cursor move
 snippet cur:p
-    cursor pointer
+		cursor pointer
 snippet cur:t
-    cursor text
+		cursor text
 snippet d
-    display ${0}
+		display ${0}
 snippet d:mib
-    display -moz-inline-box
+		display -moz-inline-box
 snippet d:mis
-    display -moz-inline-stack
+		display -moz-inline-stack
 snippet d:b
-    display block
+		display block
 snippet d:cp
-    display compact
+		display compact
 snippet d:ib
-    display inline-block
+		display inline-block
 snippet d:itb
-    display inline-table
+		display inline-table
 snippet d:i
-    display inline
+		display inline
 snippet d:li
-    display list-item
+		display list-item
 snippet d:n
-    display none
+		display none
 snippet d:ri
-    display run-in
+		display run-in
 snippet d:tbcp
-    display table-caption
+		display table-caption
 snippet d:tbc
-    display table-cell
+		display table-cell
 snippet d:tbclg
-    display table-column-group
+		display table-column-group
 snippet d:tbcl
-    display table-column
+		display table-column
 snippet d:tbfg
-    display table-footer-group
+		display table-footer-group
 snippet d:tbhg
-    display table-header-group
+		display table-header-group
 snippet d:tbrg
-    display table-row-group
+		display table-row-group
 snippet d:tbr
-    display table-row
+		display table-row
 snippet d:tb
-    display table
+		display table
 snippet ec
-    empty-cells ${0}
+		empty-cells ${0}
 snippet ec:h
-    empty-cells hide
+		empty-cells hide
 snippet ec:s
-    empty-cells show
+		empty-cells show
 snippet exp
-    expression()
+		expression()
 snippet fl
-    float ${0}
+		float ${0}
 snippet fl:l
-    float left
+		float left
 snippet fl:n
-    float none
+		float none
 snippet fl:r
-    float right
+		float right
 snippet f+
-    font ${1:1em} ${2:Arial},${0:sans-serif}
+		font ${1:1em} ${2:Arial},${0:sans-serif}
 snippet fef
-    font-effect ${0}
+		font-effect ${0}
 snippet fef:eb
-    font-effect emboss
+		font-effect emboss
 snippet fef:eg
-    font-effect engrave
+		font-effect engrave
 snippet fef:n
-    font-effect none
+		font-effect none
 snippet fef:o
-    font-effect outline
+		font-effect outline
 snippet femp
-    font-emphasize-position ${0}
+		font-emphasize-position ${0}
 snippet femp:a
-    font-emphasize-position after
+		font-emphasize-position after
 snippet femp:b
-    font-emphasize-position before
+		font-emphasize-position before
 snippet fems
-    font-emphasize-style ${0}
+		font-emphasize-style ${0}
 snippet fems:ac
-    font-emphasize-style accent
+		font-emphasize-style accent
 snippet fems:c
-    font-emphasize-style circle
+		font-emphasize-style circle
 snippet fems:ds
-    font-emphasize-style disc
+		font-emphasize-style disc
 snippet fems:dt
-    font-emphasize-style dot
+		font-emphasize-style dot
 snippet fems:n
-    font-emphasize-style none
+		font-emphasize-style none
 snippet fem
-    font-emphasize ${0}
+		font-emphasize ${0}
 snippet ff
-    font-family ${0}
+		font-family ${0}
 snippet ff:c
-    font-family ${0:'Monotype Corsiva','Comic Sans MS'},cursive
+		font-family ${0:'Monotype Corsiva','Comic Sans MS'},cursive
 snippet ff:f
-    font-family ${0:Capitals,Impact},fantasy
+		font-family ${0:Capitals,Impact},fantasy
 snippet ff:m
-    font-family ${0:Monaco,'Courier New'},monospace
+		font-family ${0:Monaco,'Courier New'},monospace
 snippet ff:ss
-    font-family ${0:Helvetica,Arial},sans-serif
+		font-family ${0:Helvetica,Arial},sans-serif
 snippet ff:s
-    font-family ${0:Georgia,'Times New Roman'},serif
+		font-family ${0:Georgia,'Times New Roman'},serif
 snippet fza
-    font-size-adjust ${0}
+		font-size-adjust ${0}
 snippet fza:n
-    font-size-adjust none
+		font-size-adjust none
 snippet fz
-    font-size ${0}
+		font-size ${0}
 snippet fsm
-    font-smooth ${0}
+		font-smooth ${0}
 snippet fsm:aw
-    font-smooth always
+		font-smooth always
 snippet fsm:a
-    font-smooth auto
+		font-smooth auto
 snippet fsm:n
-    font-smooth never
+		font-smooth never
 snippet fst
-    font-stretch ${0}
+		font-stretch ${0}
 snippet fst:c
-    font-stretch condensed
+		font-stretch condensed
 snippet fst:e
-    font-stretch expanded
+		font-stretch expanded
 snippet fst:ec
-    font-stretch extra-condensed
+		font-stretch extra-condensed
 snippet fst:ee
-    font-stretch extra-expanded
+		font-stretch extra-expanded
 snippet fst:n
-    font-stretch normal
+		font-stretch normal
 snippet fst:sc
-    font-stretch semi-condensed
+		font-stretch semi-condensed
 snippet fst:se
-    font-stretch semi-expanded
+		font-stretch semi-expanded
 snippet fst:uc
-    font-stretch ultra-condensed
+		font-stretch ultra-condensed
 snippet fst:ue
-    font-stretch ultra-expanded
+		font-stretch ultra-expanded
 snippet fs
-    font-style ${0}
+		font-style ${0}
 snippet fs:i
-    font-style italic
+		font-style italic
 snippet fs:n
-    font-style normal
+		font-style normal
 snippet fs:o
-    font-style oblique
+		font-style oblique
 snippet fv
-    font-variant ${0}
+		font-variant ${0}
 snippet fv:n
-    font-variant normal
+		font-variant normal
 snippet fv:sc
-    font-variant small-caps
+		font-variant small-caps
 snippet fw
-    font-weight ${0}
+		font-weight ${0}
 snippet fw:b
-    font-weight bold
+		font-weight bold
 snippet fw:br
-    font-weight bolder
+		font-weight bolder
 snippet fw:lr
-    font-weight lighter
+		font-weight lighter
 snippet fw:n
-    font-weight normal
+		font-weight normal
 snippet f
-    font ${0}
+		font ${0}
 snippet h
-    height ${0}
+		height ${0}
 snippet h:a
-    height auto
+		height auto
 snippet l
-    left ${0}
+		left ${0}
 snippet l:a
-    left auto
+		left auto
 snippet lts
-    letter-spacing ${0}
+		letter-spacing ${0}
 snippet lh
-    line-height ${0}
+		line-height ${0}
 snippet lisi
-    list-style-image url(${0})
+		list-style-image url(${0})
 snippet lisi:n
-    list-style-image none
+		list-style-image none
 snippet lisp
-    list-style-position ${0}
+		list-style-position ${0}
 snippet lisp:i
-    list-style-position inside
+		list-style-position inside
 snippet lisp:o
-    list-style-position outside
+		list-style-position outside
 snippet list
-    list-style-type ${0}
+		list-style-type ${0}
 snippet list:c
-    list-style-type circle
+		list-style-type circle
 snippet list:dclz
-    list-style-type decimal-leading-zero
+		list-style-type decimal-leading-zero
 snippet list:dc
-    list-style-type decimal
+		list-style-type decimal
 snippet list:d
-    list-style-type disc
+		list-style-type disc
 snippet list:lr
-    list-style-type lower-roman
+		list-style-type lower-roman
 snippet list:n
-    list-style-type none
+		list-style-type none
 snippet list:s
-    list-style-type square
+		list-style-type square
 snippet list:ur
-    list-style-type upper-roman
+		list-style-type upper-roman
 snippet lis
-    list-style ${0}
+		list-style ${0}
 snippet lis:n
-    list-style none
+		list-style none
 snippet mb
-    margin-bottom ${0}
+		margin-bottom ${0}
 snippet mb:a
-    margin-bottom auto
+		margin-bottom auto
 snippet ml
-    margin-left ${0}
+		margin-left ${0}
 snippet ml:a
-    margin-left auto
+		margin-left auto
 snippet mr
-    margin-right ${0}
+		margin-right ${0}
 snippet mr:a
-    margin-right auto
+		margin-right auto
 snippet mt
-    margin-top ${0}
+		margin-top ${0}
 snippet mt:a
-    margin-top auto
+		margin-top auto
 snippet m
-    margin ${0}
+		margin ${0}
 snippet m:4
-    margin ${1:0} ${2:0} ${3:0} ${0:0}
+		margin ${1:0} ${2:0} ${3:0} ${0:0}
 snippet m:3
-    margin ${1:0} ${2:0} ${0:0}
+		margin ${1:0} ${2:0} ${0:0}
 snippet m:2
-    margin ${1:0} ${0:0}
+		margin ${1:0} ${0:0}
 snippet m:0
-    margin 0
+		margin 0
 snippet m:a
-    margin auto
+		margin auto
 snippet mah
-    max-height ${0}
+		max-height ${0}
 snippet mah:n
-    max-height none
+		max-height none
 snippet maw
-    max-width ${0}
+		max-width ${0}
 snippet maw:n
-    max-width none
+		max-width none
 snippet mih
-    min-height ${0}
+		min-height ${0}
 snippet miw
-    min-width ${0}
+		min-width ${0}
 snippet op
-    opacity ${0}
+		opacity ${0}
 snippet op:ie
-    filter progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
+		filter progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
 snippet op:ms
-    -ms-filter 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
+		-ms-filter 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
 snippet orp
-    orphans ${0}
+		orphans ${0}
 snippet o+
-    outline ${1:1px} ${2:solid} ${0}
+		outline ${1:1px} ${2:solid} ${0}
 snippet oc
-    outline-color ${0}
+		outline-color ${0}
 snippet oc:i
-    outline-color invert
+		outline-color invert
 snippet oo
-    outline-offset ${0}
+		outline-offset ${0}
 snippet os
-    outline-style ${0}
+		outline-style ${0}
 snippet ow
-    outline-width ${0}
+		outline-width ${0}
 snippet o
-    outline ${0}
+		outline ${0}
 snippet o:n
-    outline none
+		outline none
 snippet ovs
-    overflow-style ${0}
+		overflow-style ${0}
 snippet ovs:a
-    overflow-style auto
+		overflow-style auto
 snippet ovs:mq
-    overflow-style marquee
+		overflow-style marquee
 snippet ovs:mv
-    overflow-style move
+		overflow-style move
 snippet ovs:p
-    overflow-style panner
+		overflow-style panner
 snippet ovs:s
-    overflow-style scrollbar
+		overflow-style scrollbar
 snippet ovx
-    overflow-x ${0}
+		overflow-x ${0}
 snippet ovx:a
-    overflow-x auto
+		overflow-x auto
 snippet ovx:h
-    overflow-x hidden
+		overflow-x hidden
 snippet ovx:s
-    overflow-x scroll
+		overflow-x scroll
 snippet ovx:v
-    overflow-x visible
+		overflow-x visible
 snippet ovy
-    overflow-y ${0}
+		overflow-y ${0}
 snippet ovy:a
-    overflow-y auto
+		overflow-y auto
 snippet ovy:h
-    overflow-y hidden
+		overflow-y hidden
 snippet ovy:s
-    overflow-y scroll
+		overflow-y scroll
 snippet ovy:v
-    overflow-y visible
+		overflow-y visible
 snippet ov
-    overflow ${0}
+		overflow ${0}
 snippet ov:a
-    overflow auto
+		overflow auto
 snippet ov:h
-    overflow hidden
+		overflow hidden
 snippet ov:s
-    overflow scroll
+		overflow scroll
 snippet ov:v
-    overflow visible
+		overflow visible
 snippet pb
-    padding-bottom ${0}
+		padding-bottom ${0}
 snippet pl
-    padding-left ${0}
+		padding-left ${0}
 snippet pr
-    padding-right ${0}
+		padding-right ${0}
 snippet pt
-    padding-top ${0}
+		padding-top ${0}
 snippet p
-    padding ${0}
+		padding ${0}
 snippet p:4
-    padding ${1:0} ${2:0} ${3:0} ${0:0}
+		padding ${1:0} ${2:0} ${3:0} ${0:0}
 snippet p:3
-    padding ${1:0} ${2:0} ${0:0}
+		padding ${1:0} ${2:0} ${0:0}
 snippet p:2
-    padding ${1:0} ${0:0}
+		padding ${1:0} ${0:0}
 snippet p:0
-    padding 0
+		padding 0
 snippet pgba
-    page-break-after ${0}
+		page-break-after ${0}
 snippet pgba:aw
-    page-break-after always
+		page-break-after always
 snippet pgba:a
-    page-break-after auto
+		page-break-after auto
 snippet pgba:l
-    page-break-after left
+		page-break-after left
 snippet pgba:r
-    page-break-after right
+		page-break-after right
 snippet pgbb
-    page-break-before ${0}
+		page-break-before ${0}
 snippet pgbb:aw
-    page-break-before always
+		page-break-before always
 snippet pgbb:a
-    page-break-before auto
+		page-break-before auto
 snippet pgbb:l
-    page-break-before left
+		page-break-before left
 snippet pgbb:r
-    page-break-before right
+		page-break-before right
 snippet pgbi
-    page-break-inside ${0}
+		page-break-inside ${0}
 snippet pgbi:a
-    page-break-inside auto
+		page-break-inside auto
 snippet pgbi:av
-    page-break-inside avoid
+		page-break-inside avoid
 snippet pos
-    position ${0}
+		position ${0}
 snippet pos:a
-    position absolute
+		position absolute
 snippet pos:f
-    position fixed
+		position fixed
 snippet pos:r
-    position relative
+		position relative
 snippet pos:s
-    position static
+		position static
 snippet q
-    quotes ${0}
+		quotes ${0}
 snippet q:en
-    quotes '\201C' '\201D' '\2018' '\2019'
+		quotes '\201C' '\201D' '\2018' '\2019'
 snippet q:n
-    quotes none
+		quotes none
 snippet q:ru
-    quotes '\00AB' '\00BB' '\201E' '\201C'
+		quotes '\00AB' '\00BB' '\201E' '\201C'
 snippet rz
-    resize ${0}
+		resize ${0}
 snippet rz:b
-    resize both
+		resize both
 snippet rz:h
-    resize horizontal
+		resize horizontal
 snippet rz:n
-    resize none
+		resize none
 snippet rz:v
-    resize vertical
+		resize vertical
 snippet r
-    right ${0}
+		right ${0}
 snippet r:a
-    right auto
+		right auto
 snippet tbl
-    table-layout ${0}
+		table-layout ${0}
 snippet tbl:a
-    table-layout auto
+		table-layout auto
 snippet tbl:f
-    table-layout fixed
+		table-layout fixed
 snippet tal
-    text-align-last ${0}
+		text-align-last ${0}
 snippet tal:a
-    text-align-last auto
+		text-align-last auto
 snippet tal:c
-    text-align-last center
+		text-align-last center
 snippet tal:l
-    text-align-last left
+		text-align-last left
 snippet tal:r
-    text-align-last right
+		text-align-last right
 snippet ta
-    text-align ${0}
+		text-align ${0}
 snippet ta:c
-    text-align center
+		text-align center
 snippet ta:l
-    text-align left
+		text-align left
 snippet ta:r
-    text-align right
+		text-align right
 snippet td
-    text-decoration ${0}
+		text-decoration ${0}
 snippet td:l
-    text-decoration line-through
+		text-decoration line-through
 snippet td:n
-    text-decoration none
+		text-decoration none
 snippet td:o
-    text-decoration overline
+		text-decoration overline
 snippet td:u
-    text-decoration underline
+		text-decoration underline
 snippet te
-    text-emphasis ${0}
+		text-emphasis ${0}
 snippet te:ac
-    text-emphasis accent
+		text-emphasis accent
 snippet te:a
-    text-emphasis after
+		text-emphasis after
 snippet te:b
-    text-emphasis before
+		text-emphasis before
 snippet te:c
-    text-emphasis circle
+		text-emphasis circle
 snippet te:ds
-    text-emphasis disc
+		text-emphasis disc
 snippet te:dt
-    text-emphasis dot
+		text-emphasis dot
 snippet te:n
-    text-emphasis none
+		text-emphasis none
 snippet th
-    text-height ${0}
+		text-height ${0}
 snippet th:a
-    text-height auto
+		text-height auto
 snippet th:f
-    text-height font-size
+		text-height font-size
 snippet th:m
-    text-height max-size
+		text-height max-size
 snippet th:t
-    text-height text-size
+		text-height text-size
 snippet ti
-    text-indent ${0}
+		text-indent ${0}
 snippet ti:-
-    text-indent -9999px
+		text-indent -9999px
 snippet tj
-    text-justify ${0}
+		text-justify ${0}
 snippet tj:a
-    text-justify auto
+		text-justify auto
 snippet tj:d
-    text-justify distribute
+		text-justify distribute
 snippet tj:ic
-    text-justify inter-cluster
+		text-justify inter-cluster
 snippet tj:ii
-    text-justify inter-ideograph
+		text-justify inter-ideograph
 snippet tj:iw
-    text-justify inter-word
+		text-justify inter-word
 snippet tj:k
-    text-justify kashida
+		text-justify kashida
 snippet tj:t
-    text-justify tibetan
+		text-justify tibetan
 snippet to+
-    text-outline ${1:0} ${2:0} ${0}
+		text-outline ${1:0} ${2:0} ${0}
 snippet to
-    text-outline ${0}
+		text-outline ${0}
 snippet to:n
-    text-outline none
+		text-outline none
 snippet tr
-    text-replace ${0}
+		text-replace ${0}
 snippet tr:n
-    text-replace none
+		text-replace none
 snippet tsh+
-    text-shadow ${1:0} ${2:0} ${3:0} ${0}
+		text-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet tsh
-    text-shadow ${0}
+		text-shadow ${0}
 snippet tsh:n
-    text-shadow none
+		text-shadow none
 snippet tt
-    text-transform ${0}
+		text-transform ${0}
 snippet tt:c
-    text-transform capitalize
+		text-transform capitalize
 snippet tt:l
-    text-transform lowercase
+		text-transform lowercase
 snippet tt:n
-    text-transform none
+		text-transform none
 snippet tt:u
-    text-transform uppercase
+		text-transform uppercase
 snippet tw
-    text-wrap ${0}
+		text-wrap ${0}
 snippet tw:no
-    text-wrap none
+		text-wrap none
 snippet tw:n
-    text-wrap normal
+		text-wrap normal
 snippet tw:s
-    text-wrap suppress
+		text-wrap suppress
 snippet tw:u
-    text-wrap unrestricted
+		text-wrap unrestricted
 snippet t
-    top ${0}
+		top ${0}
 snippet t:a
-    top auto
+		top auto
 snippet va
-    vertical-align ${0}
+		vertical-align ${0}
 snippet va:bl
-    vertical-align baseline
+		vertical-align baseline
 snippet va:b
-    vertical-align bottom
+		vertical-align bottom
 snippet va:m
-    vertical-align middle
+		vertical-align middle
 snippet va:sub
-    vertical-align sub
+		vertical-align sub
 snippet va:sup
-    vertical-align super
+		vertical-align super
 snippet va:tb
-    vertical-align text-bottom
+		vertical-align text-bottom
 snippet va:tt
-    vertical-align text-top
+		vertical-align text-top
 snippet va:t
-    vertical-align top
+		vertical-align top
 snippet v
-    visibility ${0}
+		visibility ${0}
 snippet v:c
-    visibility collapse
+		visibility collapse
 snippet v:h
-    visibility hidden
+		visibility hidden
 snippet v:v
-    visibility visible
+		visibility visible
 snippet whsc
-    white-space-collapse ${0}
+		white-space-collapse ${0}
 snippet whsc:ba
-    white-space-collapse break-all
+		white-space-collapse break-all
 snippet whsc:bs
-    white-space-collapse break-strict
+		white-space-collapse break-strict
 snippet whsc:k
-    white-space-collapse keep-all
+		white-space-collapse keep-all
 snippet whsc:l
-    white-space-collapse loose
+		white-space-collapse loose
 snippet whsc:n
-    white-space-collapse normal
+		white-space-collapse normal
 snippet whs
-    white-space ${0}
+		white-space ${0}
 snippet whs:n
-    white-space normal
+		white-space normal
 snippet whs:nw
-    white-space nowrap
+		white-space nowrap
 snippet whs:pl
-    white-space pre-line
+		white-space pre-line
 snippet whs:pw
-    white-space pre-wrap
+		white-space pre-wrap
 snippet whs:p
-    white-space pre
+		white-space pre
 snippet wid
-    widows ${0}
+		widows ${0}
 snippet w
-    width ${0}
+		width ${0}
 snippet w:a
-    width auto
+		width auto
 snippet wob
-    word-break ${0}
+		word-break ${0}
 snippet wob:ba
-    word-break break-all
+		word-break break-all
 snippet wob:bs
-    word-break break-strict
+		word-break break-strict
 snippet wob:k
-    word-break keep-all
+		word-break keep-all
 snippet wob:l
-    word-break loose
+		word-break loose
 snippet wob:n
-    word-break normal
+		word-break normal
 snippet wos
-    word-spacing ${0}
+		word-spacing ${0}
 snippet wow
-    word-wrap ${0}
+		word-wrap ${0}
 snippet wow:no
-    word-wrap none
+		word-wrap none
 snippet wow:n
-    word-wrap normal
+		word-wrap normal
 snippet wow:s
-    word-wrap suppress
+		word-wrap suppress
 snippet wow:u
-    word-wrap unrestricted
+		word-wrap unrestricted
 snippet z
-    z-index ${0}
+		z-index ${0}
 snippet z:a
-    z-index auto
+		z-index auto
 snippet zoo
-    zoom 1
+		zoom 1
 snippet :h
-    :hover
+		:hover
 snippet :fc
-    :first-child
+		:first-child
 snippet :lc
-    :last-child
+		:last-child
 snippet :nc
-    :nth-child(${0})
+		:nth-child(${0})
 snippet :nlc
-    :nth-last-child(${0})
+		:nth-last-child(${0})
 snippet :oc
-    :only-child
+		:only-child
 snippet :a
-    :after
+		:after
 snippet :b
-    :before
+		:before
 snippet ::a
-    ::after
+		::after
 snippet ::b
-    ::before
+		::before
 snippet if
-    if ${0}
+		if ${0}
 snippet mix
-    ${1}(${0})
+		${1}(${0})
 snippet for
-    for ${1:i} in ${0}
+		for ${1:i} in ${0}
 snippet keyf
-    @keyframes ${0}
+		@keyframes ${0}

From 000fad2c34fe4686f33611671bf80d10a13f2f84 Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Mon, 5 Jan 2015 09:37:56 +0100
Subject: [PATCH 0517/1587] Added Laravel Snippet

---
 UltiSnips/php_laravel.snippets | 260 +++++++++++++++++++++++++++++++++
 snippets/laravel.snippets      |  18 +++
 2 files changed, 278 insertions(+)
 create mode 100644 UltiSnips/php_laravel.snippets
 create mode 100644 snippets/laravel.snippets

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
new file mode 100644
index 000000000..12038627a
--- /dev/null
+++ b/UltiSnips/php_laravel.snippets
@@ -0,0 +1,260 @@
+#resource controller
+snippet l_rsc "Laravel resource controller"
+/*!
+ * \class       ${1:`!v expand('%:t:r')`}
+ *
+ * \author      ${2:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+class $1 {
+    public function index() {
+        ${3}
+    }
+    
+    public function create() {
+        ${4}
+    }
+    
+    public function store($id) {
+        ${5}
+    }
+    
+    public function show($id) {
+        ${6}
+    }
+    
+    public function edit($id) {
+        ${7}
+    }
+    
+    public function update($id) {
+        ${8}
+    }
+    
+    public function destroy($id) {
+        ${9}
+    }
+}
+endsnippet
+
+#service service provider
+snippet l_ssp "Laravel service provider for service"
+/*!
+ * \namespace   ${1:Services}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use Illuminate\Support\ServiceProvider;
+
+class $2 extends ServiceProvider {
+    
+    public function register() {
+        $this->app->bind('${4}Service', function ($app) {
+            return new ${5}(
+                $app->make('Repositories\\${6}Interface'),
+            );
+        });
+    }
+}
+endsnippet
+
+#repository service provider
+snippet l_rsp "Laravel service provider for repository"
+/*!
+ * \namespace   ${2:Repositories\\${1:}}
+ * \class       ${3:`!v expand('%:t:r')`}
+ *
+ * \author      ${4:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $4;
+
+use Entities\\$1;
+use $2\\$1Repository;
+use Illuminate\Support\ServiceProvider;
+
+class $3 extends ServiceProvider {
+    /*!
+     * \var     defer
+     * \brief   Defer service
+     */
+    protected $defer = ${5:true};
+
+    public function register() {
+        $this->app->bind('$2\\$1Interface', function($app) {
+            return new $1Repository(new $1());
+        });
+    }
+
+    /*!
+     * \brief   If $defer == true need this fn
+     */ 
+    public function provides() {
+        return ['$2\\$1Interface'];
+    }
+}
+endsnippet
+
+#model
+snippet l_md "Laravel simple model"
+/*!
+ * \namespace   ${1:Entities}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+class $2 extends \Eloquent {
+    protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
+
+    public $timestamps = '${5:false}';
+
+    protected $hidden  = array(${6});
+
+    protected $guarded = array(${7:'id'});
+}
+endsnippet
+
+#abstract repository
+snippet l_ar "Laravel abstract Repository"
+/*!
+ * \namespace   ${1:Repositories}
+ * \class       ${2:`!v expand('%:t:r')`}
+ * \implements  ${3:BaseRepositoryInterface}
+ *
+ * \author      ${4:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use Illuminate\Database\Eloquent\Model;
+
+abstract class $2 implements $3 {
+    protected $model;
+
+    /*!
+     * \fn      __construct
+     *
+     * \brief   Take the model
+     */
+
+    public function __construct(Model $model) {
+        $this->model = $model;
+    }
+
+    /*!
+     * \fn      all
+     *
+     * \return  Illuminate\Database\Eloquent\Collection
+     */
+    public function all($columns = array('*')) {
+        return $this->model->all()->toArray();
+    }
+
+    /*!
+     * \fn      create
+     *
+     * \return  Illuminate\Database\Eloquent\Model
+     */
+    public function create(array $attributes) {
+        return $this->model->create($attributes);
+    }
+
+    /*!
+     * \fn      destroy
+     *
+     * \return  int
+     */
+    public function destroy($ids) {
+        return $this->model->destroy($ids);
+    }
+
+    /*!
+     * \fn      find
+     *
+     * \return  mixed
+     */
+    public function find($id, $columns = array('*')) {
+        return $this->model->find($id, $columns);
+    }
+}
+endsnippet
+
+#repository
+snippet l_r "Laravel Repository"
+/*!
+ * \namespace   ${1:Repositories\\${2}}
+ * \class       ${3:`!v expand('%:t:r')`}
+ * \implements  ${4:BaseRepositoryInterface}
+ *
+ * \author      ${5:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+class $3 extends \\$1 implements $4 {
+    ${6}
+}
+endsnippet
+
+#service
+snippet l_s "Laravel Service"
+/*!
+ * \namespace   ${1:Services}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use ${4:Repositories\\${5:Interface}};
+
+class $2 {
+    protected $${6:repo};
+    
+    /*!
+     * \fn      __construct
+     */
+    public function __construct($4 $repo) {
+        $this->$6 = $repo;
+    }
+}
+endsnippet
+
+#facade
+snippet l_f "Laravel Facade"
+/*!
+ * \namespace   ${1:Services}
+ * \class       ${2:`!v expand('%:t:r')`}
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace $1;
+
+use \Illuminate\Support\Facades\Facade;
+
+class $2 extends Facade {
+    /*!
+     * \fn          getFacadeAccessor
+     *
+     * \return      string
+     */
+    protected static function getFacadeAccessor() { return '${5:${4}Service}'; }
+}
+endsnippet
diff --git a/snippets/laravel.snippets b/snippets/laravel.snippets
new file mode 100644
index 000000000..b111e181f
--- /dev/null
+++ b/snippets/laravel.snippets
@@ -0,0 +1,18 @@
+#resource controller
+snippet doc_rsc
+	/*!
+	 * \namespace	${1}
+	 * \class		${2:$1}
+	 *
+	 * \author		${3:Claudio Maradonna} ${4:<claudiom@keyson.it>}
+	 * \date		`strftime('%d-%m-%y')`
+	 */
+	class $$1 {
+		public function index() {}
+		public function create() {}
+		public function store($id) {}
+		public function show($id) {}
+		public function edit($id) {}
+		public function update($id) {}
+		public function destroy($id) {}
+	}

From 052d28286834b3d21f0a3703a74e69548814e9dd Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Mon, 5 Jan 2015 09:38:33 +0100
Subject: [PATCH 0518/1587] Corrected last commit

---
 snippets/laravel.snippets | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 snippets/laravel.snippets

diff --git a/snippets/laravel.snippets b/snippets/laravel.snippets
deleted file mode 100644
index b111e181f..000000000
--- a/snippets/laravel.snippets
+++ /dev/null
@@ -1,18 +0,0 @@
-#resource controller
-snippet doc_rsc
-	/*!
-	 * \namespace	${1}
-	 * \class		${2:$1}
-	 *
-	 * \author		${3:Claudio Maradonna} ${4:<claudiom@keyson.it>}
-	 * \date		`strftime('%d-%m-%y')`
-	 */
-	class $$1 {
-		public function index() {}
-		public function create() {}
-		public function store($id) {}
-		public function show($id) {}
-		public function edit($id) {}
-		public function update($id) {}
-		public function destroy($id) {}
-	}

From 5023e19b965f5fedd09513074fd23322a3bd1336 Mon Sep 17 00:00:00 2001
From: Matt Rasband <matt.rasband@gmail.com>
Date: Mon, 5 Jan 2015 09:08:36 -0500
Subject: [PATCH 0519/1587] updated angular snippets to auto populate params
 based on the param annotations

---
 UltiSnips/javascript_angular.snippets | 30 ++++++++++++++++++---------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/UltiSnips/javascript_angular.snippets b/UltiSnips/javascript_angular.snippets
index 61b52293c..91b593165 100644
--- a/UltiSnips/javascript_angular.snippets
+++ b/UltiSnips/javascript_angular.snippets
@@ -19,49 +19,59 @@ config(function($1) {
 endsnippet
 
 snippet acont "angular controller" i
-controller('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+controller('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet aconts "angular controller with scope" i
-controller('${1:name}', ['$scope', function($scope) {
+controller('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet adir "angular directive" i
-directive('${1:name}', ['${2:param_annotation}', function(${3:param}) {
-	$0
+directive('${1}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	return {
+		restrict: '${3:EA}',
+		link: function(scope, element, attrs) {
+			${0}
+		}
+	};
 }]);
 endsnippet
 
 snippet adirs "angular directive with scope" i
-directive('${1:name}', ['$scope', function($scope) {
-	$0
+directive('${1}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	return {
+		restrict: '${3:EA}',
+		link: function(scope, element, attrs) {
+			${0}
+		}
+	};
 }]);
 endsnippet
 
 snippet afact "angular factory" i
-factory('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+factory('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet afacts "angular factory with scope" i
-factory('${1:name}', ['$scope', function($scope) {
+factory('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet aserv "angular service" i
-service('${1:name}', ['${2:param_annotation}', function(${3:param}) {
+service('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
 
 snippet aservs "angular service" i
-service('${1:name}', ['$scope', function($scope) {
+service('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet

From 8832cee4c23444d2c73c64c8dae5728b98113dbb Mon Sep 17 00:00:00 2001
From: Yike Lu <yikelu.home@gmail.com>
Date: Tue, 6 Jan 2015 13:24:16 -0600
Subject: [PATCH 0520/1587] Add iem python snippet for embedded ipython

---
 snippets/python.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index a93b6549c..860b57223 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -129,6 +129,9 @@ snippet pdb
 # ipython debugger (ipdb)
 snippet ipdb
 	import ipdb; ipdb.set_trace()
+# embed ipython itself
+snippet iem
+	import IPython; IPython.embed()
 # ipython debugger (pdbbb)
 snippet pdbbb
 	import pdbpp; pdbpp.set_trace()

From 99fe636f09c842bb3ed491f1b8b36c3ab7ecac9c Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Wed, 7 Jan 2015 11:02:18 -0800
Subject: [PATCH 0521/1587] Snippet for python prompt toolkit embed

https://github.com/jonathanslenders/python-prompt-toolkit

```python
from prompt_toolkit.contrib.repl import embed
embed(globals(), locals(), vi_mode=False, history_filename=None)
```
---
 snippets/python.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 860b57223..77d74e4d9 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -135,6 +135,10 @@ snippet iem
 # ipython debugger (pdbbb)
 snippet pdbbb
 	import pdbpp; pdbpp.set_trace()
+# python_prompt_toolkit
+snippet ppt
+	from prompt_toolkit.contrib.repl import embed
+	embed(globals(), locals(), vi_mode=${1:default=False}, history_filename=${2:default=None})
 # python console debugger (pudb)
 snippet pudb
 	import pudb; pudb.set_trace()

From 18733185c1bc2b516dc7b790069d22f0a53696f1 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 11 Jan 2015 01:41:41 +0000
Subject: [PATCH 0522/1587] Update Rust for to use new range syntax

---
 README.md               | 1 +
 UltiSnips/rust.snippets | 2 +-
 snippets/rust.snippets  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2cb78ca5d..46cc39051 100644
--- a/README.md
+++ b/README.md
@@ -214,6 +214,7 @@ This list is kept up-to-date on a best effort basis.
 * PHP - [chrisyue](http://github.com/chrisyue)
 * Python - [honza](http://github.com/honza)
 * Ruby - [taq](http://github.com/taq)
+* Rust - [lpil](https://github.com/lpil)
 * Scala - [gorodinskiy](https://github.com/gorodinskiy)
 
 License
diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 82a1abb8a..9722d7308 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -164,7 +164,7 @@ while ${1} {
 endsnippet
 
 snippet for "for .. in .." b
-for ${1:i} in ${2:range(0u, 10)} {
+for ${1:i} in ${2:${3:0us}..${4:10}} {
 	${VISUAL}${0}
 }
 endsnippet
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index f135eb587..ad9fb34d1 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -70,7 +70,7 @@ snippet while
 		${0}
 	}
 snippet for
-	for ${1:i} in ${2:range(0u, 10)} {
+	for ${1:i} in ${2:0u..10} {
 		${0}
 	}
 snippet spawn

From 69d3b5e02ed5707347f75eaf6b4a9fe724782d65 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 11 Jan 2015 01:57:32 +0000
Subject: [PATCH 0523/1587] Remove a load of duplication from Rust snippets

---
 UltiSnips/rust.snippets | 183 ----------------------------------------
 snippets/rust.snippets  |  55 ++++++++++--
 2 files changed, 46 insertions(+), 192 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 9722d7308..ddb948f27 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -10,43 +10,6 @@ fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
 }
 endsnippet
 
-snippet test "Test function" b
-#[test]
-fn ${1:test_function_name}() {
-	${VISUAL}${0}
-}
-endsnippet
-
-
-snippet bench "Bench function" b
-#[bench]
-fn ${1:bench_function_name}(b: &mut test::Bencher) {
-	b.iter(|| {
-		${VISUAL}${0}
-	})
-}
-endsnippet
-
-snippet new "A new function" b
-pub fn new(${2}) -> ${1:Name} {
-	${VISUAL}${0}return $1 { ${3} };
-}
-endsnippet
-
-snippet main "The main function" b
-pub fn main() {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet let "A let statement" b
-let ${1:name}${3} = ${VISUAL}${2};
-endsnippet
-
-snippet lmut "let mut = .." b
-let mut ${1:name}${3} = ${VISUAL}${2};
-endsnippet
-
 snippet pri "print!(..)" b
 print!("${1}"${2/..*/, /}${2});
 endsnippet
@@ -67,130 +30,22 @@ macro_rules! ${1:name} (
 )
 endsnippet
 
-snippet ec "extern crate ..." b
-extern crate ${1:sync};
-endsnippet
-
-snippet ecl "...extern crate log;" b
-#![feature(phase)]
-#[phase(plugin, link)] extern crate log;
-endsnippet
-
 snippet mod	 "A module" b
 mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
 	${VISUAL}${0}
 }
 endsnippet
 
-snippet crate "Create header information" b
-// Crate name
-#![crate_name = "${1:crate_name}"]
-
-// Additional metadata attributes
-#![desc = "${2:Descrption.}"]
-#![license = "${3:BSD}"]
-#![comment = "${4:Comment.}"]
-
-// Specify the output type
-#![crate_type = "${5:lib}"]
-endsnippet
-
-snippet allow "#[allow(..)]" b
-#[allow(${1:unused_variable})]
-endsnippet
-
-snippet feat "#![feature(..)]" b
-#![feature(${1:macro_rules})]
-endsnippet
-
-snippet der "#[deriving(..)]" b
-#[deriving(${1:Show})]
-endsnippet
-
-snippet attr "#[..]" b
-#[${1:inline}]
-endsnippet
-
-snippet opt "Option<..>"
-Option<${1:int}>
-endsnippet
-
-snippet res "Result<.., ..>"
-Result<${1:int}, ${2:()}>
-endsnippet
-
-snippet if "if .. (if)" b
-if ${1} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet el "else .. (el)"
-else {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet eli "else if .. (eli)"
-else if ${1} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet ife "if .. else (ife)"
-if ${1} {
-	${2}
-} else {
-	${3}
-}
-endsnippet
-
-snippet mat "match"
-match ${1} {
-	${2} => ${3},
-}
-endsnippet
-
-snippet loop "loop {}" b
-loop {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet while "while .. {}" b
-while ${1} {
-	${VISUAL}${0}
-}
-endsnippet
-
 snippet for "for .. in .." b
 for ${1:i} in ${2:${3:0us}..${4:10}} {
 	${VISUAL}${0}
 }
 endsnippet
 
-snippet spawn "spawn(proc() { .. });" b
-spawn(proc() {
-	${VISUAL}${0}
-});
-endsnippet
-
-snippet chan "A channel" b
-let (${1:tx}, ${2:rx}): (Sender<${3:int}>, Receiver<${4:int}>) = channel();
-endsnippet
-
-snippet duplex "Duplex stream" b
-let (${1:from_child}, ${2:to_child}) = sync::duplex();
-endsnippet
-
 snippet todo "A Todo comment"
 // [TODO]: ${1:Description} - `!v strftime("%Y-%m-%d %I:%M%P")`
 endsnippet
 
-snippet fixme "FIXME comment"
-// FIXME: ${1}
-endsnippet
-
 snippet st "Struct" b
 struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
 	${VISUAL}${0}
@@ -211,42 +66,4 @@ impl $1 {
 }
 endsnippet
 
-snippet enum "An enum" b
-enum ${1:Name} {
-	${VISUAL}${0},
-}
-endsnippet
-
-snippet type "A type" b
-type ${1:NewName} = ${VISUAL}${0};
-endsnippet
-
-snippet imp "An impl" b
-impl ${1:Name} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet drop "Drop implementation" b
-impl Drop for ${1:Name} {
-	fn drop(&mut self) {
-		${VISUAL}${0}
-	}
-}
-endsnippet
-
-snippet trait "Trait definition" b
-trait ${1:Name} {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet ss "A static string."
-static ${1}: &'static str = "${VISUAL}${0}";
-endsnippet
-
-snippet stat "A static variable."
-static ${1}: ${2:uint} = ${VISUAL}${0};
-endsnippet
-
 # vim:ft=snippets:
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index ad9fb34d1..b6ad53ced 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -4,11 +4,7 @@
 
 # Functions
 snippet fn
-	fn ${1:function_name}(${2}) {
-		${0}
-	}
-snippet fn-
-	fn ${1:function_name}(${2}) -> ${3} {
+	fn ${1:function_name}(${2})${3} {
 		${0}
 	}
 snippet test
@@ -16,6 +12,13 @@ snippet test
 	fn ${1:test_function_name}() {
 		${0}
 	}
+snippet bench "Bench function" b
+	#[bench]
+	fn ${1:bench_function_name}(b: &mut test::Bencher) {
+		b.iter(|| {
+			${0}
+		})
+	}
 snippet new
 	pub fn new(${2}) -> ${1:Name} {
 		${0}return $1 { ${3} };
@@ -25,7 +28,9 @@ snippet main
 		${0}
 	}
 snippet let
-	let ${1:name}${3} = ${2};
+	let ${1:name: type} = ${2};
+snippet let
+	let mut ${1:name: type} = ${2};
 snippet pln
 	println!("${1}");
 snippet pln,
@@ -52,19 +57,42 @@ snippet allow
 	#[allow(${1:unused_variable})]
 snippet feat
 	#![feature(${1:macro_rules})]
+snippet der "#[deriving(..)]" b
+	#[deriving(${1:Show})]
+snippet attr "#[..]" b
+	#[${1:inline}]
+
 # Common types
 snippet opt
 	Option<${1:int}>
 snippet res
 	Result<${1:~str}, ${2:()}>
 snippet if
-	if ${1:/* condition */} {
+	if ${1} {
+		${0}
+	}
+snippet ife
+	if ${1} {
+		${2}
+	} else {
+		${0}
+	}
+snippet el
+	else {
+		${0}
+	}
+snippet eli
+	else if ${1} {
 		${0}
 	}
 snippet mat
 	match ${1} {
 		${2} => ${3},
 	}
+snippet loop "loop {}" b
+	loop {
+		${0}
+	}
 snippet while
 	while ${1:condition} {
 		${0}
@@ -83,12 +111,19 @@ snippet duplex
 	let (${1:from_child}, ${2:to_child}) = sync::duplex();
 # TODO commenting
 snippet todo
-	// [TODO]: ${1:Description}
+	// [TODO]: ${0:Description}
+snippet fixme "FIXME comment"
+	// FIXME: $0
+
 # Struct
 snippet st
 	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	}
+snippet stn
+	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+		${0}
+	}
 
 	impl $1 {
 		pub fn new(${2}) -> $1 {
@@ -97,9 +132,11 @@ snippet st
 			};
 		}
 	}
+snippet typ
+	type ${1:NewName} = $0;
 # Enum
 snippet enum
-	enum ${1:enum_name} {
+	enum ${1:Name} {
 		${0},
 	}
 # Impl

From 0ac57c77795bdeeaa57302e74da9527781108870 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 11 Jan 2015 01:58:57 +0000
Subject: [PATCH 0524/1587] Rust: change from uint to new usize type

---
 snippets/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index b6ad53ced..195f254aa 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -159,4 +159,4 @@ snippet trait
 snippet ss
 	static ${1}: &'static str = "${0}";
 snippet stat
-	static ${1}: ${2:uint} = ${0};
+	static ${1}: ${2:usize} = ${0};

From 9bf5d0f4123183b6cb74f273576f2051c029de79 Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Sun, 11 Jan 2015 12:35:37 +0100
Subject: [PATCH 0525/1587] Added b option to prevent snippet inline

---
 UltiSnips/php_laravel.snippets | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
index 12038627a..88906376b 100644
--- a/UltiSnips/php_laravel.snippets
+++ b/UltiSnips/php_laravel.snippets
@@ -1,5 +1,5 @@
 #resource controller
-snippet l_rsc "Laravel resource controller"
+snippet l_rsc "Laravel resource controller" b
 /*!
  * \class       ${1:`!v expand('%:t:r')`}
  *
@@ -39,7 +39,7 @@ class $1 {
 endsnippet
 
 #service service provider
-snippet l_ssp "Laravel service provider for service"
+snippet l_ssp "Laravel service provider for service" b
 /*!
  * \namespace   ${1:Services}
  * \class       ${2:`!v expand('%:t:r')`}
@@ -65,7 +65,7 @@ class $2 extends ServiceProvider {
 endsnippet
 
 #repository service provider
-snippet l_rsp "Laravel service provider for repository"
+snippet l_rsp "Laravel service provider for repository" b
 /*!
  * \namespace   ${2:Repositories\\${1:}}
  * \class       ${3:`!v expand('%:t:r')`}
@@ -103,7 +103,7 @@ class $3 extends ServiceProvider {
 endsnippet
 
 #model
-snippet l_md "Laravel simple model"
+snippet l_md "Laravel simple model" b
 /*!
  * \namespace   ${1:Entities}
  * \class       ${2:`!v expand('%:t:r')`}
@@ -126,7 +126,7 @@ class $2 extends \Eloquent {
 endsnippet
 
 #abstract repository
-snippet l_ar "Laravel abstract Repository"
+snippet l_ar "Laravel abstract Repository" b
 /*!
  * \namespace   ${1:Repositories}
  * \class       ${2:`!v expand('%:t:r')`}
@@ -192,7 +192,7 @@ abstract class $2 implements $3 {
 endsnippet
 
 #repository
-snippet l_r "Laravel Repository"
+snippet l_r "Laravel Repository" b
 /*!
  * \namespace   ${1:Repositories\\${2}}
  * \class       ${3:`!v expand('%:t:r')`}
@@ -210,7 +210,7 @@ class $3 extends \\$1 implements $4 {
 endsnippet
 
 #service
-snippet l_s "Laravel Service"
+snippet l_s "Laravel Service" b
 /*!
  * \namespace   ${1:Services}
  * \class       ${2:`!v expand('%:t:r')`}
@@ -236,7 +236,7 @@ class $2 {
 endsnippet
 
 #facade
-snippet l_f "Laravel Facade"
+snippet l_f "Laravel Facade" b
 /*!
  * \namespace   ${1:Services}
  * \class       ${2:`!v expand('%:t:r')`}

From 83be78b087f51e60eebd2e08dbac5af34874aa9f Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Wed, 14 Jan 2015 22:35:12 +0100
Subject: [PATCH 0526/1587] Bug fix with Laravel snippet

---
 UltiSnips/php_laravel.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
index 88906376b..79018bcc5 100644
--- a/UltiSnips/php_laravel.snippets
+++ b/UltiSnips/php_laravel.snippets
@@ -74,7 +74,7 @@ snippet l_rsp "Laravel service provider for repository" b
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-namespace $4;
+namespace $2;
 
 use Entities\\$1;
 use $2\\$1Repository;

From b51b2766fdd8f901a4bc576d44c74911a3c62621 Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Wed, 14 Jan 2015 22:42:30 +0100
Subject: [PATCH 0527/1587] Another bug fix for Laravel Snippet

---
 UltiSnips/php_laravel.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
index 79018bcc5..33df42723 100644
--- a/UltiSnips/php_laravel.snippets
+++ b/UltiSnips/php_laravel.snippets
@@ -229,7 +229,7 @@ class $2 {
     /*!
      * \fn      __construct
      */
-    public function __construct($4 $repo) {
+    public function __construct($5 $repo) {
         $this->$6 = $repo;
     }
 }

From 634efcfc0ab7e34c1d5131fd44ffbb03fd868a04 Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Wed, 14 Jan 2015 22:44:54 +0100
Subject: [PATCH 0528/1587] Another bug fix for Laravel Snippet

---
 UltiSnips/php_laravel.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
index 33df42723..9f817a8d9 100644
--- a/UltiSnips/php_laravel.snippets
+++ b/UltiSnips/php_laravel.snippets
@@ -57,7 +57,7 @@ class $2 extends ServiceProvider {
     public function register() {
         $this->app->bind('${4}Service', function ($app) {
             return new ${5}(
-                $app->make('Repositories\\${6}Interface'),
+                $app->make('Repositories\\${6}Interface')
             );
         });
     }

From 2ce8ef4ddd20ef3a9d515364af2503dbb40c1f72 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 15 Jan 2015 21:28:50 +0000
Subject: [PATCH 0529/1587] ERB: Remove redundant ultisnips if

---
 UltiSnips/eruby.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index d1a26df36..171f08c80 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -226,10 +226,6 @@ snippet else "else (ERB)"
 	$0
 endsnippet
 
-snippet if "if (ERB)"
-<% if ${1:condition} %>$0
-endsnippet
-
 snippet lf "link_to_function"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to_function ${1:"${2:Greeting}"}, "${3:alert('Hello world!')}"$4`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet

From e14633927092ec448a3ed647121748cc51676483 Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Fri, 16 Jan 2015 11:00:18 +0100
Subject: [PATCH 0530/1587] Optimized Resource Controller Laravel in
 php_laravel snippet

---
 UltiSnips/php_laravel.snippets | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
index 9f817a8d9..b7c88fd31 100644
--- a/UltiSnips/php_laravel.snippets
+++ b/UltiSnips/php_laravel.snippets
@@ -7,33 +7,30 @@ snippet l_rsc "Laravel resource controller" b
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-class $1 {
+class $1 extends ${3: BaseController} {
+    function __construct() {
+        ${4}
+    }
+    
     public function index() {
-        ${3}
     }
     
     public function create() {
-        ${4}
     }
     
     public function store($id) {
-        ${5}
     }
     
     public function show($id) {
-        ${6}
     }
     
     public function edit($id) {
-        ${7}
     }
     
     public function update($id) {
-        ${8}
     }
     
     public function destroy($id) {
-        ${9}
     }
 }
 endsnippet

From 058bde6434a5d18ee97ac0dbb46916a19150aa54 Mon Sep 17 00:00:00 2001
From: m-pilia <martino.pilia@gmail.com>
Date: Sat, 17 Jan 2015 17:10:08 +0100
Subject: [PATCH 0531/1587] remove duplicate license snippets

---
 UltiSnips/ada.snippets | 44 ------------------------------------------
 snippets/ada.snippets  | 38 ------------------------------------
 2 files changed, 82 deletions(-)

diff --git a/UltiSnips/ada.snippets b/UltiSnips/ada.snippets
index d33c77782..cc35c2c25 100644
--- a/UltiSnips/ada.snippets
+++ b/UltiSnips/ada.snippets
@@ -11,10 +11,6 @@ def ada_case(word):
 			out = out + word[i]
 	return out
 
-def get_year():
-	import time
-	return time.strftime("%Y")
-
 endglobal
 
 snippet wi "with"
@@ -281,44 +277,4 @@ snippet newline "Ada.Text_IO.New_Line"
 Ada.Text_IO.New_Line(${1:1});$0
 endsnippet
 
-snippet gpl "GPL license header"
--- This program is free software; you can redistribute it and/or modify
--- it under the terms of the GNU ${1}General Public License as published by
--- the Free Software Foundation; either version ${2:3} of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU $1General Public License for more details.
---
--- You should have received a copy of the GNU $1General Public License
--- along with this program; if not, see <http://www.gnu.org/licenses/>.
---
--- Copyright (C) ${3:Author}, ${4:`!p snip.rv = get_year()`}
-
-$0
-endsnippet
-
-snippet gplf "GPL file license header"
--- This file is part of ${1:Program-Name}.
--- 
--- $1 is free software: you can redistribute it and/or modify
--- it under the terms of the GNU ${2}General Public License as published by
--- the Free Software Foundation, either version ${3:3} of the License, or
--- (at your option) any later version.
--- 
--- $1 is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU $2General Public License for more details.
--- 
--- You should have received a copy of the GNU $2General Public License
--- along with $1. If not, see <http://www.gnu.org/licenses/>.
---
--- Copyright (C) ${4:Author}, ${5:`!p snip.rv = get_year()`}
-
-$0
-endsnippet
-
 # vim:ft=snippets:
diff --git a/snippets/ada.snippets b/snippets/ada.snippets
index ce377b995..1039946fc 100644
--- a/snippets/ada.snippets
+++ b/snippets/ada.snippets
@@ -215,41 +215,3 @@ snippet getl Ada.Text_IO.Get_Line
 snippet newline Ada.Text_IO.New_Line
 	Ada.Text_IO.New_Line(${1:1});${0}
 
-snippet gpl GPL license header
-	-- This program is free software; you can redistribute it and/or modify
-	-- it under the terms of the GNU ${1}General Public License as published by
-	-- the Free Software Foundation; either version ${2:3} of the License, or
-	-- (at your option) any later version.
-	--
-	-- This program is distributed in the hope that it will be useful,
-	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	-- GNU $1General Public License for more details.
-	--
-	-- You should have received a copy of the GNU $1General Public License
-	-- along with this program; if not, see <http://www.gnu.org/licenses/>.
-	--
-	-- Copyright (C) ${3:Author}, ${4:`strftime("%Y")`}
-
-	${0}
-
-snippet gplf GPL file license header
-	-- This file is part of ${1:Program-Name}.
-	--
-	-- $1 is free software: you can redistribute it and/or modify
-	-- it under the terms of the GNU ${2}General Public License as published by
-	-- the Free Software Foundation, either version ${3:3} of the License, or
-	-- (at your option) any later version.
-	-- 
-	-- $1 is distributed in the hope that it will be useful,
-	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	-- GNU $2General Public License for more details.
-	-- 
-	-- You should have received a copy of the GNU $2General Public License
-	-- along with $1. If not, see <http://www.gnu.org/licenses/>.
-	--
-	-- Copyright (C) ${4:Author}, ${5:`strftime("%Y")`}
-
-	${0}
-

From 889e833c69bf3f152168487b16f34a8e578c8cc1 Mon Sep 17 00:00:00 2001
From: m-pilia <martino.pilia@gmail.com>
Date: Sat, 17 Jan 2015 17:10:44 +0100
Subject: [PATCH 0532/1587] add GMGPL linking exception

---
 snippets/_.snippets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index a4032558c..b556554c9 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -102,6 +102,15 @@ snippet AGPL3
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+	${0}
+snippet GMGPL linking exception
+	As a special exception, if other files instantiate generics from
+	this unit, or you link this unit with other files to produce an
+	executable, this unit does not by itself cause the resulting
+	executable to be covered by the GNU General Public License.
+	This exception does not however invalidate any other reasons why the
+	executable file might be covered by the GNU Public License.
+
 	${0}
 snippet BSD2
 	${1:one line to give the program's name and a brief description}

From 78eeb128107e626774732f713f339a3fcab728e7 Mon Sep 17 00:00:00 2001
From: m-pilia <martino.pilia@gmail.com>
Date: Sat, 17 Jan 2015 17:11:20 +0100
Subject: [PATCH 0533/1587] add AWK snippets

---
 snippets/awk.snippets | 102 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 snippets/awk.snippets

diff --git a/snippets/awk.snippets b/snippets/awk.snippets
new file mode 100644
index 000000000..32e56f2f4
--- /dev/null
+++ b/snippets/awk.snippets
@@ -0,0 +1,102 @@
+# cannot use /usr/bin/env because it does not support parameters (as -f)
+snippet #! #!/usr/bin/awk -f
+	#!/usr/bin/awk -f
+
+# @include is a gawk extension
+snippet inc @include
+	@include "${1}"${0}
+
+# @load is a gawk extension
+snippet loa @load
+	@load "${1}"${0}
+
+snippet beg BEGIN { ... }
+	BEGIN {
+		${0}
+	}
+
+# BEGINFILE is a gawk extension
+snippet begf BEGINFILE { ... }
+	BEGINFILE {
+		${0}
+	}
+
+snippet end END { ... }
+	END {
+		${0}
+	}
+
+# ENDFILE is a gawk extension
+snippet endf ENDFILE { ... }
+	ENDFILE {
+		${0}
+	}
+
+snippet pri print
+	print ${1:"${2}"}${0}
+
+snippet printf printf
+	printf("${1:%s}\n", ${2})${0}
+
+snippet ign IGNORECASE
+	IGNORECASE = ${1:1}
+
+snippet if if {...}
+	if (${1}) {
+		${0}
+	}
+
+snippet ife if ... else ...
+	if (${1}) {
+		${2}
+	} else {
+		${0}
+	}
+
+snippet eif else if ...
+	else if (${1}) {
+		${0}
+	}
+
+snippet el else {...}
+	else {
+		${0}
+	}
+
+snippet wh while
+	while (${1}) {
+		${2}
+	}
+
+snippet do do ... while
+	do {
+		${0}
+	} while (${1})
+
+snippet for for
+	for (${2:i} = 0; i < ${1:n}; ${3:++i}) {
+		${0}
+	}
+
+snippet fore for each
+	for (${1:i} in ${2:array}) {
+		${0}
+	}
+
+# the switch is a gawk extension
+snippet sw switch
+	switch (${1}) {
+	case ${2}:
+		${3}
+		break
+	default:
+		${0}
+		break
+	}
+
+# the switch is a gawk extension
+snippet case case
+	case ${1}:
+		${0}
+		break
+

From a167d4833a6e1817d7c1befdfee5b3502f16301a Mon Sep 17 00:00:00 2001
From: Sergey Lebedev <sergey.al.lebedev@gmail.com>
Date: Sun, 18 Jan 2015 19:53:44 +0300
Subject: [PATCH 0534/1587] [puppet.snippet]: s/'/"/ in most of snippets,
 changes in 'file' snippet and some new snippets

---
 snippets/puppet.snippets | 121 +++++++++++++++++++++++----------------
 1 file changed, 73 insertions(+), 48 deletions(-)

diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index a4fdf19fc..8b0a41090 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -90,7 +90,7 @@ snippet class
 		${0}
 	}
 snippet node
-	node '${1:`vim_snippets#Filename('', 'fqdn')`}' {
+	node "${1:`vim_snippets#Filename('', 'fqdn')`}" {
 		${0}
 	}
 snippet case
@@ -107,13 +107,21 @@ snippet if
 	if $${1:variable} {
 		${0}
 	}
+snippet ifd
+	if defined(${1:Resource}["${2:name}"]) {
+		${0}
+	}
+snippet ifnd
+	if !defined(${1:Resource}["${2:name}"]) {
+		${0}
+	}
 snippet el
 	else {
 		${0}
 	}
 snippet ?
 	? {
-		'${1}'	=> ${0}
+		"${1}"	=> ${0}
 	  }
 #
 # blocks etc and general syntax sugar
@@ -122,98 +130,98 @@ snippet [
 snippet >
 	${1}	=> ${0}
 snippet p:
-	'puppet://puppet/${1:module name}/${0:file name}'
+	"puppet://puppet/${1:module name}/${0:file name}"
 #
 # Functions
 snippet alert
-	alert('${1:message}')
+	alert("${1:message}")
 snippet crit
-	crit('${1:message}')
+	crit("${1:message}")
 snippet debug
-	debug('${1:message}')
+	debug("${1:message}")
 snippet defined
-	defined(${1:Resource}['${2:name}'])
+	defined(${1:Resource}["${2:name}"])
 snippet emerg
-	emerg('${1:message}')
+	emerg("${1:message}")
 snippet extlookup Simple extlookup
-	extlookup('${1:variable}')
+	extlookup("${1:variable}")
 snippet extlookup Extlookup with defaults
-	extlookup('${1:variable}', '${2:default}')
+	extlookup("${1:variable}", "${2:default}")
 snippet extlookup Extlookup with defaults and custom data file
-	extlookup('${1:variable}', '${2:default}', '${3:data source}')
+	extlookup("${1:variable}", "${2:default}", "${3:data source}")
 snippet fail
-	fail('${1:message}')
+	fail("${1:message}")
 snippet info
-	info('${1:message}')
+	info("${1:message}")
 snippet inline_template
-	inline_template('<%= ${1} %>')
+	inline_template("<%= ${1} %>")
 snippet notice
-	notice('${1:message}')
+	notice("${1:message}")
 snippet realize
 	realize(${1:Resource}[${2:name}])
 snippet regsubst
-	regsubst(${1:hay stack}, ${2:needle}, '${3:replacement}')
+	regsubst(${1:hay stack}, ${2:needle}, "${3:replacement}")
 snippet inc
 	include ${1:classname}
 snippet split
-	split(${1:hay stack}, '${2:patten}')
+	split(${1:hay stack}, "${2:patten}")
 snippet versioncmp
-	versioncmp('${1:version}', '${2:version}')
+	versioncmp("${1:version}", "${2:version}")
 snippet warning
-	warning('${1:message}')
+	warning("${1:message}")
 #
 # Types
 snippet cron
-	cron { '${1:name}':
-		command => '${2}',
-		user    => '${3:root}',
+	cron { "${1:name}":
+		command => "${2}",
+		user    => "${3:root}",
 		${4}    => ${0},
 	}
 
 snippet exec
-	exec { '${1:name}':
-		command => '${2:$1}',
-		user    => '${3:root}',
+	exec { "${1:name}":
+		command => "${2:$1}",
+		user    => "${3:root}",
 		${4}    => ${0},
 	}
 
 snippet user
-	user { '${1:user}':
+	user { "${1:user}":
 		ensure      => present,
-		comment     => '${2:$1}',
+		comment     => "${2:$1}",
 		managehome  => true,
-		home        => '${0:/home/$1}',
+		home        => "${0:/home/$1}",
 	}
 
 snippet group
-	group { '${1:group}':
+	group { "${1:group}":
 		ensure => ${0:present},
 	}
 
 snippet host
-	host { '${1:hostname}':
+	host { "${1:hostname}":
 		ip => ${0:127.0.0.1},
 	}
 
 snippet mailalias
-	mailalias { '${1:localpart}':
-		recipient => '${0:recipient}',
+	mailalias { "${1:localpart}":
+		recipient => "${0:recipient}",
 	}
 
 snippet mount
-	mount { '${1:destination path}':
+	mount { "${1:destination path}":
 		ensure	=> ${2:mounted},
-		device	=> '${0:device name or path}',
+		device	=> "${0:device name or path}",
 	}
 
 snippet package
-	package { '${1:package name}':
+	package { "${1:package name}":
 		ensure	=> ${0:present},
 	}
 
 snippet yumrepo
-	yumrepo { '${1:repo name}':
-		Descr   => '${2:$1}',
+	yumrepo { "${1:repo name}":
+		Descr   => "${2:$1}",
 		enabled => ${0:1},
 	}
 
@@ -223,22 +231,39 @@ snippet define
 	}
 
 snippet service
-	service { '${1:service}' :
+	service { "${1:service}" :
 		ensure    => running,
 		enable    => true,
-		require   => [ Package['${2:package}'], File['${3:file}'], ],
-		subscribe => [ File['${4:configfile1}'], File['${5:configfile2}'], Package['${6:package}'], ],
+		require   => [ Package["${2:package}"], File["${3:file}"], ],
+		subscribe => [ File["${4:configfile1}"], File["${5:configfile2}"], Package["${6:package}"], ],
 	}
 
 snippet file
-	file { '${1:filename}' :
+	file { "${1:filename}" :
 		ensure  => ${2:present},
-		owner   => '${3:root}',
-		group   => '${4:root}',
-		mode    => '${5:0644}',
-		source  => 'puppet:///modules/${6:module}/${7:source}',
-		content => template('/etc/puppet/templates/${8:template}'),
-		alias   => '${9:alias}',
-		require => [ Package['${10:package}'], File['${11:file}'], ],
+		owner   => "${3:root}",
+		group   => "${4:root}",
+		mode    => "${5:0644}",
+		source  => "puppet:///modules/${6:module}/${7:source}",
+		content => template("${8:module}/${9:template}"),
+		alias   => "${10:alias}",
+		require => [ Package["${11:package}"], File["${12:file}"], ],
+	}
+
+snippet archive
+	archive { "${1:filename}" :
+		ensure     => ${2:present},
+		url        => "http://${3:url}",
+		extension  => "${4:tgz}",
+		target     => "${5:target}",
+		checksum   => ${6:false},
+		src_target => "${7:/tmp}",
+	}
+
+snippet firewall
+	firewall { "${1:comment}" :
+		proto	=> ${2:tcp},
+		action	=> ${3:accept},
+		port	=> ${4},
 	}
 

From 147001fb019b63546a4f5b6c1201fc4a0bb89240 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 18 Jan 2015 22:04:00 +0000
Subject: [PATCH 0535/1587] Remove extra newlines from _ snippets

---
 snippets/_.snippets | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index b556554c9..ff52c0a55 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -29,7 +29,6 @@ snippet GPL2
 
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, see <http://www.gnu.org/licenses/>.
-
 	${0}
 snippet LGPL2
 	${1:One line to give the program's name and a brief description.}
@@ -47,7 +46,6 @@ snippet LGPL2
 
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
-
 	${0}
 snippet GPL3
 	${1:one line to give the program's name and a brief description.}
@@ -65,7 +63,6 @@ snippet GPL3
 
 	You should have received a copy of the GNU General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 	${0}
 snippet LGPL3
 	${1:One line to give the program's name and a brief description.}
@@ -83,7 +80,6 @@ snippet LGPL3
 
 	You should have received a copy of the GNU Lesser General Public License
 	along with this library; if not, see <http://www.gnu.org/licenses/>.
-
 	${0}
 snippet AGPL3
 	${1:one line to give the program's name and a brief description.}
@@ -101,7 +97,6 @@ snippet AGPL3
 
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 	${0}
 snippet GMGPL linking exception
 	As a special exception, if other files instantiate generics from
@@ -140,7 +135,6 @@ snippet BSD2
 	The views and conclusions contained in the software and documentation
 	are those of the authors and should not be interpreted as representing
 	official policies, either expressedor implied, of $2.
-
 	${0}
 snippet BSD3
 	${1:one line to give the program's name and a brief description}
@@ -168,7 +162,6 @@ snippet BSD3
 	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 	${0}
 snippet BSD4
 	${1:one line to give the program's name and a brief description}
@@ -199,7 +192,6 @@ snippet BSD4
 	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 	${0}
 snippet MIT
 	${1:one line to give the program's name and a brief description}
@@ -222,7 +214,6 @@ snippet MIT
 	DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 	OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 	${0}
 snippet APACHE
 	${1:one line to give the program's name and a brief description}
@@ -239,7 +230,6 @@ snippet APACHE
 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 	See the License for the specific language governing permissions and
 	limitations under the License.
-
 	${0}
 snippet BEERWARE
 	${1:one line to give the program's name and a brief description}
@@ -249,7 +239,6 @@ snippet BEERWARE
 	$2 wrote this file. As long as you retain this notice you
 	can do whatever you want with this stuff. If we meet some day, and you think
 	this stuff is worth it, you can buy me a beer or coffee in return
-
 	${0}
 snippet WTFPL
 			DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
@@ -271,5 +260,4 @@ snippet MPL2
 	This Source Code Form is subject to the terms of the Mozilla Public
 	License, v. 2.0. If a copy of the MPL was not distributed with this
 	file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 	${0}

From 66079c34e877e981f1fe7c4cdc5c511c2116300b Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Tue, 20 Jan 2015 17:12:38 +0100
Subject: [PATCH 0536/1587] Bug fix laravel snippet

---
 UltiSnips/php_laravel.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
index b7c88fd31..26eda92ba 100644
--- a/UltiSnips/php_laravel.snippets
+++ b/UltiSnips/php_laravel.snippets
@@ -114,7 +114,7 @@ namespace $1;
 class $2 extends \Eloquent {
     protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
 
-    public $timestamps = '${5:false}';
+    public $timestamps = ${5:false};
 
     protected $hidden  = array(${6});
 

From 9e904e17df7186d5efc7efc8c44ceaf21e46f363 Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Tue, 20 Jan 2015 17:21:02 +0100
Subject: [PATCH 0537/1587] Another bug fix

---
 UltiSnips/php_laravel.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
index 26eda92ba..d39a77b8b 100644
--- a/UltiSnips/php_laravel.snippets
+++ b/UltiSnips/php_laravel.snippets
@@ -193,7 +193,7 @@ snippet l_r "Laravel Repository" b
 /*!
  * \namespace   ${1:Repositories\\${2}}
  * \class       ${3:`!v expand('%:t:r')`}
- * \implements  ${4:BaseRepositoryInterface}
+ * \implements  ${4:$3RepositoryInterface}
  *
  * \author      ${5:`!v g:snips_author`}
  * \date        `!v strftime('%d-%m-%y')`

From d9a5607c8fac8244f7fe753c316411b699d289f9 Mon Sep 17 00:00:00 2001
From: Ches Martin <ches@whiskeyandgrits.net>
Date: Sun, 25 Jan 2015 01:12:29 +0800
Subject: [PATCH 0538/1587] erlang: remove spaces before parens in UltiSnips

This is almost never seen in common Erlang style, and was inconsistent
with the Snipmate snippets for Erlang.

Adds a list comprehension snippet, as a bonus.
---
 UltiSnips/erlang.snippets | 52 ++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/UltiSnips/erlang.snippets b/UltiSnips/erlang.snippets
index e27fbefae..f317685c0 100644
--- a/UltiSnips/erlang.snippets
+++ b/UltiSnips/erlang.snippets
@@ -5,12 +5,12 @@
 priority -50
 
 snippet pat "Case:Receive:Try Clause"
-${1:pattern}${2: when ${3:guard}} ->;
+${1:pattern}${2: when ${3:guard}} ->
 	${4:body}
 endsnippet
 
-snippet beh "Behaviour Directive"
--behaviour (${1:behaviour}).
+snippet beh "Behaviour Directive" b
+-behaviour(${1:behaviour}).
 endsnippet
 
 snippet case "Case Expression"
@@ -20,12 +20,12 @@ case ${1:expression} of
 end
 endsnippet
 
-snippet def "Define Directive"
--define (${1:macro}${2: (${3:param})}, ${4:body}).
+snippet def "Define Directive" b
+-define(${1:macro}${2: (${3:param})}, ${4:body}).
 endsnippet
 
-snippet exp "Export Directive"
--export ([${1:function}/${2:arity}]).
+snippet exp "Export Directive" b
+-export([${1:function}/${2:arity}]).
 endsnippet
 
 snippet fun "Fun Expression"
@@ -36,7 +36,7 @@ end
 endsnippet
 
 snippet fu "Function"
-${1:function} (${2:param})${3: when ${4:guard}} ->
+${1:function}(${2:param})${3: when ${4:guard}} ->
 	${5:body}
 endsnippet
 
@@ -47,24 +47,24 @@ if
 end
 endsnippet
 
-snippet ifdef "Ifdef Directive"
--ifdef (${1:macro}).
+snippet ifdef "Ifdef Directive" b
+-ifdef(${1:macro}).
 endsnippet
 
-snippet ifndef "Ifndef Directive"
--ifndef (${1:macro}).
+snippet ifndef "Ifndef Directive" b
+-ifndef(${1:macro}).
 endsnippet
 
-snippet imp "Import Directive"
--import (${1:module}, [${2:function}/${3:arity}]).
+snippet imp "Import Directive" b
+-import(${1:module}, [${2:function}/${3:arity}]).
 endsnippet
 
-snippet inc "Include Directive"
--include ("${1:file}").
+snippet inc "Include Directive" b
+-include("${1:file}").
 endsnippet
 
-snippet mod "Module Directive"
--module (${1:`!p snip.rv = snip.basename or "module"`}).
+snippet mod "Module Directive" b
+-module(${1:`!p snip.rv = snip.basename or "module"`}).
 endsnippet
 
 snippet rcv "Receive Expression"
@@ -77,8 +77,8 @@ ${6:after
 end
 endsnippet
 
-snippet rec "Record Directive"
--record (${1:record}, {${2:field}${3: = ${4:value}}}).
+snippet rec "Record Directive" b
+-record(${1:record}, {${2:field}${3: = ${4:value}}}).
 endsnippet
 
 snippet try "Try Expression"
@@ -93,8 +93,16 @@ ${13:after
 end
 endsnippet
 
-snippet undef "Undef Directive"
--undef (${1:macro}).
+snippet undef "Undef Directive" b
+-undef(${1:macro}).
+endsnippet
+
+snippet || "List Comprehension"
+[${1:X} || ${2:X} <- ${3:List}${4:, gen}]
+endsnippet
+
+snippet gen "Generator Expression"
+${1:X} <- ${2:List}${3:, gen}
 endsnippet
 
 # vim:ft=snippets:

From 0966fa0b20cc5c464168bede731c9924d2343408 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Sun, 25 Jan 2015 22:07:29 +0100
Subject: [PATCH 0539/1587] Fix false positive hyphen list item expansion.

Fix #491.
---
 snippets/markdown.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index 08cdb45ed..63491e867 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -71,6 +71,8 @@ snippet ===
 	`repeat('=', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
 	${0}
+snippet -
+	-   ${0}
 snippet ---
 	`repeat('-', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 

From e187f5a78478353284f3d954472307dbbd6db320 Mon Sep 17 00:00:00 2001
From: Andrea Giardini <contact@andreagiardini.com>
Date: Mon, 26 Jan 2015 15:56:29 +0100
Subject: [PATCH 0540/1587] Added snippet for remote python debugger (rpdb)

---
 snippets/python.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 77d74e4d9..3fa72b07a 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -135,6 +135,9 @@ snippet iem
 # ipython debugger (pdbbb)
 snippet pdbbb
 	import pdbpp; pdbpp.set_trace()
+# remote python debugger (rpdb)
+snippet rpdb
+	import rpdb; rpdb.set_trace()
 # python_prompt_toolkit
 snippet ppt
 	from prompt_toolkit.contrib.repl import embed

From 5b86f089dc149d4b1586cf980dfc90ee3d2c8f99 Mon Sep 17 00:00:00 2001
From: Julien Deniau <julien.deniau@gmail.com>
Date: Fri, 30 Jan 2015 15:25:14 +0100
Subject: [PATCH 0541/1587] Update PHP getter setter

Add return / parameter types
Set @param and @return
---
 UltiSnips/php.snippets | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index def2116b3..366346a65 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -102,44 +102,54 @@ var_export(${1});${2}
 endsnippet
 
 snippet getter "PHP Class Getter" b
-/*
+/**
  * Getter for $1
+ *
+ * ${2:return string}
  */
 public function get${1/\w+\s*/\u$0/}()
 {
-	return $this->$1;$2
+    return $this->$1;$3
 }
-$4
+$0
 endsnippet
 
 snippet setter "PHP Class Setter" b
-/*
+/**
  * Setter for $1
+ *
+ * @param ${2:string} $$1                                                                                                                               
+ * @return ${3:`!p snip.rv=snip.basename`}
  */
-public function set${1/\w+\s*/\u$0/}($$1)
+public function set${1/\w+\s*/\u$0/}(${4:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
 {
-	$this->$1 = $$1;$3
-	${4:return $this;}
+    $this->$1 = $$1;$5
+    ${6:return $this;}
 }
 $0
 endsnippet
 
 snippet gs "PHP Class Getter Setter" b
-/*
+/**
  * Getter for $1
+ *
+ * return ${2:string}
  */
 public function get${1/\w+\s*/\u$0/}()
 {
-	return $this->$1;$2
+    return $this->$1;$3
 }
 
-/*
+/**
  * Setter for $1
+ *
+ * @param $2 $$1
+ * @return ${4:`!p snip.rv=snip.basename`}
  */
-public function set${1/\w+\s*/\u$0/}($$1)
+public function set${1/\w+\s*/\u$0/}(${5:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
 {
-	$this->$1 = $$1;$3
-	${4:return $this;}
+    $this->$1 = $$1;$6
+    ${7:return $this;}
 }
 $0
 endsnippet

From af05269858bae78b562156810943666db24555fc Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Fri, 30 Jan 2015 18:08:12 +0100
Subject: [PATCH 0542/1587] Bug fix laravel snippet

---
 UltiSnips/php_laravel.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
index d39a77b8b..30f3f3691 100644
--- a/UltiSnips/php_laravel.snippets
+++ b/UltiSnips/php_laravel.snippets
@@ -201,8 +201,8 @@ snippet l_r "Laravel Repository" b
 
 namespace $1;
 
-class $3 extends \\$1 implements $4 {
-    ${6}
+class $3 extends \\${6} implements $4 {
+    ${7}
 }
 endsnippet
 

From f4d267dd6365a0e1e439f4f7a5349c256e859ccc Mon Sep 17 00:00:00 2001
From: Thomas Szymanski <develop@tszymanski.com>
Date: Sat, 31 Jan 2015 18:18:59 +0100
Subject: [PATCH 0543/1587] Add a missing closing double quote in HTML

---
 UltiSnips/html_minimal.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/html_minimal.snippets b/UltiSnips/html_minimal.snippets
index 48ff4b723..6867e8668 100644
--- a/UltiSnips/html_minimal.snippets
+++ b/UltiSnips/html_minimal.snippets
@@ -17,7 +17,7 @@ snippet label_and_input
 endsnippet
 
 snippet input
-<input type="${1:text}" value="${2}" name="${3}"${4: id="${5:$3}}/>${7}
+<input type="${1:text}" value="${2}" name="${3}"${4: id="${5:$3}"}/>${7}
 endsnippet
 
 snippet submit

From 23ee37a49c669e26e5f4d6ce02ad121a2e2892ba Mon Sep 17 00:00:00 2001
From: Julien Deniau <julien.deniau@gmail.com>
Date: Tue, 3 Feb 2015 10:49:07 +0100
Subject: [PATCH 0544/1587] Update PHP class and interface snippets

Include <?php and namespace automatically
---
 UltiSnips/php.snippets | 48 ++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 366346a65..cd9c55b92 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -261,36 +261,56 @@ if (${1:/* condition */}) {
 $0
 endsnippet
 
+snippet ns "namespace declaration" b
+namespace ${1:`!p
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+›   snip.rv = m.group().replace('/', '\\')
+`};
+endsnippet
+
 snippet class "Class declaration template" b
+<?php
+
+namespace ${1:`!p
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+›   snip.rv = m.group().replace('/', '\\')
+`};
+
 /**
- * Class ${2:`!p snip.rv=snip.fn.split('.')[0]`}
- * @author ${3:`!v g:snips_author`}
+ * Class ${1:`!p snip.rv=snip.basename`}
+ * @author ${2:`!v g:snips_author`}
  */
-$1class $2
+class $1
 {
-	public function ${4:__construct}(${5:$options})
-	{
-		${6:// code}
-	}
 }
 $0
 endsnippet
 
-snippet interface "interface declaration template" b
+snippet interface "Interface declaration template" b
+<?php
+
+namespace ${1:`!p
+abspath = os.path.abspath(path)
+m = re.search(r'[A-Z].+(?=/)', abspath)
+if m:
+›   snip.rv = m.group().replace('/', '\\')
+`};
+
 /**
- * Interface ${1:`!p snip.rv=snip.fn.split('.')[0]`}
+ * Interface ${1:`!p snip.rv=snip.basename`}
  * @author ${2:`!v g:snips_author`}
  */
 interface $1
 {
-	public function ${3:__construct}(${4:$options})
-	{
-		${5:// code}
-	}
+›   public function ${3:someFunction}();$4                                                                                                              
 }
-$0
 endsnippet
 
+
 snippet construct "__construct()" b
 /**
  * @param $2mixed ${1/, /\n     * \@param mixed /g}

From 0deb4bd28b615bb42352772ba4ebb975d90c71c8 Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Sat, 7 Feb 2015 09:52:48 +0100
Subject: [PATCH 0545/1587] Fix #435.

---
 UltiSnips/all.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index e33d2c517..757837859 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -29,7 +29,7 @@ def _parse_comments(s):
 			if len(flags) == 0:
 				rv.append((text, text, text, ""))
 			# parse 3-part comment, but ignore those with O flag
-			elif flags[0] == 's' and 'O' not in flags:
+			elif 's' in flags and 'O' not in flags:
 				ctriple = []
 				indent = ""
 
@@ -47,7 +47,7 @@ def _parse_comments(s):
 				ctriple.append(indent)
 
 				rv.append(ctriple)
-			elif flags[0] == 'b':
+			elif 'b' in flags:
 				if len(text) == 1:
 					rv.insert(0, (text,text,text, ""))
 	except StopIteration:

From 3cc04ec71f05bd3b2f4aca583ad5736cfce6d945 Mon Sep 17 00:00:00 2001
From: Leonidez Acosta <acosta.leonidez@gmail.com>
Date: Tue, 10 Feb 2015 16:11:08 -0600
Subject: [PATCH 0546/1587] fix :f snippet skipping over function body

---
 snippets/javascript/javascript.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 5012a43a2..3c0ed8b3c 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -112,8 +112,8 @@ snippet fori
 # Object Method
 snippet :f
 	${1:method_name}: function (${2:attribute}) {
-		${0}
-	}${3:,}
+		${3:}
+	}${4:,}
 # hasOwnProperty
 snippet has
 	hasOwnProperty(${0})

From f1334d2e062f3601615ba55aa55d40179d07da50 Mon Sep 17 00:00:00 2001
From: Leonidez Acosta <acosta.leonidez@gmail.com>
Date: Wed, 11 Feb 2015 15:15:14 -0600
Subject: [PATCH 0547/1587] remove hint from function body

---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 3c0ed8b3c..ea3c175cf 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -112,7 +112,7 @@ snippet fori
 # Object Method
 snippet :f
 	${1:method_name}: function (${2:attribute}) {
-		${3:}
+		${3}
 	}${4:,}
 # hasOwnProperty
 snippet has

From 051bc1a91c09d59f4f10af2adcaec3ffc6e67986 Mon Sep 17 00:00:00 2001
From: Julien Deniau <julien.deniau@gmail.com>
Date: Thu, 12 Feb 2015 11:07:46 +0100
Subject: [PATCH 0548/1587] Fix copy/paste bug

---
 UltiSnips/php.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index cd9c55b92..77c11e664 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -266,7 +266,7 @@ namespace ${1:`!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
-›   snip.rv = m.group().replace('/', '\\')
+	snip.rv = m.group().replace('/', '\\')
 `};
 endsnippet
 
@@ -277,7 +277,7 @@ namespace ${1:`!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
-›   snip.rv = m.group().replace('/', '\\')
+	snip.rv = m.group().replace('/', '\\')
 `};
 
 /**
@@ -297,7 +297,7 @@ namespace ${1:`!p
 abspath = os.path.abspath(path)
 m = re.search(r'[A-Z].+(?=/)', abspath)
 if m:
-›   snip.rv = m.group().replace('/', '\\')
+	snip.rv = m.group().replace('/', '\\')
 `};
 
 /**
@@ -306,7 +306,7 @@ if m:
  */
 interface $1
 {
-›   public function ${3:someFunction}();$4                                                                                                              
+	public function ${3:someFunction}();$4                                                                                                              
 }
 endsnippet
 

From 01a85b1d636eeb30b3d6c4fb26b9f80d89ffcd8d Mon Sep 17 00:00:00 2001
From: Julien Deniau <julien.deniau@gmail.com>
Date: Thu, 12 Feb 2015 11:10:28 +0100
Subject: [PATCH 0549/1587] remove blank lines

---
 UltiSnips/php.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 77c11e664..83de38cd2 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -111,7 +111,6 @@ public function get${1/\w+\s*/\u$0/}()
 {
     return $this->$1;$3
 }
-$0
 endsnippet
 
 snippet setter "PHP Class Setter" b
@@ -287,7 +286,6 @@ if m:
 class $1
 {
 }
-$0
 endsnippet
 
 snippet interface "Interface declaration template" b

From fc7bf9748cb6c0f548cdc283b970a46315ecb01a Mon Sep 17 00:00:00 2001
From: Leonidez Acosta <acosta.leonidez@gmail.com>
Date: Thu, 12 Feb 2015 09:25:51 -0600
Subject: [PATCH 0550/1587] remove tab at close of :f snippet

---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index ea3c175cf..fa8123d55 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -113,7 +113,7 @@ snippet fori
 snippet :f
 	${1:method_name}: function (${2:attribute}) {
 		${3}
-	}${4:,}
+	},
 # hasOwnProperty
 snippet has
 	hasOwnProperty(${0})

From 1831acc72f47993539399c00e5c1f38ab8d1e482 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 17 Feb 2015 21:55:27 +0000
Subject: [PATCH 0551/1587] Remove Elixir duplicate snippets

---
 UltiSnips/elixir.snippets | 168 --------------------------------------
 1 file changed, 168 deletions(-)
 delete mode 100644 UltiSnips/elixir.snippets

diff --git a/UltiSnips/elixir.snippets b/UltiSnips/elixir.snippets
deleted file mode 100644
index 1f53edfbb..000000000
--- a/UltiSnips/elixir.snippets
+++ /dev/null
@@ -1,168 +0,0 @@
-priority -50
-
-snippet do
-do
-	${1}
-end
-endsnippet
-
-snippet if "if .. do .. end"
-if ${1:condition} do
-	${2:expression}
-end
-endsnippet
-
-snippet if "if .. do: .."
-if ${1:condition}, do: ${2:expression}
-endsnippet
-
-snippet ife "if .. do .. else .. end"
-if ${1:condition} do
-	${2:expression}
-else
-	${3:expression}
-end
-endsnippet
-
-snippet ife "if .. do: .. else:"
-if ${1:condition}, do: ${2}, else: ${3}
-endsnippet
-
-snippet unless "unless .. do .. end"
-unless ${1} do
-	${2}
-end
-endsnippet
-
-snippet unless "unless .. do: .."
-unless ${1:condition}, do: ${2}
-endsnippet
-
-snippet unlesse "unless .. do .. else .. end"
-unless ${1:condition} do
-	${2}
-else
-	${3}
-end
-endsnippet
-
-snippet unlesse "unless .. do: .. else:"
-unless ${1:condition}, do: ${2}, else: ${3}
-endsnippet
-
-snippet cond
-"cond do"
-${1} ->
-	${2}
-end
-endsnippet
-
-snippet case
-case ${1} do
-${2} ->
-	${3}
-end
-endsnippet
-
-snippet def
-def ${1:name} do
-	${2}
-end
-endsnippet
-
-snippet defin "def function(n), do: n"
-def ${1:name},  do: ${2}
-endsnippet
-
-snippet defg
-def ${1:name} when ${2:guard-condition} do
-	${3}
-end
-endsnippet
-
-snippet defim
-defimpl ${1:protocol_name}, for: ${2:data_type} do
-	${3}
-end
-endsnippet
-
-snippet defma
-defmacro ${1:name} do
-	${2}
-end
-endsnippet
-
-snippet defmo
-defmodule ${1:module_name} do
-	${2}
-end
-endsnippet
-
-snippet defp
-defp ${1:name} do
-	${2}
-end
-endsnippet
-
-snippet defpr
-defprotocol ${1:name}, [${2:function}]
-endsnippet
-
-snippet defr
-defrecord ${1:record_name}, ${2:fields}
-endsnippet
-
-snippet doc
-@doc """
-${1}
-"""
-endsnippet
-
-snippet fn
-fn(${1:args}) -> ${2} end
-endsnippet
-
-snippet fun
-function do
-	${1}
-end
-endsnippet
-
-snippet mdoc
-@moduledoc """
-${1}
-"""
-endsnippet
-
-snippet rec
-receive do
-${1} ->
-	${2}
-end
-endsnippet
-
-snippet req
-require ${1:module_name}
-endsnippet
-
-snippet imp
-import ${1:module_name}
-endsnippet
-
-snippet ali "alias old-module to shorthand"
-alias ${1:module_name}
-endsnippet
-
-snippet test
-test "${1:test_name}" do
-	${2}
-end
-endsnippet
-
-snippet try "try .. rescue .. end"
-try do
-	${1}
-rescue
-	${2} -> ${3}
-end
-endsnippet

From 93b4de1299916de0d93d70629f86ff0fa9735061 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 17 Feb 2015 21:56:44 +0000
Subject: [PATCH 0552/1587] Remove clojure + rust maintainer

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 46cc39051..1d3915940 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,6 @@ to maintain snippets for a language, please get in touch.
 Notes: People are interested in snippets - and their interest may wane again.
 This list is kept up-to-date on a best effort basis.
 
-* Clojure - [lpil](https://github.com/lpil)
 * Elixir - [iurifq](https://github.com/iurifq)
 * Falcon - [steveno](https://github.com/steveno)
 * HTML Django - [honza](http://github.com/honza)
@@ -214,7 +213,6 @@ This list is kept up-to-date on a best effort basis.
 * PHP - [chrisyue](http://github.com/chrisyue)
 * Python - [honza](http://github.com/honza)
 * Ruby - [taq](http://github.com/taq)
-* Rust - [lpil](https://github.com/lpil)
 * Scala - [gorodinskiy](https://github.com/gorodinskiy)
 
 License

From 24bb8a4b183b4e6d65083d2d30d6ee31e1bb9ee3 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 19 Feb 2015 18:01:49 +0000
Subject: [PATCH 0553/1587] Elixir: def with doc string

---
 snippets/elixir.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 077cf0310..c13e8804e 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -46,6 +46,13 @@ snippet def
 	def ${1:name} do
 		${0}
 	end
+snippet defd
+	@doc """
+	${1:doc string}
+	"""
+	def ${2:name} do
+		${0}
+	end
 snippet defim
 	defimpl ${1:protocol_name}, for: ${2:data_type} do
 		${0}

From 06122593e59857ffc11a1a0a47926b1cdcce09fe Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 19 Feb 2015 18:02:46 +0000
Subject: [PATCH 0554/1587] Elixir: Remove superfluous params from fn

---
 snippets/elixir.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index c13e8804e..7e47b537b 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -78,7 +78,7 @@ snippet doc
 	${0}
 	"""
 snippet fn
-	fn(${1:args}) -> ${0} end
+	fn ${1:args} -> ${0} end
 snippet fun
 	function do
 		${0}

From 128355895b0f5ba03fe6579444fcc853dc66fcef Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 19 Feb 2015 18:39:26 +0000
Subject: [PATCH 0555/1587] Elixir: test with arg

---
 snippets/elixir.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 7e47b537b..4a51ae8d6 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -102,6 +102,10 @@ snippet test
 	test "${1:test_name}" do
 		${0}
 	end
+snippet test "A ExUnit test" b
+	test "${1:test_name}", %{${2:arg: arg}} do
+		${0}
+	end
 snippet try try .. rescue .. end
 	try do
 		${1}

From 1de4299c208536bd2b9903e8f30eedc1c9f1f0f9 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 20 Feb 2015 09:27:15 +0000
Subject: [PATCH 0556/1587] Remove dupe name from Elixir snippets

---
 snippets/elixir.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 4a51ae8d6..945f006ce 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -102,7 +102,7 @@ snippet test
 	test "${1:test_name}" do
 		${0}
 	end
-snippet test "A ExUnit test" b
+snippet testa
 	test "${1:test_name}", %{${2:arg: arg}} do
 		${0}
 	end

From 918baf4047ba48b3b7f84e14040135a7f395bb3f Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 20 Feb 2015 16:03:05 +0000
Subject: [PATCH 0557/1587] Elixir: pry snippet

---
 snippets/elixir.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 945f006ce..f477cec97 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -112,3 +112,6 @@ snippet try try .. rescue .. end
 	rescue
 		${2} -> ${0}
 	end
+snippet pry
+	require IEx; IEx.pry
+	$0

From d52befe8bc86fd0674c3b83236763157af31f8cf Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 21 Feb 2015 11:24:27 +0000
Subject: [PATCH 0558/1587] Elixir: Remove some name collisions

---
 snippets/elixir.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index f477cec97..4f1afd912 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -6,7 +6,7 @@ snippet if if .. do .. end
 	if ${1} do
 		${0}
 	end
-snippet if if .. do: ..
+snippet if: if .. do: ..
 	if ${1:condition}, do: ${0}
 snippet ife if .. do .. else .. end
 	if ${1:condition} do
@@ -14,13 +14,13 @@ snippet ife if .. do .. else .. end
 	else
 		${0}
 	end
-snippet ife if .. do: .. else:
+snippet ife: if .. do: .. else:
 	if ${1:condition}, do: ${2}, else: ${0}
 snippet unless unless .. do .. end
 	unless ${1} do
 		${0}
 	end
-snippet unless unless .. do: ..
+snippet unless: unless .. do: ..
 	unless ${1:condition}, do: ${0}
 snippet unlesse unless .. do .. else .. end
 	unless ${1:condition} do
@@ -28,7 +28,7 @@ snippet unlesse unless .. do .. else .. end
 	else
 		${0}
 	end
-snippet unlesse unless .. do: .. else:
+snippet unlesse: unless .. do: .. else:
 	unless ${1:condition}, do: ${2}, else: ${0}
 snippet cond
 	cond do

From 6c9ec92eecfd610ef3979d2994e9a47d5ab880ca Mon Sep 17 00:00:00 2001
From: Marcelo Jacobus <marcelo.jacobus@gmail.com>
Date: Tue, 24 Feb 2015 17:23:50 +0100
Subject: [PATCH 0559/1587] Fixed some PHP Code Standards

---
 UltiSnips/php.snippets | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 83de38cd2..8317169cf 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -8,7 +8,7 @@ $${1:arrayName} = array('${2}' => ${3});${4}
 endsnippet
 
 snippet def "def"
-define('${1}'${2});${3}
+define('${1:FOO}', ${2:'bar'});${3}
 endsnippet
 
 snippet do "do"
@@ -52,7 +52,7 @@ for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
 endsnippet
 
 snippet foreachk "foreachk"
-foreach ($${1:variable} as $${2:key} => $${3:value}){
+foreach ($${1:variable} as $${2:key} => $${3:value}) {
 	${4:// code...}
 }
 endsnippet
@@ -85,6 +85,10 @@ snippet post "post"
 $_POST['${1}']${2}
 endsnippet
 
+snippet req "req1"
+require_once '${1:file}';${2}
+endsnippet
+
 snippet req1 "req1"
 require_once '${1:file}';${2}
 endsnippet
@@ -123,6 +127,7 @@ snippet setter "PHP Class Setter" b
 public function set${1/\w+\s*/\u$0/}(${4:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
 {
     $this->$1 = $$1;$5
+
     ${6:return $this;}
 }
 $0
@@ -148,6 +153,7 @@ public function get${1/\w+\s*/\u$0/}()
 public function set${1/\w+\s*/\u$0/}(${5:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
 {
     $this->$1 = $$1;$6
+
     ${7:return $this;}
 }
 $0
@@ -240,14 +246,14 @@ $0
 endsnippet
 
 snippet fore "Foreach loop"
-foreach ($${1:variable} as $${3:value}){
+foreach ($${1:variable} as $${3:value}) {
 	${VISUAL}${4}
 }
 $0
 endsnippet
 
 snippet new "New class instance" b
-$$1 = new $1($2);
+$${1:foo} = new ${2:${1/\w+\s*/\u$0/}}($3);
 $0
 endsnippet
 

From 7ce372f83d9ccea0486a1ef6a7a8f911a0b6bebb Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 24 Feb 2015 23:03:33 +0000
Subject: [PATCH 0560/1587] Elixir Eex snippets

---
 snippets/eelixir.snippets | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 snippets/eelixir.snippets

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
new file mode 100644
index 000000000..17855b41b
--- /dev/null
+++ b/snippets/eelixir.snippets
@@ -0,0 +1,6 @@
+snippet %
+	<% ${0} %>
+snippet =
+	<%= ${1} %>
+snippet end
+	<% end %>

From 58560c62b920f2923626756b095fdf7a797fda53 Mon Sep 17 00:00:00 2001
From: Jonathan Martin <nybblr@users.noreply.github.com>
Date: Tue, 24 Feb 2015 18:33:26 -0500
Subject: [PATCH 0561/1587] JS snippet: anonymous function variable assignment.

[Closes #524]
---
 snippets/javascript/javascript.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index fa8123d55..5fbad8fa2 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -15,6 +15,11 @@ snippet f
 	function(${1}) {
 		${0}
 	}
+# Anonymous Function assigned to variable
+snippet vaf
+	var ${1:function_name} = function(${2}) {
+		${0}
+	};
 # Function assigned to variable
 snippet vf
 	var ${1:function_name} = function $1(${2}) {

From 62dc7d6cf362a45aa2e053d23fb3d7b6cbde49dd Mon Sep 17 00:00:00 2001
From: Mickey <yuchunc@users.noreply.github.com>
Date: Wed, 25 Feb 2015 21:36:01 +0800
Subject: [PATCH 0562/1587] Update UltiSnips/eruby.snippets,

replaced radio_box with radio_button
---
 UltiSnips/eruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index 171f08c80..b626cc4a9 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -79,8 +79,8 @@ snippet f. "f.password_field"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.password_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.radio_box"
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_box :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+snippet f. "f.radio_button"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_button :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet f. "f.submit"

From b11832aa686e7cc18385110398ca4e8b5688b5d9 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 27 Feb 2015 00:15:59 +0000
Subject: [PATCH 0563/1587] Elixir: debug pry snippet

---
 snippets/elixir.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 4f1afd912..daec05403 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -114,4 +114,4 @@ snippet try try .. rescue .. end
 	end
 snippet pry
 	require IEx; IEx.pry
-	$0
+	${0}

From e1baa6d38e5b274e77711270a16adfd6d73a4f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=A8switch87=C2=A8?= <¨gert@gepe-biljarts.be¨>
Date: Sat, 28 Feb 2015 22:50:06 +0100
Subject: [PATCH 0564/1587] changed snippet getopts to work correctly

---
 snippets/sh.snippets | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index c9c6ebc3c..4c1125813 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -51,15 +51,13 @@ snippet getopt
 	#===============================================================================
 	function usage ()
 	{
-			cat <<- EOT
+		echo "
+	    Usage :  $${0:0} [options] [--]
 
-	  Usage :  $${0:0} [options] [--]
+	    Options:
+	    -h|help       Display this message
+	    -v|version    Display script version"
 
-	  Options:
-	  -h|help       Display this message
-	  -v|version    Display script version
-
-			EOT
 	}    # ----------  end of function usage  ----------
 
 	#-----------------------------------------------------------------------
@@ -74,7 +72,7 @@ snippet getopt
 
 		v|version  )  echo "$${0:0} -- Version $__ScriptVersion"; exit 0   ;;
 
-		\? )  echo -e "\n  Option does not exist : $OPTARG\n"
+		* )  echo -e "\n  Option does not exist : $OPTARG\n"
 			  usage; exit 1   ;;
 
 	  esac    # --- end of case ---

From c5b88e2b6761c439ccd989d81293fff64ea403e1 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Sat, 28 Feb 2015 23:28:34 +0100
Subject: [PATCH 0565/1587] Little update in echo command

---
 snippets/sh.snippets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 4c1125813..910fe8b3e 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -51,8 +51,7 @@ snippet getopt
 	#===============================================================================
 	function usage ()
 	{
-		echo "
-	    Usage :  $${0:0} [options] [--]
+		echo "Usage :  $${0:0} [options] [--]
 
 	    Options:
 	    -h|help       Display this message

From f2929081b13be764e9060adcc09f4e6fddaf9d40 Mon Sep 17 00:00:00 2001
From: Ches Martin <ches@whiskeyandgrits.net>
Date: Sat, 28 Feb 2015 20:21:04 -0500
Subject: [PATCH 0566/1587] Update Rust snippets

Add descriptions to Snipmate snippets, update some snippets for
changed/deprecated Rust features, add some new bits.
---
 UltiSnips/rust.snippets |  37 ++++++++--
 snippets/rust.snippets  | 145 ++++++++++++++++++++++------------------
 2 files changed, 112 insertions(+), 70 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index ddb948f27..3bc0f7986 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -4,12 +4,34 @@
 
 priority -50
 
-snippet fn "A function, optionally with arguments and return type." b
+snippet let "let variable declaration" b
+let ${1:name}${2:: ${3:type}} = ${4};
+endsnippet
+
+snippet letm "let mut variable declaration" b
+let mut ${1:name}${2:: ${3:type}} = ${4};
+endsnippet
+
+snippet fn "A function, optionally with arguments and return type."
 fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
 	${VISUAL}${0}
 }
 endsnippet
 
+snippet arg "Function Arguments" i
+${1:a}: ${2:T}${3:, arg}
+endsnippet
+
+snippet || "Closure, anonymous function (inline)" i
+${1:move }|${2}| { $3 }
+endsnippet
+
+snippet |} "Closure, anonymous function (block)" i
+${1:move }|${2}| {
+	$3
+}
+endsnippet
+
 snippet pri "print!(..)" b
 print!("${1}"${2/..*/, /}${2});
 endsnippet
@@ -30,7 +52,7 @@ macro_rules! ${1:name} (
 )
 endsnippet
 
-snippet mod	 "A module" b
+snippet mod "A module" b
 mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
 	${VISUAL}${0}
 }
@@ -52,18 +74,21 @@ struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
 }
 endsnippet
 
+# TODO: fancy dynamic field mirroring like Python slotclass
 snippet stn "Struct with new constructor." b
 pub struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
-	${3}
+	fd${0}
 }
 
 impl $1 {
 	pub fn new(${2}) -> $1 {
-		${4}return $1 {
-			${5}
-		};
+		$1 { ${3} };
 	}
 }
 endsnippet
 
+snippet fd "Struct field definition" w
+${1:name}: ${2:Type},
+endsnippet
+
 # vim:ft=snippets:
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 195f254aa..96ec52ed1 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -3,11 +3,11 @@
 #################
 
 # Functions
-snippet fn
+snippet fn "Function definition"
 	fn ${1:function_name}(${2})${3} {
 		${0}
 	}
-snippet test
+snippet test "Unit test function"
 	#[test]
 	fn ${1:test_function_name}() {
 		${0}
@@ -19,32 +19,53 @@ snippet bench "Bench function" b
 			${0}
 		})
 	}
-snippet new
+snippet new "Constructor function"
 	pub fn new(${2}) -> ${1:Name} {
-		${0}return $1 { ${3} };
+		$1 { ${3} };
 	}
-snippet main
+snippet main "Main function"
 	pub fn main() {
 		${0}
 	}
-snippet let
-	let ${1:name: type} = ${2};
-snippet let
-	let mut ${1:name: type} = ${2};
-snippet pln
+snippet let "let variable declaration"
+	let ${1:name}${2:: ${3:type}} = ${4};
+snippet letm "let mut variable declaration"
+	let mut ${1:name}${2:: ${3:type}} = ${4};
+snippet pln "println!"
 	println!("${1}");
-snippet pln,
+snippet pln, "println! with format param"
 	println!("${1}", ${2});
-snippet ec
+
+# Modules
+snippet ec "extern crate"
 	extern crate ${1:sync};
-snippet ecl
-	#![feature(phase)]
-	#[phase(plugin, link)] extern crate log;
+snippet ecl "extern crate log"
+	#[macro_use]
+	extern crate log;
 snippet mod
 	mod ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	} /* $1 */
-snippet crate
+snippet testmod "Test module" b
+	#[cfg(test)]
+	mod tests {
+		use super::${1:*};
+
+		test${0}
+	}
+
+# Attributes
+snippet allow "allow lint attribute" b
+	#[allow(${1:unused_variable})]
+snippet cfg "cfg attribute" b
+	#[cfg(${1:target_os = "linux"})]
+snippet feat "feature attribute" b
+	#![feature(${1:plugin})]
+snippet der "#[derive(..)]" b
+	#[derive(${1:Debug})]
+snippet attr "#[..]" b
+	#[${1:inline}]
+snippet crate "Define create meta attributes"
 	// Crate name
 	#![crate_name = "${1:crate_name}"]
 	// Additional metadata attributes
@@ -53,39 +74,33 @@ snippet crate
 	#![comment = "${4:Comment.}"]
 	// Specify the output type
 	#![crate_type = "${5:lib}"]
-snippet allow
-	#[allow(${1:unused_variable})]
-snippet feat
-	#![feature(${1:macro_rules})]
-snippet der "#[deriving(..)]" b
-	#[deriving(${1:Show})]
-snippet attr "#[..]" b
-	#[${1:inline}]
 
 # Common types
-snippet opt
-	Option<${1:int}>
-snippet res
+snippet opt "Option<T>"
+	Option<${1:i32}>
+snippet res "Result<T, E>"
 	Result<${1:~str}, ${2:()}>
+
+# Control structures
 snippet if
 	if ${1} {
 		${0}
 	}
-snippet ife
+snippet ife "if / else"
 	if ${1} {
 		${2}
 	} else {
 		${0}
 	}
-snippet el
+snippet el "else"
 	else {
 		${0}
 	}
-snippet eli
+snippet eli "else if"
 	else if ${1} {
 		${0}
 	}
-snippet mat
+snippet mat "match pattern"
 	match ${1} {
 		${2} => ${3},
 	}
@@ -93,70 +108,72 @@ snippet loop "loop {}" b
 	loop {
 		${0}
 	}
-snippet while
+snippet while "while loop"
 	while ${1:condition} {
 		${0}
 	}
-snippet for
+snippet for "for ... in ... loop"
 	for ${1:i} in ${2:0u..10} {
 		${0}
 	}
-snippet spawn
-	spawn(proc() {
-		${0}
-	});
-snippet chan
-	let (${1:tx}, ${2:rx}): (Sender<${3:int}>, Receiver<${4:int}>) = channel();
-snippet duplex
-	let (${1:from_child}, ${2:to_child}) = sync::duplex();
 # TODO commenting
-snippet todo
+snippet todo "TODO comment"
 	// [TODO]: ${0:Description}
 snippet fixme "FIXME comment"
 	// FIXME: $0
 
 # Struct
-snippet st
+snippet st "Struct definition"
 	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	}
-snippet stn
-	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+snippet impl "Struct/Trait implementation"
+	impl ${1:Type/Trait}${2: ${3:for Type}} {
+		${0}
+	}
+snippet stn "Struct with new constructor"
+	pub struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	}
 
 	impl $1 {
 		pub fn new(${2}) -> $1 {
-			${4}return $1 {
-				${5}
-			};
+			$1 { ${3} };
 		}
 	}
-snippet typ
-	type ${1:NewName} = $0;
-# Enum
-snippet enum
+snippet type "Type alias"
+	type ${1:NewName} = $2;
+snippet enum "enum definition"
 	enum ${1:Name} {
-		${0},
+		${2},
 	}
-# Impl
-snippet imp
-	impl ${1:Name} {
+# Traits
+snippet trait "Trait definition"
+	trait ${1:Name} {
 		${0}
 	}
-snippet drop
+snippet drop "Drop trait implementation (destructor)"
 	impl Drop for ${1:Name} {
 		fn drop(&mut self) {
 			${0}
 		}
 	}
-# Traits
-snippet trait
-	trait ${1:Name} {
-		${0}
-	}
 # Statics
-snippet ss
+snippet ss "static string declaration"
 	static ${1}: &'static str = "${0}";
-snippet stat
+snippet stat "static item declaration"
 	static ${1}: ${2:usize} = ${0};
+
+# Concurrency
+snippet spawn "spawn a task or thread"
+	spawn(proc() {
+		${0}
+	});
+snippet chan "Declare (Sender, Receiver) pair of asynchronous channel()"
+	let (${1:tx}, ${2:rx}): (Sender<${3:i32}>, Receiver<${4:i32}>) = channel();
+
+# Testing
+snippet as "assert!"
+	assert!(${1:predicate})
+snippet ase "assert_eq!"
+	assert_eq!(${1:expected}, ${2:actual})

From 982f3472380187eabd56cc72bf2371c90b63e39e Mon Sep 17 00:00:00 2001
From: Ches Martin <ches@whiskeyandgrits.net>
Date: Sat, 28 Feb 2015 21:15:58 -0500
Subject: [PATCH 0567/1587] rust: Fix nesting for impl snippet in SM/US

---
 UltiSnips/rust.snippets | 6 ++++++
 snippets/rust.snippets  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 3bc0f7986..a27d6fafa 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -91,4 +91,10 @@ snippet fd "Struct field definition" w
 ${1:name}: ${2:Type},
 endsnippet
 
+snippet impl "Struct/Trait implementation" b
+impl ${1:Type/Trait}${2: for ${3:Type}} {
+	${0}
+}
+endsnippet
+
 # vim:ft=snippets:
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 96ec52ed1..8882c0873 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -128,7 +128,7 @@ snippet st "Struct definition"
 		${0}
 	}
 snippet impl "Struct/Trait implementation"
-	impl ${1:Type/Trait}${2: ${3:for Type}} {
+	impl ${1:Type/Trait}${2: for ${3:Type}} {
 		${0}
 	}
 snippet stn "Struct with new constructor"

From ac477f8522c06034ccce04bc46130dfc58f2fbe7 Mon Sep 17 00:00:00 2001
From: Ches Martin <ches@whiskeyandgrits.net>
Date: Sun, 1 Mar 2015 07:29:03 -0500
Subject: [PATCH 0568/1587] rust: case clause snippet for pattern matches

---
 snippets/rust.snippets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 8882c0873..396dfbaa2 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -102,8 +102,10 @@ snippet eli "else if"
 	}
 snippet mat "match pattern"
 	match ${1} {
-		${2} => ${3},
+		${2} => ${3}
 	}
+snippet case "Case clause of pattern match"
+	${1:_} => ${2:expression}
 snippet loop "loop {}" b
 	loop {
 		${0}

From 7c68c151242f839fafe554f87d9e4fa0834b11f3 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Sun, 1 Mar 2015 18:05:34 +0100
Subject: [PATCH 0569/1587] repeared shebang

changed shebang snippet, did not work (becous of the leading # in the snippet?)
also changed the function snippet becous it was verry confusing, sh version could be placed back, but you realy had to know the source to find the bash snippet...
---
 snippets/sh.snippets | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 4c1125813..f545f1f59 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -1,6 +1,6 @@
 # Shebang. Executing bash via /usr/bin/env makes scripts more portable.
-snippet #!
-	#!/usr/bin/env bash
+snippet bash
+	#!/usr/bin/bash
 
 snippet if
 	if [[ ${1:condition} ]]; then
@@ -80,11 +80,8 @@ snippet getopt
 	shift $(($OPTIND-1))
 snippet root
 	if [ \$(id -u) -ne 0 ]; then exec sudo \$0; fi
+
 snippet fun
-	${1:function_name}() {
-		${0:#function_body}
-	}
-snippet ffun
 	function ${1:function_name}() {
 		${0:#function_body}
 	}

From 2b8e591c19f5fac6c352c40338f19ad33f1f6692 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Sun, 1 Mar 2015 23:21:07 +0100
Subject: [PATCH 0570/1587] .

---
 snippets/sh.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index f545f1f59..3c9a9eafb 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -1,6 +1,6 @@
 # Shebang. Executing bash via /usr/bin/env makes scripts more portable.
 snippet bash
-	#!/usr/bin/bash
+	#!/bin/bash
 
 snippet if
 	if [[ ${1:condition} ]]; then

From 16211fe728bad38e789c9d378ff57a8359e2b4de Mon Sep 17 00:00:00 2001
From: Ches Martin <ches@whiskeyandgrits.net>
Date: Sun, 1 Mar 2015 17:42:19 -0500
Subject: [PATCH 0571/1587] Significant newlines, ugh

---
 snippets/rust.snippets | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 396dfbaa2..5a64e766f 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -35,7 +35,6 @@ snippet pln "println!"
 	println!("${1}");
 snippet pln, "println! with format param"
 	println!("${1}", ${2});
-
 # Modules
 snippet ec "extern crate"
 	extern crate ${1:sync};
@@ -53,7 +52,6 @@ snippet testmod "Test module" b
 
 		test${0}
 	}
-
 # Attributes
 snippet allow "allow lint attribute" b
 	#[allow(${1:unused_variable})]
@@ -74,13 +72,11 @@ snippet crate "Define create meta attributes"
 	#![comment = "${4:Comment.}"]
 	// Specify the output type
 	#![crate_type = "${5:lib}"]
-
 # Common types
 snippet opt "Option<T>"
 	Option<${1:i32}>
 snippet res "Result<T, E>"
 	Result<${1:~str}, ${2:()}>
-
 # Control structures
 snippet if
 	if ${1} {
@@ -123,7 +119,6 @@ snippet todo "TODO comment"
 	// [TODO]: ${0:Description}
 snippet fixme "FIXME comment"
 	// FIXME: $0
-
 # Struct
 snippet st "Struct definition"
 	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
@@ -165,7 +160,6 @@ snippet ss "static string declaration"
 	static ${1}: &'static str = "${0}";
 snippet stat "static item declaration"
 	static ${1}: ${2:usize} = ${0};
-
 # Concurrency
 snippet spawn "spawn a task or thread"
 	spawn(proc() {
@@ -173,7 +167,6 @@ snippet spawn "spawn a task or thread"
 	});
 snippet chan "Declare (Sender, Receiver) pair of asynchronous channel()"
 	let (${1:tx}, ${2:rx}): (Sender<${3:i32}>, Receiver<${4:i32}>) = channel();
-
 # Testing
 snippet as "assert!"
 	assert!(${1:predicate})

From 928eb95c72fb45ddb1da0b82a1abdad18da0310e Mon Sep 17 00:00:00 2001
From: Ches Martin <ches@whiskeyandgrits.net>
Date: Sun, 1 Mar 2015 18:01:55 -0500
Subject: [PATCH 0572/1587] rust: proc() syntax obsolete, thread not in prelude

---
 snippets/rust.snippets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 5a64e766f..77e513291 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -161,8 +161,12 @@ snippet ss "static string declaration"
 snippet stat "static item declaration"
 	static ${1}: ${2:usize} = ${0};
 # Concurrency
-snippet spawn "spawn a task or thread"
-	spawn(proc() {
+snippet scoped "spawn a scoped thread"
+	thread::scoped(${1:move }|| {
+		${0}
+	});
+snippet spawn "spawn a thread"
+	thread::spawn(${1:move }|| {
 		${0}
 	});
 snippet chan "Declare (Sender, Receiver) pair of asynchronous channel()"

From 8084d02b6176358862c7307c817255b7b574994d Mon Sep 17 00:00:00 2001
From: Louis Pilfold <lpil@users.noreply.github.com>
Date: Mon, 2 Mar 2015 10:12:52 +0000
Subject: [PATCH 0573/1587] Revert "repeared shebang"

---
 snippets/sh.snippets | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 230e3b7db..910fe8b3e 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -1,6 +1,6 @@
 # Shebang. Executing bash via /usr/bin/env makes scripts more portable.
-snippet bash
-	#!/bin/bash
+snippet #!
+	#!/usr/bin/env bash
 
 snippet if
 	if [[ ${1:condition} ]]; then
@@ -79,8 +79,11 @@ snippet getopt
 	shift $(($OPTIND-1))
 snippet root
 	if [ \$(id -u) -ne 0 ]; then exec sudo \$0; fi
-
 snippet fun
+	${1:function_name}() {
+		${0:#function_body}
+	}
+snippet ffun
 	function ${1:function_name}() {
 		${0:#function_body}
 	}

From 29903a019ec380207d8215b3e4a9411d40ea8491 Mon Sep 17 00:00:00 2001
From: Marcelo Jacobus <marcelo.jacobus@gmail.com>
Date: Mon, 2 Mar 2015 16:30:48 +0100
Subject: [PATCH 0574/1587] Fixed non-documentary placeholders

---
 UltiSnips/php.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 8317169cf..66abe5cfa 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -8,7 +8,7 @@ $${1:arrayName} = array('${2}' => ${3});${4}
 endsnippet
 
 snippet def "def"
-define('${1:FOO}', ${2:'bar'});${3}
+define('${1:VARIABLE_NAME}', ${2:'definition'});${3}
 endsnippet
 
 snippet do "do"
@@ -253,7 +253,7 @@ $0
 endsnippet
 
 snippet new "New class instance" b
-$${1:foo} = new ${2:${1/\w+\s*/\u$0/}}($3);
+$${1:variableName} = new ${2:${1/\w+\s*/\u$0/}}($3);
 $0
 endsnippet
 

From 74c62eb97c0b67ac8dcae572996d2136e27eb114 Mon Sep 17 00:00:00 2001
From: Boone Severson <bseverson@google.com>
Date: Mon, 2 Mar 2015 12:28:02 -0800
Subject: [PATCH 0575/1587] systemverilog snippets

---
 UltiSnips/systemverilog.snippets | 154 +++++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 UltiSnips/systemverilog.snippets

diff --git a/UltiSnips/systemverilog.snippets b/UltiSnips/systemverilog.snippets
new file mode 100644
index 000000000..77f6c3920
--- /dev/null
+++ b/UltiSnips/systemverilog.snippets
@@ -0,0 +1,154 @@
+priority -50
+
+###########################################
+# Snippets for the SystemVerilog language #
+###########################################
+
+snippet if "If statement"
+if (${1}) begin
+  $0
+end
+endsnippet
+
+snippet ife "If/else statements"
+if (${1}) begin
+  $0
+end
+else begin
+
+end
+endsnippet
+
+snippet eif "Else if statement"
+else if (${1}) begin
+  $0
+end
+endsnippet
+
+snippet el "Else statement"
+else begin
+  $0
+end
+endsnippet
+
+snippet wh "While statement
+while (${1}) begin
+  $0
+end
+endsnippet
+
+snippet repeat "Repeat loop"
+repeat (${1}) begin
+  $0
+end
+endsnippet
+
+snippet foreach "Foreach loop"
+foreach (${1}) begin
+  $0
+end
+endsnippet
+
+snippet dowh "Do-while statement
+do begin
+  $0
+end while (${1});
+endsnippet
+
+snippet case "Case statement"
+case (${1})
+  {$2}: begin
+    $0
+  end
+  default: begin
+  end
+endcase
+endsnippet
+
+snippet casez "CaseZ statement"
+casez (${1})
+  {$2}: begin
+    $0
+  end
+  default: begin
+  end
+endcase
+endsnippet
+
+snippet always_comb "Combinational always block"
+always_comb begin : ${1:statement_label}
+  $0
+end : ${1}
+endsnippet
+
+snippet always_ff "Sequential logic"
+always_ff @(posedge ${1:clk}) begin : ${2:statement_label}
+  $0
+end : ${2}
+endsnippet
+
+snippet always_latch "Latched logic"
+always_ff begin : ${1:statement_label}
+  $0
+end : ${1}
+endsnippet
+
+snippet module "Module block"
+module ${1:module_name} ();
+  $0
+endmodule : ${1}
+endsnippet
+
+snippet module "Class"
+class ${1:module_name};
+	// data or class properties
+  $0
+
+  // initialization
+  function new();
+  endfunction : new
+
+endmodule : ${1}
+endsnippet
+
+snippet typestruct "Typedef structure"
+typedef struct {
+  $0
+} ${1:name_t};
+endsnippet
+
+snippet program "Program block"
+program ${1:program_name} ();
+  $0
+endprogram : ${1}
+endsnippet
+
+snippet interface "Interface block"
+interface ${1:program_name} ();
+  // nets
+
+  // clocking
+
+  // modports
+
+  $0
+endinterface : ${1}
+endsnippet
+
+snippet covergroup "Covergroup construct"
+covergroup ${1:package_name} @(posedge ${2:clk});
+  $0
+endgroup : ${1}
+endsnippet
+
+snippet package "Package declaration"
+package ${1:package_name};
+  $0
+endpackage : ${1}
+endsnippet
+
+####################################################
+# Snippets for the Accellera UVM Base Class Library#
+####################################################
+
+# vim:ft=snippets:

From 7620866b4a886963e9ee05e583df4d71e2d8ca39 Mon Sep 17 00:00:00 2001
From: Boone Severson <bseverson@google.com>
Date: Mon, 2 Mar 2015 13:16:01 -0800
Subject: [PATCH 0576/1587] tweaks

---
 UltiSnips/systemverilog.snippets | 38 +++++++++++++++++---------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/UltiSnips/systemverilog.snippets b/UltiSnips/systemverilog.snippets
index 77f6c3920..8f34ab701 100644
--- a/UltiSnips/systemverilog.snippets
+++ b/UltiSnips/systemverilog.snippets
@@ -1,8 +1,8 @@
 priority -50
 
-###########################################
-# Snippets for the SystemVerilog language #
-###########################################
+##########################
+# SystemVerilog Snippets #
+##########################
 
 snippet if "If statement"
 if (${1}) begin
@@ -78,25 +78,25 @@ endsnippet
 snippet always_comb "Combinational always block"
 always_comb begin : ${1:statement_label}
   $0
-end : ${1}
+end : $1
 endsnippet
 
 snippet always_ff "Sequential logic"
 always_ff @(posedge ${1:clk}) begin : ${2:statement_label}
   $0
-end : ${2}
+end : $2
 endsnippet
 
 snippet always_latch "Latched logic"
-always_ff begin : ${1:statement_label}
+always_latch begin : ${1:statement_label}
   $0
-end : ${1}
+end : $1
 endsnippet
 
 snippet module "Module block"
 module ${1:module_name} ();
   $0
-endmodule : ${1}
+endmodule : $1
 endsnippet
 
 snippet module "Class"
@@ -108,7 +108,7 @@ class ${1:module_name};
   function new();
   endfunction : new
 
-endmodule : ${1}
+endmodule : $1
 endsnippet
 
 snippet typestruct "Typedef structure"
@@ -120,35 +120,37 @@ endsnippet
 snippet program "Program block"
 program ${1:program_name} ();
   $0
-endprogram : ${1}
+endprogram : $1
 endsnippet
 
 snippet interface "Interface block"
 interface ${1:program_name} ();
   // nets
+  $0
 
   // clocking
 
   // modports
 
+endinterface : $1
+endsnippet
+
+snippet clocking "clocking"
+clocking ${1:clocking_name} @(${2:posedge} ${3:clk});
   $0
-endinterface : ${1}
+endclocking : $1
 endsnippet
 
 snippet covergroup "Covergroup construct"
-covergroup ${1:package_name} @(posedge ${2:clk});
+covergroup ${1:group_name} @(${2:posedge} ${3:clk});
   $0
-endgroup : ${1}
+endgroup : $1
 endsnippet
 
 snippet package "Package declaration"
 package ${1:package_name};
   $0
-endpackage : ${1}
+endpackage : $1
 endsnippet
 
-####################################################
-# Snippets for the Accellera UVM Base Class Library#
-####################################################
-
 # vim:ft=snippets:

From 2dba5c5289aab6046e095b7641a511aa4d49ba65 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Mon, 2 Mar 2015 23:40:07 +0100
Subject: [PATCH 0577/1587] changed shebangs end function snippet

Same pull request as before, but could not resolve rebasing problem.
---
 snippets/sh.snippets | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 910fe8b3e..4d2c62b8b 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -1,5 +1,8 @@
 # Shebang. Executing bash via /usr/bin/env makes scripts more portable.
 snippet #!
+	#!/usr/bin/env sh
+	
+snippet bash
 	#!/usr/bin/env bash
 
 snippet if
@@ -79,11 +82,13 @@ snippet getopt
 	shift $(($OPTIND-1))
 snippet root
 	if [ \$(id -u) -ne 0 ]; then exec sudo \$0; fi
-snippet fun
+
+snippet fun-sh
 	${1:function_name}() {
 		${0:#function_body}
 	}
-snippet ffun
+
+snippet fun
 	function ${1:function_name}() {
 		${0:#function_body}
 	}

From a942cbb2db49d1ee785f7a1c5be94a50a0fdccd8 Mon Sep 17 00:00:00 2001
From: Namit <namityadav@gmail.com>
Date: Tue, 3 Mar 2015 16:04:52 -0800
Subject: [PATCH 0578/1587] Add error handling in go.snippets

---
 UltiSnips/go.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/UltiSnips/go.snippets b/UltiSnips/go.snippets
index efd158925..539f9601e 100644
--- a/UltiSnips/go.snippets
+++ b/UltiSnips/go.snippets
@@ -135,3 +135,10 @@ snippet json "JSON field"
 endsnippet
 
 # vim:ft=snippets:
+
+# error handling
+snippet err "Basic error handling" b
+if err != nil {
+  log.${1:Fatal}(err)
+}
+endsnippet

From 4dae57d0a29a643fd11ac5f9c4a1b0f3d89911a8 Mon Sep 17 00:00:00 2001
From: Namit <namityadav@gmail.com>
Date: Tue, 3 Mar 2015 16:32:08 -0800
Subject: [PATCH 0579/1587] Add HTTP handler in go.snippets

---
 UltiSnips/go.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/go.snippets b/UltiSnips/go.snippets
index 539f9601e..ab3bcbdda 100644
--- a/UltiSnips/go.snippets
+++ b/UltiSnips/go.snippets
@@ -111,6 +111,12 @@ func ${1:name}(${2:params})${3/(.+)/ /}${3:type} {
 }
 endsnippet
 
+snippet funch "HTTP handler" b
+func ${1:handler}(${2:w} http.ResponseWriter, ${3:r} *http.Request) {
+	${0:${VISUAL}}
+}
+endsnippet
+
 # types and variables
 snippet map "Map type" b
 map[${1:keytype}]${2:valtype}

From 817bb63232441b5238f30adb1bfbad8d546fe58c Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 4 Mar 2015 10:18:54 +0000
Subject: [PATCH 0580/1587] Elixir: Update cond and case indentation

---
 snippets/elixir.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index daec05403..8fc710cad 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -32,13 +32,13 @@ snippet unlesse: unless .. do: .. else:
 	unless ${1:condition}, do: ${2}, else: ${0}
 snippet cond
 	cond do
-	${1} ->
-		${0}
+		${1} ->
+			${0}
 	end
 snippet case
 	case ${1} do
-	${2} ->
-		${0}
+		${2} ->
+			${0}
 	end
 snippet df
 	def ${1:name}, do: ${2}

From 81e457d24f23dcde2223babae2e0e177baaf784d Mon Sep 17 00:00:00 2001
From: rcolombo <ricardo.colombo@sovanta.com>
Date: Wed, 4 Mar 2015 10:30:27 -0300
Subject: [PATCH 0581/1587] create javascript openui5 snippets

---
 .../javascript/javascript.openui5.snippets    | 205 ++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 snippets/javascript/javascript.openui5.snippets

diff --git a/snippets/javascript/javascript.openui5.snippets b/snippets/javascript/javascript.openui5.snippets
new file mode 100644
index 000000000..5553c79ae
--- /dev/null
+++ b/snippets/javascript/javascript.openui5.snippets
@@ -0,0 +1,205 @@
+snippet sapmlabel
+	var ${1} = new sap.m.Label({ 
+				design : ${2}, 
+				text : ${3}, 
+				visible : ${4}, 
+				textAlign : ${5}, 
+				textDirection : ${6}, 
+				width : ${7}, 
+				required : ${7}
+			});
+
+snippet sapmtext
+	var ${1} = new sap.m.Text({
+				text :${2},
+				textDirection :${3},
+				visible :${4},
+				wrapping : ${5},
+				textAlign : ${6},
+				width :${7},
+				maxLines :${8}
+			});
+
+snippet sapmbutton
+	var ${1} = new sap.m.Button({
+				text : ${2},
+				type : ${3},
+				width : ${4},
+				enabled :${5},
+				visible :${6},
+				icon : ${7},
+				iconFirst : ${8},
+				activeIcon :${9},
+				iconDensityAware : ${10},
+			});
+snippet sapmflexbox
+	var ${1} = new sap.m.FlexBox({
+				visible : ${2},
+				height : ${3},
+				width : ${4},
+				displayInline :${5},
+				direction :${6},
+				fitContainer : ${7},
+				renderType : ${8},
+				justifyContent :${9},
+				alignItems : ${10},
+				items:[]
+			});
+snippet sapmhbox
+	var ${1} = new sap.m.HBox({
+				visible : ${2},
+				height : ${3},
+				width : ${4},
+				displayInline :${5},
+				direction :${6},
+				fitContainer : ${7},
+				renderType : ${8},
+				justifyContent :${9},
+				alignItems : ${10},
+				items:[]
+			});
+
+snippet sapmvbox
+	var ${1} = new sap.m.VBox({
+				visible : ${2},
+				height : ${3},
+				width : ${4},
+				displayInline :${5},
+				direction :${6},
+				fitContainer : ${7},
+				renderType : ${8},
+				justifyContent :${9},
+				alignItems : ${10},
+				items:[]
+			});
+
+snippet sapcomponent
+	sap.ui.controller("${1}", {
+	   onInit: function(){
+	   }, 
+	   onAfterRendering: function() {
+	   },
+	   onAfterRendering: function() {
+	   },
+	   onExit: function() {
+	   },
+	});
+
+snippet sapminput
+	var ${1} = new sap.m.Input({
+		value :${2},
+		width : ${3},
+		enabled :${4},
+		visible :${5},
+		valueState :${6},
+		name : ${7},
+		placeholder : ${8},
+		editable : ${9},
+		type : ${10},
+		maxLength :${11}, 
+		valueStateText :${12}, 
+		showValueStateMessage :${13}, 
+		dateFormat :${14},
+		showValueHelp :${15},
+		showSuggestion :${16},
+		valueHelpOnly :${17},
+		filterSuggests :${18},
+		maxSuggestionWidth :${19},
+		startSuggestion : ${20},
+		showTableSuggestionValueHelp : ${21},
+		description : ${22},
+		fieldWidth : ${23},
+		valueLiveUpdate :${24},
+		suggestionItems  :[${25}],
+		suggestionColumns : [${26}],
+		suggestionRows : [${27}],
+		liveChange : ${28},
+		valueHelpRequest :${29}, 
+		suggest : ${30},
+		suggestionItemSelected : ${31}
+	});
+snippet _sthis
+	var _self = this;
+
+snippet sapmresponsivepopup
+	var ${1} = new sap.m.ResponsivePopover({
+				placement :${2} ,//sap.m.PlacementType (default: sap.m.PlacementType.Right)
+				showHeader :${3} ,//boolean (default: true)
+				title : ${4},//string
+				icon :${5} ,//sap.ui.core.URI
+				modal :${6} ,// boolean
+				offsetX :${7}, //int
+				offsetY :${8}, //int
+				contentWidth : ${9},//sap.ui.core.CSSSize
+				contentHeight :${10}, //sap.ui.core.CSSSize
+				horizontalScrolling :${11}, //boolean
+				verticalScrolling :${12}, //boolean
+				showCloseButton :${13}, //boolean (default: true)
+				//Aggregations
+				content :${14},  //sap.ui.core.Control[]
+				customHeader :${15},  //sap.m.IBar
+				subHeader : ${16}, //sap.m.IBar
+				beginButton :${17},  //sap.m.Button
+				endButton : ${18}, //sap.m.Button
+				//Associations
+				initialFocus : ${19}, //string | sap.ui.core.Control
+				//Events
+				beforeOpen :${20},  //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				afterOpen : ${21}, //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				beforeClose : ${22}, //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				afterClose : ${23} //fnList
+			});
+
+snippet sapicon
+	var ${1} = new sap.ui.core.Icon({
+					src :${2} , //sap.ui.core.URI
+					size :${3} , //sap.ui.core.CSSSize
+					color :${4} , //sap.ui.core.CSSColor
+					hoverColor : ${5} ,  // sap.ui.core.CSSColor
+					activeColor :${6} , //sap.ui.core.CSSColor
+					width :${7} , //sap.ui.core.CSSSize
+					height : ${8} ,//sap.ui.core.CSSSize
+					backgroundColor :${8} , //sap.ui.core.CSSColor
+					hoverBackgroundColor :${9} , //sap.ui.core.CSSColor
+					activeBackgroundColor :${10} , //sap.ui.core.CSSColor
+					visible :${11} , //boolean (default: true)
+					decorative : ${12} ,//boolean (default: true)
+				});
+snippet extendVerticalL 
+	sap.ui.layout.VerticalLayout.extend("${1}", {
+	    metadata: {
+		properties: {
+		  	${2} 
+		},
+		aggregations: {
+			${3}	
+		},
+		events: {
+			${4}
+		}
+	    },
+	   init: function(){
+		${5}	
+	    },
+	    
+	    renderer: "${6}"
+	});	
+snippet extendHorizontalL 
+	sap.ui.layout.HorizontalLayout.extend("${1}", {
+	    metadata: {
+		properties: {
+		  	${2} 
+		},
+		aggregations: {
+			${3}	
+		},
+		events: {
+			${4}
+		}
+	    },
+	   init: function(){
+		${5}	
+	    },
+	    
+	    renderer: "${6}"
+	});	

From 1cf596eaae98969cf3b676e71c8874a622352c32 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 4 Mar 2015 14:35:32 +0000
Subject: [PATCH 0582/1587] Ultisnips eElixir extends HTML

---
 UltiSnips/eelixir.exs | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 UltiSnips/eelixir.exs

diff --git a/UltiSnips/eelixir.exs b/UltiSnips/eelixir.exs
new file mode 100644
index 000000000..a9c5a29ad
--- /dev/null
+++ b/UltiSnips/eelixir.exs
@@ -0,0 +1,3 @@
+priority -50
+
+extends html

From 902ae7190f00c4c5a92c4718e5d31352e2c5f41e Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 4 Mar 2015 14:43:15 +0000
Subject: [PATCH 0583/1587] Ultisnips HTML tweaks

---
 UltiSnips/html.snippets | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 674985c7a..3986e1162 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -160,14 +160,18 @@ snippet base "XHTML <base>" w
 <base href="$1"${2: target="$3"}`!p x(snip)`>
 endsnippet
 
-snippet body "XHTML <body>"
-<body id="${1:`!p
-snip.rv = snip.fn and 'Hallo' or 'Nothin'
-`}"${2: onload="$3"}>
+snippet body "<body>"
+<body>
 	$0
 </body>
 endsnippet
 
+snippet div "<div>" w
+<div>
+	$0
+</div>
+endsnippet
+
 snippet div. "<div> with class" w
 <div`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`>
 	$0

From 6a11038301046c5d1f9000b5c713ef806f240b70 Mon Sep 17 00:00:00 2001
From: Namit <namityadav@gmail.com>
Date: Wed, 4 Mar 2015 08:56:17 -0800
Subject: [PATCH 0584/1587] Replace two space indentation with tab

---
 UltiSnips/go.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/go.snippets b/UltiSnips/go.snippets
index ab3bcbdda..780ee29b6 100644
--- a/UltiSnips/go.snippets
+++ b/UltiSnips/go.snippets
@@ -145,6 +145,6 @@ endsnippet
 # error handling
 snippet err "Basic error handling" b
 if err != nil {
-  log.${1:Fatal}(err)
+	log.${1:Fatal}(err)
 }
 endsnippet

From 00dfa2e27b499fc5f5eb95b593f9f438500478d2 Mon Sep 17 00:00:00 2001
From: Boone Severson <bseverson@google.com>
Date: Wed, 4 Mar 2015 09:40:10 -0800
Subject: [PATCH 0585/1587] put block labels into snippet variables

---
 UltiSnips/systemverilog.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/systemverilog.snippets b/UltiSnips/systemverilog.snippets
index 8f34ab701..c05bd1082 100644
--- a/UltiSnips/systemverilog.snippets
+++ b/UltiSnips/systemverilog.snippets
@@ -76,21 +76,21 @@ endcase
 endsnippet
 
 snippet always_comb "Combinational always block"
-always_comb begin : ${1:statement_label}
+always_comb begin ${1:: statement_label}
   $0
-end : $1
+end $1
 endsnippet
 
 snippet always_ff "Sequential logic"
-always_ff @(posedge ${1:clk}) begin : ${2:statement_label}
+always_ff @(posedge ${1:clk}) begin ${2:: statement_label}
   $0
-end : $2
+end $2
 endsnippet
 
 snippet always_latch "Latched logic"
-always_latch begin : ${1:statement_label}
+always_latch begin ${1:: statement_label}
   $0
-end : $1
+end $1
 endsnippet
 
 snippet module "Module block"

From a4465c7f243e8c4a9017074e10f709560f81583a Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 4 Mar 2015 20:59:12 +0000
Subject: [PATCH 0586/1587] Oops. Give eelixir snippets correct file extension

---
 UltiSnips/{eelixir.exs => eelixir.snippets} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename UltiSnips/{eelixir.exs => eelixir.snippets} (100%)

diff --git a/UltiSnips/eelixir.exs b/UltiSnips/eelixir.snippets
similarity index 100%
rename from UltiSnips/eelixir.exs
rename to UltiSnips/eelixir.snippets

From 6b1c3c618d167ecefe35910c495131ed2ad11eeb Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Wed, 4 Mar 2015 22:03:29 +0100
Subject: [PATCH 0587/1587] added GPL2

---
 snippets/sh.snippets | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 4d2c62b8b..8959a2796 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -92,3 +92,22 @@ snippet fun
 	function ${1:function_name}() {
 		${0:#function_body}
 	}
+
+snippet GPL2
+#########################################################################
+# ${1:One line to give the program's name and a brief description.}	#
+# Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}			#
+#									#
+# This script is free software; you can redistribute it and/or modify	#
+# it under the terms of the GNU General Public License as published by	#
+# the Free Software Foundation; either version 2 of the License, or	#
+# (at your option) any later version.					#
+#									#
+# This program is distributed in the hope that it will be useful,	#
+# but WITHOUT ANY WARRANTY; without even the implied warranty of	#
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		#
+# GNU General Public License for more details.				#
+#									#
+# You should have received a copy of the GNU General Public License	#
+# along with this program; if not, see <http://www.gnu.org/licenses/>.	#
+#########################################################################

From 25b7406f746cbfc185c20d277a334893e9878eb8 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Thu, 5 Mar 2015 14:49:51 +0100
Subject: [PATCH 0588/1587] snippet make-up ;)

---
 snippets/sh.snippets | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 8959a2796..07b57d859 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -92,22 +92,28 @@ snippet fun
 	function ${1:function_name}() {
 		${0:#function_body}
 	}
+	
+snippet funtitle
+	#===  FUNCTION  ===============================================================
+	#         NAME: ${1:function_name}
+	#  DESCRIPTION: ${0:One line to give a brief description.}
+	#==============================================================================
 
 snippet GPL2
-#########################################################################
-# ${1:One line to give the program's name and a brief description.}	#
-# Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}			#
-#									#
-# This script is free software; you can redistribute it and/or modify	#
-# it under the terms of the GNU General Public License as published by	#
-# the Free Software Foundation; either version 2 of the License, or	#
-# (at your option) any later version.					#
-#									#
-# This program is distributed in the hope that it will be useful,	#
-# but WITHOUT ANY WARRANTY; without even the implied warranty of	#
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		#
-# GNU General Public License for more details.				#
-#									#
-# You should have received a copy of the GNU General Public License	#
-# along with this program; if not, see <http://www.gnu.org/licenses/>.	#
-#########################################################################
+	#===  LICENSE  ================================================================
+	# ${1:One line to give the program's name and a brief description.}	
+	# Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}			
+	#									
+	# This script is free software; you can redistribute it and/or modify	
+	# it under the terms of the GNU General Public License as published by	
+	# the Free Software Foundation; either version 2 of the License, or	
+	# (at your option) any later version.					
+	#									
+	# This program is distributed in the hope that it will be useful,	
+	# but WITHOUT ANY WARRANTY; without even the implied warranty of	
+	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		
+	# GNU General Public License for more details.				
+	#									
+	# You should have received a copy of the GNU General Public License	
+	# along with this program; if not, see <http://www.gnu.org/licenses/>.	
+	#==============================================================================

From e37267bce6695a4c9d3c47c045697c540fa4687d Mon Sep 17 00:00:00 2001
From: Boone Severson <bseverson@google.com>
Date: Thu, 5 Mar 2015 07:21:25 -0800
Subject: [PATCH 0589/1587] final tweaks

---
 UltiSnips/systemverilog.snippets | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/UltiSnips/systemverilog.snippets b/UltiSnips/systemverilog.snippets
index c05bd1082..b8caceb4b 100644
--- a/UltiSnips/systemverilog.snippets
+++ b/UltiSnips/systemverilog.snippets
@@ -31,25 +31,25 @@ else begin
 end
 endsnippet
 
-snippet wh "While statement
+snippet wh "While statement"
 while (${1}) begin
   $0
 end
 endsnippet
 
-snippet repeat "Repeat loop"
+snippet rep "Repeat loop"
 repeat (${1}) begin
   $0
 end
 endsnippet
 
-snippet foreach "Foreach loop"
+snippet fe "Foreach loop"
 foreach (${1}) begin
   $0
 end
 endsnippet
 
-snippet dowh "Do-while statement
+snippet dowh "Do-while statement"
 do begin
   $0
 end while (${1});
@@ -75,31 +75,31 @@ casez (${1})
 endcase
 endsnippet
 
-snippet always_comb "Combinational always block"
+snippet alc "Combinational always block"
 always_comb begin ${1:: statement_label}
   $0
 end $1
 endsnippet
 
-snippet always_ff "Sequential logic"
+snippet alff "Sequential logic"
 always_ff @(posedge ${1:clk}) begin ${2:: statement_label}
   $0
 end $2
 endsnippet
 
-snippet always_latch "Latched logic"
+snippet all "Latched logic"
 always_latch begin ${1:: statement_label}
   $0
 end $1
 endsnippet
 
-snippet module "Module block"
+snippet mod "Module block"
 module ${1:module_name} ();
   $0
 endmodule : $1
 endsnippet
 
-snippet module "Class"
+snippet cl "Class"
 class ${1:module_name};
 	// data or class properties
   $0
@@ -111,19 +111,19 @@ class ${1:module_name};
 endmodule : $1
 endsnippet
 
-snippet typestruct "Typedef structure"
+snippet types "Typedef structure"
 typedef struct {
   $0
 } ${1:name_t};
 endsnippet
 
-snippet program "Program block"
+snippet prog "Program block"
 program ${1:program_name} ();
   $0
 endprogram : $1
 endsnippet
 
-snippet interface "Interface block"
+snippet intf "Interface block"
 interface ${1:program_name} ();
   // nets
   $0
@@ -135,19 +135,19 @@ interface ${1:program_name} ();
 endinterface : $1
 endsnippet
 
-snippet clocking "clocking"
+snippet clock "Clocking Block"
 clocking ${1:clocking_name} @(${2:posedge} ${3:clk});
   $0
 endclocking : $1
 endsnippet
 
-snippet covergroup "Covergroup construct"
+snippet cg "Covergroup construct"
 covergroup ${1:group_name} @(${2:posedge} ${3:clk});
   $0
 endgroup : $1
 endsnippet
 
-snippet package "Package declaration"
+snippet pkg "Package declaration"
 package ${1:package_name};
   $0
 endpackage : $1

From c76ec98eee3dbc570a738e98c1335b932c44f443 Mon Sep 17 00:00:00 2001
From: Chen Zhongzheng <chenzz.jasonchen@gmail.com>
Date: Fri, 6 Mar 2015 17:27:23 +0800
Subject: [PATCH 0590/1587] correct img tag

---
 UltiSnips/html_minimal.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/html_minimal.snippets b/UltiSnips/html_minimal.snippets
index 6867e8668..e7ca5e063 100644
--- a/UltiSnips/html_minimal.snippets
+++ b/UltiSnips/html_minimal.snippets
@@ -29,5 +29,5 @@ snippet textarea
 endsnippet
 
 snippet img
-	<img src="$1"${2: alt="$3"}/>
+<img src="$1"${2: alt="$3"}/>
 endsnippet

From 112ed60c26dfdc2eeaecf96a77b3ce793c1073a8 Mon Sep 17 00:00:00 2001
From: Mattia Tezzele <zool.bib@gmail.com>
Date: Mon, 9 Mar 2015 00:31:20 +0100
Subject: [PATCH 0591/1587] Add main element

---
 snippets/html.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index dcc28e749..89438b414 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -592,6 +592,10 @@ snippet link:rss
 	<link rel="alternate" href="${1:rss.xml}" title="RSS" type="application/atom+xml" />
 snippet link:touch
 	<link rel="apple-touch-icon" href="${1:favicon.png}" />
+snippet main
+	<main role="main">
+		${0}
+	</main>
 snippet map
 	<map name="${1}">
 		${0}

From a2d05c4a097e96110da13309f4f270d36a192b68 Mon Sep 17 00:00:00 2001
From: George Lee <mclee@foolme.net>
Date: Wed, 11 Mar 2015 21:57:07 +0800
Subject: [PATCH 0592/1587] update snippets to fit strong parameters

---
 snippets/rails.snippets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index 3a72bfde0..6018621de 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -36,7 +36,7 @@ snippet crw
 	cattr_accessor :${0:attr_names}
 snippet defcreate
 	def create
-		@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])
+		@${1:model_class_name} = ${2:ModelClassName}.new($1_params)
 
 		respond_to do |format|
 			if @$1.save
@@ -95,7 +95,7 @@ snippet defupdate
 		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
 
 		respond_to do |format|
-			if @$1.update_attributes(params[:$1])
+			if @$1.update($1_params)
 				flash[:notice] = '$2 was successfully updated.'
 				format.html { redirect_to(@$1) }
 				format.xml  { head :ok }
@@ -105,6 +105,10 @@ snippet defupdate
 			end
 		end
 	end
+snippet defparams
+	def ${1:model_class_name}_params
+		params.require(:$1).permit()
+	end
 snippet dele delegate .. to
 	delegate :${1:methods}, to: :${0:object}
 snippet dele delegate .. to .. prefix .. allow_nil

From 6753f3795e2ace0a4fff6a7acc774801c2071c04 Mon Sep 17 00:00:00 2001
From: No Ducks <onemannoducks@gmail.com>
Date: Wed, 11 Mar 2015 22:59:17 +0000
Subject: [PATCH 0593/1587] Add jshint friendly use strict snippet

---
 snippets/javascript/javascript.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 5fbad8fa2..4113e9e62 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -257,6 +257,10 @@ snippet cdir
 
 # Misc
 
+# 'use strict';
+snippet us
+	'use strict';
+
 # setTimeout function
 snippet timeout
 	setTimeout(function () {${0}}${2}, ${1:10});

From a83b3db1b3cd7a4efa763a0fb3e8bb5c73ba015e Mon Sep 17 00:00:00 2001
From: mMontu <marcmontu@yahoo.com.br>
Date: Thu, 12 Mar 2015 09:20:54 -0300
Subject: [PATCH 0594/1587] Fix bbox outside the first column (consider &tw)

---
 UltiSnips/all.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 757837859..fb6138a10 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -89,7 +89,8 @@ endsnippet
 
 snippet bbox "A nice box over the full width" b
 `!p
-width = int(vim.eval("&textwidth")) or 71
+if not snip.c:
+	width = int(vim.eval("&textwidth - (virtcol('.') == 1 ? 0 : virtcol('.'))")) or 71
 box = make_box(len(t[1]), width)
 snip.rv = box[0]
 snip += box[1]

From 8474152209133f11243063c7c914a49908e346c9 Mon Sep 17 00:00:00 2001
From: David Arvelo <david@davidarvelo.com>
Date: Sat, 14 Mar 2015 18:34:31 -0400
Subject: [PATCH 0595/1587] Add shebang for nodejs

---
 snippets/javascript/javascript.node.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/javascript/javascript.node.snippets b/snippets/javascript/javascript.node.snippets
index abc3b8d89..1da78d098 100644
--- a/snippets/javascript/javascript.node.snippets
+++ b/snippets/javascript/javascript.node.snippets
@@ -1,3 +1,5 @@
+snippet #!
+	#!/usr/bin/env node
 # module exports
 snippet ex
 	module.exports = ${1};

From 7746cec77cba4bed1541ea7a1b431b449cb05903 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 16 Mar 2015 22:50:34 +0000
Subject: [PATCH 0596/1587] Ultisnips eelixir and HTML tweaks

---
 UltiSnips/eelixir.snippets | 12 ++++++++++++
 UltiSnips/html.snippets    | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/UltiSnips/eelixir.snippets b/UltiSnips/eelixir.snippets
index a9c5a29ad..79257efeb 100644
--- a/UltiSnips/eelixir.snippets
+++ b/UltiSnips/eelixir.snippets
@@ -1,3 +1,15 @@
 priority -50
 
 extends html
+
+snippet % "<% %>" w
+	<% ${0} %>
+endsnippet
+
+snippet = "<%= %>" w
+	<%= ${1} %>
+endsnippet
+
+snippet end "<% end %>" w
+	<% end %>
+endsnippet
diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 3986e1162..fd1aca51f 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -198,6 +198,18 @@ snippet h1 "XHTML <h1>" w
 <h1>$0</h1>
 endsnippet
 
+snippet h2 "XHTML <h2>" w
+<h2>$0</h2>
+endsnippet
+
+snippet h3 "XHTML <h3>" w
+<h3>$0</h3>
+endsnippet
+
+snippet h4 "XHTML <h4>" w
+<h4>$0</h4>
+endsnippet
+
 snippet head "XHTML <head>"
 <head>
 	<meta charset="utf-8">

From 1f0932bba584371e4bbd7fc580fe07501ec2ef35 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 16 Mar 2015 23:06:58 +0000
Subject: [PATCH 0597/1587] eelixir form_tag, link

---
 UltiSnips/eelixir.snippets | 16 +++++++++++++---
 snippets/eelixir.snippets  | 12 +++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/eelixir.snippets b/UltiSnips/eelixir.snippets
index 79257efeb..5b40290f6 100644
--- a/UltiSnips/eelixir.snippets
+++ b/UltiSnips/eelixir.snippets
@@ -3,13 +3,23 @@ priority -50
 extends html
 
 snippet % "<% %>" w
-	<% ${0} %>
+<% $0 %>
 endsnippet
 
 snippet = "<%= %>" w
-	<%= ${1} %>
+<%= $0 %>
 endsnippet
 
 snippet end "<% end %>" w
-	<% end %>
+<% end %>
+endsnippet
+
+snippet ft "form_tag" w
+<%= form_tag(${1:"${2:/users}"}, method: ${3::post}) %>
+	$0
+</form>
+endsnippet
+
+snippet lin "link" w
+<%= link ${1:"${2:Submit}"}, to: ${3:"${4:/users}"}, method: ${5::delete}) %>
 endsnippet
diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 17855b41b..f600c465d 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -1,6 +1,16 @@
 snippet %
 	<% ${0} %>
+
 snippet =
-	<%= ${1} %>
+	<%= ${0} %>
+
 snippet end
 	<% end %>
+
+snippet ft
+	<%= form_tag(${1:"/users"}, method: ${2::post}) %>
+		${0}
+	</form>
+
+snippet lin
+	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete}) %>

From 94d3dab682ceb32845d8d9d053f16f863b7834a9 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 16 Mar 2015 23:30:02 +0000
Subject: [PATCH 0598/1587] Elixir form snippets

---
 README.md                  | 2 +-
 UltiSnips/eelixir.snippets | 8 ++++++++
 snippets/eelixir.snippets  | 7 +++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1d3915940..996c67dd3 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,7 @@ to maintain snippets for a language, please get in touch.
 Notes: People are interested in snippets - and their interest may wane again.
 This list is kept up-to-date on a best effort basis.
 
-* Elixir - [iurifq](https://github.com/iurifq)
+* Elixir - [lpil](https://github.com/iurifq), [iurifq](https://github.com/iurifq)
 * Falcon - [steveno](https://github.com/steveno)
 * HTML Django - [honza](http://github.com/honza)
 * Javascript - [honza](http://github.com/honza)
diff --git a/UltiSnips/eelixir.snippets b/UltiSnips/eelixir.snippets
index 5b40290f6..8ca825219 100644
--- a/UltiSnips/eelixir.snippets
+++ b/UltiSnips/eelixir.snippets
@@ -23,3 +23,11 @@ endsnippet
 snippet lin "link" w
 <%= link ${1:"${2:Submit}"}, to: ${3:"${4:/users}"}, method: ${5::delete}) %>
 endsnippet
+
+snippet ff "form_for" w
+<%= form_for @changeset, ${1:"${2:/users}"}, fn f -> %>
+		$0
+
+	<%= submit "Submit" %>
+<% end %>
+endsnippet
diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index f600c465d..57c0371bc 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -14,3 +14,10 @@ snippet ft
 
 snippet lin
 	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete}) %>
+
+snippet ff
+	<%= form_for @changeset, ${1:"/users"}, fn f -> %>
+			${0}
+
+		<%= submit "Submit" %>
+	<% end %>

From 80e72fc6aa2903a7902b5df7d3efb762edb85fdc Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 16 Mar 2015 23:32:29 +0000
Subject: [PATCH 0599/1587] Fix broken README link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 996c67dd3..a552082e3 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,7 @@ to maintain snippets for a language, please get in touch.
 Notes: People are interested in snippets - and their interest may wane again.
 This list is kept up-to-date on a best effort basis.
 
-* Elixir - [lpil](https://github.com/iurifq), [iurifq](https://github.com/iurifq)
+* Elixir - [lpil](https://github.com/lpil), [iurifq](https://github.com/iurifq)
 * Falcon - [steveno](https://github.com/steveno)
 * HTML Django - [honza](http://github.com/honza)
 * Javascript - [honza](http://github.com/honza)

From 7d13d521b482c3d0fc5e857b29b551e529553674 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 19 Mar 2015 10:27:33 +0000
Subject: [PATCH 0600/1587] eElixir, remove trailing ) from lin

---
 UltiSnips/eelixir.snippets | 2 +-
 snippets/eelixir.snippets  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/eelixir.snippets b/UltiSnips/eelixir.snippets
index 8ca825219..040077fa0 100644
--- a/UltiSnips/eelixir.snippets
+++ b/UltiSnips/eelixir.snippets
@@ -21,7 +21,7 @@ snippet ft "form_tag" w
 endsnippet
 
 snippet lin "link" w
-<%= link ${1:"${2:Submit}"}, to: ${3:"${4:/users}"}, method: ${5::delete}) %>
+<%= link ${1:"${2:Submit}"}, to: ${3:"${4:/users}"}, method: ${5::delete} %>
 endsnippet
 
 snippet ff "form_for" w
diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 57c0371bc..be7ce011c 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -13,7 +13,7 @@ snippet ft
 	</form>
 
 snippet lin
-	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete}) %>
+	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete} %>
 
 snippet ff
 	<%= form_for @changeset, ${1:"/users"}, fn f -> %>

From f20a1c4c4e0820e9335efa4a7985a6a88aa42911 Mon Sep 17 00:00:00 2001
From: Boone Severson <bseverson@google.com>
Date: Fri, 20 Mar 2015 08:23:01 -0700
Subject: [PATCH 0601/1587] move from ultisnips format to snipmate format upon
 request

---
 UltiSnips/systemverilog.snippets | 156 -------------------------------
 snippets/systemverilog.snippets  | 127 +++++++++++++++++++++++++
 2 files changed, 127 insertions(+), 156 deletions(-)
 delete mode 100644 UltiSnips/systemverilog.snippets
 create mode 100644 snippets/systemverilog.snippets

diff --git a/UltiSnips/systemverilog.snippets b/UltiSnips/systemverilog.snippets
deleted file mode 100644
index b8caceb4b..000000000
--- a/UltiSnips/systemverilog.snippets
+++ /dev/null
@@ -1,156 +0,0 @@
-priority -50
-
-##########################
-# SystemVerilog Snippets #
-##########################
-
-snippet if "If statement"
-if (${1}) begin
-  $0
-end
-endsnippet
-
-snippet ife "If/else statements"
-if (${1}) begin
-  $0
-end
-else begin
-
-end
-endsnippet
-
-snippet eif "Else if statement"
-else if (${1}) begin
-  $0
-end
-endsnippet
-
-snippet el "Else statement"
-else begin
-  $0
-end
-endsnippet
-
-snippet wh "While statement"
-while (${1}) begin
-  $0
-end
-endsnippet
-
-snippet rep "Repeat loop"
-repeat (${1}) begin
-  $0
-end
-endsnippet
-
-snippet fe "Foreach loop"
-foreach (${1}) begin
-  $0
-end
-endsnippet
-
-snippet dowh "Do-while statement"
-do begin
-  $0
-end while (${1});
-endsnippet
-
-snippet case "Case statement"
-case (${1})
-  {$2}: begin
-    $0
-  end
-  default: begin
-  end
-endcase
-endsnippet
-
-snippet casez "CaseZ statement"
-casez (${1})
-  {$2}: begin
-    $0
-  end
-  default: begin
-  end
-endcase
-endsnippet
-
-snippet alc "Combinational always block"
-always_comb begin ${1:: statement_label}
-  $0
-end $1
-endsnippet
-
-snippet alff "Sequential logic"
-always_ff @(posedge ${1:clk}) begin ${2:: statement_label}
-  $0
-end $2
-endsnippet
-
-snippet all "Latched logic"
-always_latch begin ${1:: statement_label}
-  $0
-end $1
-endsnippet
-
-snippet mod "Module block"
-module ${1:module_name} ();
-  $0
-endmodule : $1
-endsnippet
-
-snippet cl "Class"
-class ${1:module_name};
-	// data or class properties
-  $0
-
-  // initialization
-  function new();
-  endfunction : new
-
-endmodule : $1
-endsnippet
-
-snippet types "Typedef structure"
-typedef struct {
-  $0
-} ${1:name_t};
-endsnippet
-
-snippet prog "Program block"
-program ${1:program_name} ();
-  $0
-endprogram : $1
-endsnippet
-
-snippet intf "Interface block"
-interface ${1:program_name} ();
-  // nets
-  $0
-
-  // clocking
-
-  // modports
-
-endinterface : $1
-endsnippet
-
-snippet clock "Clocking Block"
-clocking ${1:clocking_name} @(${2:posedge} ${3:clk});
-  $0
-endclocking : $1
-endsnippet
-
-snippet cg "Covergroup construct"
-covergroup ${1:group_name} @(${2:posedge} ${3:clk});
-  $0
-endgroup : $1
-endsnippet
-
-snippet pkg "Package declaration"
-package ${1:package_name};
-  $0
-endpackage : $1
-endsnippet
-
-# vim:ft=snippets:
diff --git a/snippets/systemverilog.snippets b/snippets/systemverilog.snippets
new file mode 100644
index 000000000..f2b2aa1c1
--- /dev/null
+++ b/snippets/systemverilog.snippets
@@ -0,0 +1,127 @@
+# if statement
+snippet if
+	if (${1}) begin
+		${0}
+	end
+# If/else statements
+snippet ife
+	if (${1}) begin
+		${2}
+	end
+	else begin
+		${1}
+	end
+# Else if statement
+snippet eif
+	else if (${1}) begin
+		${0}
+	end
+#Else statement
+snippet el
+	else begin
+		${0}
+	end
+# While statement
+snippet wh
+	while (${1}) begin
+		${0}
+	end
+# Repeat Loop
+snippet rep
+	repeat (${1}) begin
+		${0}
+	end
+# Foreach Loopo
+snippet fe
+	foreach (${1}) begin
+		${0}
+	end
+# Do-while statement
+snippet dowh
+	do begin
+		${0}
+	end while (${1});
+# Case statement
+snippet case
+	case (${1})
+		{$2}: begin
+			${0}
+		end
+		default: begin
+		end
+	endcase
+# CaseZ statement
+snippet casez
+casez (${1})
+		{$2}: begin
+			${0}
+		end
+		default: begin
+		end
+	endcase
+# Combinational always block
+snippet alc
+	always_comb begin ${1:: statement_label}
+		${0}
+	end $1
+# Sequential logic
+snippet alff
+	always_ff @(posedge ${1:clk}) begin ${2:: statement_label}
+		${0}
+	end $2
+# Latched logic
+snippet all
+	always_latch begin ${1:: statement_label}
+		${0}
+	end $1
+# Module block
+snippet mod
+	module ${1:module_name} (${2});
+		${0}
+	endmodule : $1
+# Class
+snippet cl
+	class ${1:module_name};
+		// data or class properties
+		${0}
+
+		// initialization
+		function new();
+		endfunction : new
+
+	endmodule : $1
+# Typedef structure
+snippet types
+	typedef struct {
+		${0}
+	} ${1:name_t};
+# Program block
+snippet prog
+	program ${1:program_name} ();
+		${0}
+	endprogram : $1
+# Interface block
+snippet intf
+	interface ${1:program_name} ();
+		// nets
+		${0}
+		// clocking
+
+		// modports
+
+	endinterface : $1
+# Clocking Block
+snippet clock
+	clocking ${1:clocking_name} @(${2:posedge} ${3:clk});
+		${0}
+	endclocking : $1
+# Covergroup construct
+snippet cg
+	covergroup ${1:group_name} @(${2:posedge} ${3:clk});
+		${0}
+	endgroup : $1
+# Package declaration
+snippet pkg
+	package ${1:package_name};
+		${0}
+	endpackage : $1

From 03e8f5c2f540917ea59545694ff7dde6e17ecac4 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Fri, 20 Mar 2015 11:41:14 -0700
Subject: [PATCH 0602/1587] Update prompt_toolkit to ptpython, fix argument
 defaults.

---
 snippets/python.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 3fa72b07a..6953da9e9 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -138,10 +138,10 @@ snippet pdbbb
 # remote python debugger (rpdb)
 snippet rpdb
 	import rpdb; rpdb.set_trace()
-# python_prompt_toolkit
-snippet ppt
-	from prompt_toolkit.contrib.repl import embed
-	embed(globals(), locals(), vi_mode=${1:default=False}, history_filename=${2:default=None})
+# ptpython
+snippet ptpython
+	from ptpython.repl import embed
+	embed(globals(), locals(), vi_mode=${1:False}, history_filename=${2:None})
 # python console debugger (pudb)
 snippet pudb
 	import pudb; pudb.set_trace()

From 8ce4f37b57b4586e36251d2c6a48fd9c027281e5 Mon Sep 17 00:00:00 2001
From: Boone Severson <bseverson@google.com>
Date: Mon, 23 Mar 2015 17:55:20 -0700
Subject: [PATCH 0603/1587] bug in class's ending scope

---
 snippets/systemverilog.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/systemverilog.snippets b/snippets/systemverilog.snippets
index f2b2aa1c1..86d664f61 100644
--- a/snippets/systemverilog.snippets
+++ b/snippets/systemverilog.snippets
@@ -81,7 +81,7 @@ snippet mod
 	endmodule : $1
 # Class
 snippet cl
-	class ${1:module_name};
+	class ${1:class_name};
 		// data or class properties
 		${0}
 
@@ -89,7 +89,7 @@ snippet cl
 		function new();
 		endfunction : new
 
-	endmodule : $1
+	endclass : $1
 # Typedef structure
 snippet types
 	typedef struct {

From 2e497c5ab0c0f496634469469ca4b98c5ae081a6 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Tue, 24 Mar 2015 11:50:58 +0100
Subject: [PATCH 0604/1587] foreach

changed foreach snipped to the one used in Visual Studio
---
 snippets/cs.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index e537bce4c..490c779ad 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -103,15 +103,15 @@ snippet for
 	}
 # foreach
 snippet fore
-	foreach (var ${1:entry} in ${2}) {
+	foreach (${1:var} ${2:entry} in ${3}) {
 		${0}
 	}
 snippet foreach
-	foreach (var ${1:entry} in ${2}) {
+	foreach (${1:var} ${2:entry} in ${3}) {
 		${0}
 	}
 snippet each
-	foreach (var ${1:entry} in ${2}) {
+	foreach (${1:var} ${2:entry} in ${3}) {
 		${0}
 	}
 # interfaces

From 8944f3b3db4516c8d3fe2f644dc7cde9a1c0dfb4 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Tue, 24 Mar 2015 11:59:59 +0100
Subject: [PATCH 0605/1587] if with standard value True

like in visual studio
---
 snippets/cs.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 490c779ad..023721bde 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -71,7 +71,7 @@ snippet simc
 	}
 # if condition
 snippet if
-	if (${1}) {
+	if (${1:True}) {
 		${0}
 	}
 snippet el

From 5cec4208869f663dfffb1747c6157110541bf2dc Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Tue, 24 Mar 2015 22:31:19 +0100
Subject: [PATCH 0606/1587] Update sh.snippets

---
 snippets/sh.snippets | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 07b57d859..de88c017b 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -98,22 +98,3 @@ snippet funtitle
 	#         NAME: ${1:function_name}
 	#  DESCRIPTION: ${0:One line to give a brief description.}
 	#==============================================================================
-
-snippet GPL2
-	#===  LICENSE  ================================================================
-	# ${1:One line to give the program's name and a brief description.}	
-	# Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}			
-	#									
-	# This script is free software; you can redistribute it and/or modify	
-	# it under the terms of the GNU General Public License as published by	
-	# the Free Software Foundation; either version 2 of the License, or	
-	# (at your option) any later version.					
-	#									
-	# This program is distributed in the hope that it will be useful,	
-	# but WITHOUT ANY WARRANTY; without even the implied warranty of	
-	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		
-	# GNU General Public License for more details.				
-	#									
-	# You should have received a copy of the GNU General Public License	
-	# along with this program; if not, see <http://www.gnu.org/licenses/>.	
-	#==============================================================================

From 5fed02a0178edfb81f3698e81803a7a30bb7fbda Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Tue, 24 Mar 2015 22:32:12 +0100
Subject: [PATCH 0607/1587] Update sh.snippets

---
 snippets/sh.snippets | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index de88c017b..e1555d4ac 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -93,8 +93,3 @@ snippet fun
 		${0:#function_body}
 	}
 	
-snippet funtitle
-	#===  FUNCTION  ===============================================================
-	#         NAME: ${1:function_name}
-	#  DESCRIPTION: ${0:One line to give a brief description.}
-	#==============================================================================

From 984e63a7ee97defda6064ef38a6e89732cdcd6d3 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Tue, 24 Mar 2015 22:32:26 +0100
Subject: [PATCH 0608/1587] Update sh.snippets

---
 snippets/sh.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index e1555d4ac..4d2c62b8b 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -92,4 +92,3 @@ snippet fun
 	function ${1:function_name}() {
 		${0:#function_body}
 	}
-	

From ca07ca66536e6ef5634600d66d5b688f7e3cd2fd Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 24 Mar 2015 23:45:58 +0000
Subject: [PATCH 0609/1587] AGPL snippet

---
 snippets/_.snippets | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index ff52c0a55..28c290f56 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -261,3 +261,19 @@ snippet MPL2
 	License, v. 2.0. If a copy of the MPL was not distributed with this
 	file, You can obtain one at http://mozilla.org/MPL/2.0/.
 	${0}
+snippet AGPL
+	${1:One line to give the program's name and a brief description.}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+
+	This program  is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as
+	published by the Free Software Foundation, either version 3 of the
+	License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.

From 707f005ccddaa15a0b8c207a7a711b0a9590578a Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 24 Mar 2015 23:49:29 +0000
Subject: [PATCH 0610/1587] =?UTF-8?q?Licence=20snippets:=20Use=20=C2=A9=20?=
 =?UTF-8?q?in=20UTF=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snippets/_.snippets | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index 28c290f56..d7f51bea8 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -15,7 +15,7 @@ snippet lorem
 	Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 snippet GPL2
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ snippet GPL2
 	${0}
 snippet LGPL2
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
 
 	This library is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as published
@@ -49,7 +49,7 @@ snippet LGPL2
 	${0}
 snippet GPL3
 	${1:one line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -66,7 +66,7 @@ snippet GPL3
 	${0}
 snippet LGPL3
 	${1:One line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
 
 	This library is free software; you can redistribute it and/or modify
 	it under the terms of the GNU Lesser General Public License as published
@@ -83,7 +83,7 @@ snippet LGPL3
 	${0}
 snippet AGPL3
 	${1:one line to give the program's name and a brief description.}
-	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as
@@ -109,7 +109,7 @@ snippet GMGPL linking exception
 	${0}
 snippet BSD2
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -138,7 +138,7 @@ snippet BSD2
 	${0}
 snippet BSD3
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -165,7 +165,7 @@ snippet BSD3
 	${0}
 snippet BSD4
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -195,7 +195,7 @@ snippet BSD4
 	${0}
 snippet MIT
 	${1:one line to give the program's name and a brief description}
-	Copyright (C) `strftime("%Y")` ${2:`g:snips_author`}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
 
 	Permission is hereby granted, free of charge, to any person obtaining
 	a copy of this software and associated documentation files (the "Software"),

From d956ce5c556c576968575a72d6e23990df53664d Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Thu, 26 Mar 2015 14:35:55 +0100
Subject: [PATCH 0611/1587] som more snippets from vs.net

onto invoke
---
 snippets/cs.snippets | 47 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 023721bde..561bf9f87 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -90,7 +90,7 @@ snippet ?
 snippet do
 	do {
 		${0}
-	} while (${1});
+	} while (${1:True});
 # while loop
 snippet wh
 	while (${1}) {
@@ -101,6 +101,10 @@ snippet for
 	for (int ${1:i} = 0; $1 < ${2:count}; $1${3:++}) {
 		${0}
 	}
+snippet forr
+	for (int ${1:i} = ${2:length}; $1 >= 0; $1--) {
+		${0}
+	}
 # foreach
 snippet fore
 	foreach (${1:var} ${2:entry} in ${3}) {
@@ -347,6 +351,11 @@ snippet struct
 	}
 # enumeration
 snippet enum
+	enum ${1} {
+		${0}
+	}
+	
+snippet enum+
 	public enum ${1} {
 		${0}
 	}
@@ -372,3 +381,39 @@ snippet <rem
 	<remarks>${1}</remarks>
 snippet <c
 	<code>${1}</code>
+
+snippet cw
+	Console.WriteLine(${1});
+
+# equals override
+snippet eq
+        public override bool Equals(object obj){
+            if (obj == null || GetType() != obj.GetType()){
+                return false;
+            }
+            ${0:throw new NotImplementedException();}
+            return base.Equals(obj);
+        }
+# exception snippet
+snippet exc
+	public class ${1:MyException} : ${2:Exception}{
+            public $1() { }
+            public $1(string message) : base(message) { }
+            public $1(string message, Exception inner) : base(message, inner) { }
+            protected $1(
+              System.Runtime.Serialization.SerializationInfo info,
+              System.Runtime.Serialization.StreamingContext context)
+                : base(info, context) { }
+        }
+# indexer snippet
+snippet index
+	public ${1:object} this[${2:int} index]{
+            get { ${3:} }
+            set { ${0:} }
+        }
+# eventhandler snippet
+snippet inv
+	EventHandler temp = ${1:MyEvent};
+	if (${2:temp} != null){
+		$2();
+	}

From 77fcae8328d8bbdd0eee4db2d214d3f6fe490252 Mon Sep 17 00:00:00 2001
From: Gert <gert@gepe-biljarts.be>
Date: Thu, 26 Mar 2015 17:29:59 +0100
Subject: [PATCH 0612/1587] some more vs.net snippets

---
 snippets/cs.snippets | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 561bf9f87..c4291a892 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -394,7 +394,7 @@ snippet eq
             ${0:throw new NotImplementedException();}
             return base.Equals(obj);
         }
-# exception snippet
+# exception 
 snippet exc
 	public class ${1:MyException} : ${2:Exception}{
             public $1() { }
@@ -405,15 +405,41 @@ snippet exc
               System.Runtime.Serialization.StreamingContext context)
                 : base(info, context) { }
         }
-# indexer snippet
+# indexer 
 snippet index
 	public ${1:object} this[${2:int} index]{
             get { ${3:} }
             set { ${0:} }
         }
-# eventhandler snippet
+# eventhandler 
 snippet inv
 	EventHandler temp = ${1:MyEvent};
 	if (${2:temp} != null){
 		$2();
 	}
+# lock
+snippet lock
+    lock (${1:this}){
+        ${0:}
+    }
+# namespace
+snippet namespace
+    namespace ${1:MyNamespace}{
+        ${0:}
+    }
+# property
+snippet prop
+    public ${1:int} ${2:MyProperty} { get; set;}
+snippet propf
+    private ${1:int} ${2:myVar};
+
+    public $1 ${3:MyProperty}{
+        get { return $2;}
+        set { $2 = value;}
+    }
+snippet propg
+    public ${1:int} ${2:MyProperty} { get; private set; }
+
+# todo: iterator, iterindex
+
+

From d7156500302933aaf10344f3134f69fbffc1a4ac Mon Sep 17 00:00:00 2001
From: Gert <gert@gepe-biljarts.be>
Date: Thu, 26 Mar 2015 17:56:09 +0100
Subject: [PATCH 0613/1587] VC# snippets vs2013

---
 snippets/cs.snippets | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index c4291a892..53619ba2f 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -56,19 +56,23 @@
 #
 # Feedback is welcome!
 #
-# entry point
+# Main 
 snippet sim
-	public static int Main(string[] args) {
+	${1:public }static int Main(string[] args) {
 		${0}
 		return 0;
 	}
 snippet simc
 	public class Application {
-		public static int Main(string[] args) {
+		${1:public }static int Main(string[] args) {
 			${0}
 			return 0;
 		}
 	}
+snippet svm
+    ${1:public }static void Main(string[] args){
+        ${0}
+    }
 # if condition
 snippet if
 	if (${1:True}) {
@@ -93,7 +97,7 @@ snippet do
 	} while (${1:True});
 # while loop
 snippet wh
-	while (${1}) {
+	while (${1:true}) {
 		${0}
 	}
 # for loop
@@ -439,7 +443,32 @@ snippet propf
     }
 snippet propg
     public ${1:int} ${2:MyProperty} { get; private set; }
-
+# switch    
+snippet switch
+    switch (${1:switch_on}){
+        ${0}
+        default:
+    }
+# try
+snippet try
+    try{
+        ${0}
+    }
+    catch (${1:System.Exception}){
+        throw;
+    }
+snippet tryf
+    try{
+        ${0}
+    }
+    finally{
+        ${1}
+    }
+# using
+snippet usi
+    using(${1:resource}){
+        ${0}
+    }
 # todo: iterator, iterindex
 
 

From 47f5d23d2d78f4965ea88818b5aa25a4404eaa68 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Thu, 26 Mar 2015 18:06:10 +0100
Subject: [PATCH 0614/1587] Update cs.snippets

---
 snippets/cs.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 53619ba2f..4b4c7352d 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -469,6 +469,5 @@ snippet usi
     using(${1:resource}){
         ${0}
     }
-# todo: iterator, iterindex
 
 

From 21a683b04da24c8cb29b44a1e94269c0abc510db Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Thu, 26 Mar 2015 21:48:07 +0100
Subject: [PATCH 0615/1587] Update cs.snippets

---
 snippets/cs.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 4b4c7352d..7b67d1d68 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -75,7 +75,7 @@ snippet svm
     }
 # if condition
 snippet if
-	if (${1:True}) {
+	if (${1:true}) {
 		${0}
 	}
 snippet el
@@ -94,7 +94,7 @@ snippet ?
 snippet do
 	do {
 		${0}
-	} while (${1:True});
+	} while (${1:true});
 # while loop
 snippet wh
 	while (${1:true}) {

From 41c1148f34a6fcb68b25f11618206fe7468b2593 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Fri, 27 Mar 2015 11:19:57 +0100
Subject: [PATCH 0616/1587] som changes for uniform look of snippets

---
 snippets/cs.snippets | 152 +++++++++++++++++++++----------------------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 7b67d1d68..c1fe94f3f 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -70,7 +70,7 @@ snippet simc
 		}
 	}
 snippet svm
-    ${1:public }static void Main(string[] args){
+    ${1:public }static void Main(string[] args) {
         ${0}
     }
 # if condition
@@ -172,32 +172,32 @@ snippet ctor
 # properties - auto properties by default.
 # default type is int with layout get / set.
 snippet prop
-	${1:public} ${2:int} ${3:} { get; set; }
+	${1:public} ${2:int} ${3} { get; set; }
 snippet p
-	${1:public} ${2:int} ${3:} { get; set; }
+	${1:public} ${2:int} ${3} { get; set; }
 snippet p+
-	public ${1:int} ${2:} { get; set; }
+	public ${1:int} ${2} { get; set; }
 snippet p+&
-	public ${1:int} ${2:} { get; internal set; }
+	public ${1:int} ${2} { get; internal set; }
 snippet p+|
-	public ${1:int} ${2:} { get; protected set; }
+	public ${1:int} ${2} { get; protected set; }
 snippet p+-
-	public ${1:int} ${2:} { get; private set; }
+	public ${1:int} ${2} { get; private set; }
 snippet p&
-	internal ${1:int} ${2:} { get; set; }
+	internal ${1:int} ${2} { get; set; }
 snippet p&|
-	internal ${1:int} ${2:} { get; protected set; }
+	internal ${1:int} ${2} { get; protected set; }
 snippet p&-
-	internal ${1:int} ${2:} { get; private set; }
+	internal ${1:int} ${2} { get; private set; }
 snippet p|
-	protected ${1:int} ${2:} { get; set; }
+	protected ${1:int} ${2} { get; set; }
 snippet p|-
-	protected ${1:int} ${2:} { get; private set; }
+	protected ${1:int} ${2} { get; private set; }
 snippet p-
-	private ${1:int} ${2:} { get; set; }
+	private ${1:int} ${2} { get; set; }
 # property - bool
 snippet pi
-	${1:public} int ${2:} { get; set; }
+	${1:public} int ${2} { get; set; }
 snippet pi+
 	public int ${1} { get; set; }
 snippet pi+&
@@ -220,7 +220,7 @@ snippet pi-
 	private int ${1} { get; set; }
 # property - bool
 snippet pb
-	${1:public} bool ${2:} { get; set; }
+	${1:public} bool ${2} { get; set; }
 snippet pb+
 	public bool ${1} { get; set; }
 snippet pb+&
@@ -243,7 +243,7 @@ snippet pb-
 	private bool ${1} { get; set; }
 # property - string
 snippet ps
-	${1:public} string ${2:} { get; set; }
+	${1:public} string ${2} { get; set; }
 snippet ps+
 	public string ${1} { get; set; }
 snippet ps+&
@@ -266,87 +266,87 @@ snippet ps-
 	private string ${1} { get; set; }
 # members - void
 snippet m
-	${1:public} ${2:void} ${3:}(${4:}) {
-		${5:}
+	${1:public} ${2:void} ${3}(${4}) {
+		${0}
 	}
 snippet m+
-	public ${1:void} ${2:}(${3:}) {
-		${4:}
+	public ${1:void} ${2}(${3}) {
+		${0}
 	}
 snippet m&
-	internal ${1:void} ${2:}(${3:}) {
-		${4:}
+	internal ${1:void} ${2}(${3}) {
+		${0}
 	}
 snippet m|
-	protected ${1:void} ${2:}(${3:}) {
-		${4:}
+	protected ${1:void} ${2}(${3}) {
+		${0}
 	}
 snippet m-
-	private ${1:void} ${2:}(${3:}) {
-		${4:}
+	private ${1:void} ${2}(${3}) {
+		${0}
 	}
 # members - int
 snippet mi
-	${1:public} int ${2:}(${3:}) {
-		${4:return 0;}
+	${1:public} int ${2}(${3}) {
+		${0:return 0;}
 	}
 snippet mi+
-	public int ${1:}(${2:}) {
-		${3:return 0;}
+	public int ${1}(${2}) {
+		${0:return 0;}
 	}
 snippet mi&
-	internal int ${1:}(${2:}) {
-		${3:return 0;}
+	internal int ${1}(${2}) {
+		${0:return 0;}
 	}
 snippet mi|
-	protected int ${1:}(${2:}) {
-		${3:return 0;}
+	protected int ${1}(${2}) {
+		${0:return 0;}
 	}
 snippet mi-
-	private int ${1:}(${2:}) {
-		${3:return 0;}
+	private int ${1}(${2}) {
+		${0:return 0;}
 	}
 # members - bool
 snippet mb
-	${1:public} bool ${2:}(${3:}) {
-		${4:return false;}
+	${1:public} bool ${2}(${3}) {
+		${0:return false;}
 	}
 snippet mb+
-	public bool ${1:}(${2:}) {
-		${3:return false;}
+	public bool ${1}(${2}) {
+		${0:return false;}
 	}
 snippet mb&
-	internal bool ${1:}(${2:}) {
-		${3:return false;}
+	internal bool ${1}(${2}) {
+		${0:return false;}
 	}
 snippet mb|
-	protected bool ${1:}(${2:}) {
-		${3:return false;}
+	protected bool ${1}(${2}) {
+		${0:return false;}
 	}
 snippet mb-
-	private bool ${1:}(${2:}) {
-		${3:return false;}
+	private bool ${1}(${2}) {
+		${0:return false;}
 	}
 # members - string
 snippet ms
-	${1:public} string ${2:}(${3:}) {
-		${4:return "";}
+	${1:public} string ${2}(${3}) {
+		${0:return "";}
 	}
 snippet ms+
-	public string ${1:}(${2:}) {
-		${3:return "";}
+	public string ${1}(${2}) {
+		${0:return "";}
 	}
 snippet ms&
-	internal string ${1:}(${2:}) {
-		${3:return "";}
+	internal string ${1}(${2}) {
+		${0:return "";}
 	}
 snippet ms|
 	protected string ${1:}(${2:}) {
-		${3:return "";}
+		${0:return "";}
 	}
 snippet ms-
-	private string ${1:}(${2:}) {
-		${3:return "";}
+	private string ${1}(${2}) {
+		${0:return "";}
 	}
 # structure
 snippet struct
@@ -391,8 +391,8 @@ snippet cw
 
 # equals override
 snippet eq
-        public override bool Equals(object obj){
-            if (obj == null || GetType() != obj.GetType()){
+        public override bool Equals(object obj) {
+            if (obj == null || GetType() != obj.GetType()) {
                 return false;
             }
             ${0:throw new NotImplementedException();}
@@ -400,7 +400,7 @@ snippet eq
         }
 # exception 
 snippet exc
-	public class ${1:MyException} : ${2:Exception}{
+	public class ${1:MyException} : ${2:Exception} {
             public $1() { }
             public $1(string message) : base(message) { }
             public $1(string message, Exception inner) : base(message, inner) { }
@@ -411,62 +411,62 @@ snippet exc
         }
 # indexer 
 snippet index
-	public ${1:object} this[${2:int} index]{
-            get { ${3:} }
-            set { ${0:} }
+	public ${1:object} this[${2:int} index] {
+            get { ${0} }
+            set { ${0} }
         }
 # eventhandler 
 snippet inv
 	EventHandler temp = ${1:MyEvent};
-	if (${2:temp} != null){
+	if (${2:temp} != null) {
 		$2();
 	}
 # lock
 snippet lock
-    lock (${1:this}){
-        ${0:}
+    lock (${1:this}) {
+        ${0}
     }
 # namespace
 snippet namespace
-    namespace ${1:MyNamespace}{
-        ${0:}
+    namespace ${1:MyNamespace} {
+        ${0}
     }
 # property
 snippet prop
-    public ${1:int} ${2:MyProperty} { get; set;}
+    public ${1:int} ${2:MyProperty} { get; set; }
 snippet propf
     private ${1:int} ${2:myVar};
 
-    public $1 ${3:MyProperty}{
-        get { return $2;}
-        set { $2 = value;}
+    public $1 ${3:MyProperty} {
+        get { return $2; }
+        set { $2 = value; }
     }
 snippet propg
     public ${1:int} ${2:MyProperty} { get; private set; }
 # switch    
 snippet switch
-    switch (${1:switch_on}){
+    switch (${1:switch_on}) {
         ${0}
         default:
     }
 # try
 snippet try
-    try{
+    try {
         ${0}
     }
-    catch (${1:System.Exception}){
+    catch (${1:System.Exception}) {
         throw;
     }
 snippet tryf
-    try{
+    try {
         ${0}
     }
-    finally{
+    finally {
         ${1}
     }
 # using
 snippet usi
-    using(${1:resource}){
+    using(${1:resource}) {
         ${0}
     }
 

From d37bec772a0e85da1cb7f6de13bc26539de0833c Mon Sep 17 00:00:00 2001
From: Sathors <Sathors@users.noreply.github.com>
Date: Wed, 1 Apr 2015 10:13:53 -0500
Subject: [PATCH 0617/1587] defs snippet name clash

In UltiSnips/python.snippets defs is used to define a staticmethod, in snippets/python.snippets defs is used to define a method.

defs to define a method is not a good name, defm would be better.
---
 snippets/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 6953da9e9..f30add306 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -47,7 +47,7 @@ snippet deff
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
 		${0}
 # New Method
-snippet defs
+snippet defm
 	def ${1:mname}(self, ${2:arg}):
 		${0}
 # New Property

From 061f32a08a472e9aef78ce7c5af6f8f50385a065 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 3 Apr 2015 11:38:47 +0100
Subject: [PATCH 0618/1587] Eelixir if, ife, for

---
 UltiSnips/eelixir.snippets |  6 ++++++
 snippets/eelixir.snippets  | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/UltiSnips/eelixir.snippets b/UltiSnips/eelixir.snippets
index 040077fa0..72fb7ceee 100644
--- a/UltiSnips/eelixir.snippets
+++ b/UltiSnips/eelixir.snippets
@@ -14,6 +14,12 @@ snippet end "<% end %>" w
 <% end %>
 endsnippet
 
+snippet for
+<%= for ${1:item} <- ${2:$1s} ${3:@conn} do %>
+	$0
+<% end %>
+endsnippet
+
 snippet ft "form_tag" w
 <%= form_tag(${1:"${2:/users}"}, method: ${3::post}) %>
 	$0
diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index be7ce011c..fd76d1697 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -7,6 +7,23 @@ snippet =
 snippet end
 	<% end %>
 
+snippet for
+	<%= for ${1:item} <- ${2:items} ${3:@conn} do %>
+		${0}
+	<% end %>
+
+snippet if
+	<%= if ${1} do %>
+		${0}
+	<% end %>
+
+snippet ife
+	<%= if ${1} do %>
+		${2}
+	<%= else %>
+		${0}
+	<% end %>
+
 snippet ft
 	<%= form_tag(${1:"/users"}, method: ${2::post}) %>
 		${0}

From 9acfff5a6199d855fe857e9d5d3a70e93d23a28b Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 5 Apr 2015 11:40:05 +0100
Subject: [PATCH 0619/1587] Elixir for comprehension snippets

---
 snippets/elixir.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 8fc710cad..30ed557a1 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -40,6 +40,14 @@ snippet case
 		${2} ->
 			${0}
 	end
+snippet for
+	for ${1:item} <- ${2:items} do
+		${0}
+	end
+snippet fori
+	for ${1:item} <- ${2:items}, into: ${3} do
+		${0}
+	end
 snippet df
 	def ${1:name}, do: ${2}
 snippet def

From 6915c69d94d5c9fb73db4f9a30be8c240c23591b Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Thu, 9 Apr 2015 01:47:46 +0200
Subject: [PATCH 0620/1587] Update snippet for laravel Framework

---
 UltiSnips/php_laravel.snippets | 81 +++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
index 30f3f3691..8b3396279 100644
--- a/UltiSnips/php_laravel.snippets
+++ b/UltiSnips/php_laravel.snippets
@@ -1,15 +1,14 @@
 #resource controller
 snippet l_rsc "Laravel resource controller" b
 /*!
- * \class       ${1:`!v expand('%:t:r')`}
+ * \class       $1
  *
- * \author      ${2:`!v g:snips_author`}
+ * \author      ${3:`!v g:snips_author`}
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-class $1 extends ${3: BaseController} {
+class ${1:`!v expand('%:t:r')`} extends ${2: BaseController} {
     function __construct() {
-        ${4}
     }
     
     public function index() {
@@ -38,18 +37,18 @@ endsnippet
 #service service provider
 snippet l_ssp "Laravel service provider for service" b
 /*!
- * \namespace   ${1:Services}
- * \class       ${2:`!v expand('%:t:r')`}
+ * \namespace   $1
+ * \class       $2
  *
  * \author      ${3:`!v g:snips_author`}
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-namespace $1;
+namespace ${1:Services};
 
 use Illuminate\Support\ServiceProvider;
 
-class $2 extends ServiceProvider {
+class ${2:`!v expand('%:t:r')`} extends ServiceProvider {
     
     public function register() {
         $this->app->bind('${4}Service', function ($app) {
@@ -64,20 +63,20 @@ endsnippet
 #repository service provider
 snippet l_rsp "Laravel service provider for repository" b
 /*!
- * \namespace   ${2:Repositories\\${1:}}
- * \class       ${3:`!v expand('%:t:r')`}
+ * \namespace   $2
+ * \class       $3
  *
  * \author      ${4:`!v g:snips_author`}
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-namespace $2;
+namespace ${2:Repositories\\${1:}};
 
 use Entities\\$1;
 use $2\\$1Repository;
 use Illuminate\Support\ServiceProvider;
 
-class $3 extends ServiceProvider {
+class ${3:`!v expand('%:t:r')`} extends ServiceProvider {
     /*!
      * \var     defer
      * \brief   Defer service
@@ -102,16 +101,16 @@ endsnippet
 #model
 snippet l_md "Laravel simple model" b
 /*!
- * \namespace   ${1:Entities}
- * \class       ${2:`!v expand('%:t:r')`}
+ * \namespace   $1
+ * \class       $2
  *
  * \author      ${3:`!v g:snips_author`}
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-namespace $1;
+namespace ${1:Entities};
 
-class $2 extends \Eloquent {
+class ${2:`!v expand('%:t:r')`} extends \Eloquent {
     protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
 
     public $timestamps = ${5:false};
@@ -125,19 +124,19 @@ endsnippet
 #abstract repository
 snippet l_ar "Laravel abstract Repository" b
 /*!
- * \namespace   ${1:Repositories}
- * \class       ${2:`!v expand('%:t:r')`}
- * \implements  ${3:BaseRepositoryInterface}
+ * \namespace   $1
+ * \class       $2
+ * \implements  $3
  *
  * \author      ${4:`!v g:snips_author`}
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-namespace $1;
+namespace ${1:Repositories};
 
 use Illuminate\Database\Eloquent\Model;
 
-abstract class $2 implements $3 {
+abstract class ${2:`!v expand('%:t:r')`} implements ${3:BaseRepositoryInterface} {
     protected $model;
 
     /*!
@@ -191,17 +190,17 @@ endsnippet
 #repository
 snippet l_r "Laravel Repository" b
 /*!
- * \namespace   ${1:Repositories\\${2}}
- * \class       ${3:`!v expand('%:t:r')`}
- * \implements  ${4:$3RepositoryInterface}
+ * \namespace   $1
+ * \class       $3
+ * \implements  $4
  *
  * \author      ${5:`!v g:snips_author`}
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-namespace $1;
+namespace ${1:Repositories\\${2}};
 
-class $3 extends \\${6} implements $4 {
+class ${3:`!v expand('%:t:r')`} extends \\${6} implements ${4:$3RepositoryInterface} {
     ${7}
 }
 endsnippet
@@ -209,25 +208,25 @@ endsnippet
 #service
 snippet l_s "Laravel Service" b
 /*!
- * \namespace   ${1:Services}
- * \class       ${2:`!v expand('%:t:r')`}
+ * \namespace   $1
+ * \class       $2
  *
- * \author      ${3:`!v g:snips_author`}
+ * \author      ${6:`!v g:snips_author`}
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-namespace $1;
+namespace Services\\${1};
 
-use ${4:Repositories\\${5:Interface}};
+use ${3:Repositories\\${4:Interface}};
 
-class $2 {
-    protected $${6:repo};
+class ${2:`!v expand('%:t:r')`} {
+    protected $${5:repo};
     
     /*!
      * \fn      __construct
      */
-    public function __construct($5 $repo) {
-        $this->$6 = $repo;
+    public function __construct($4 $repo) {
+        $this->$5 = $repo;
     }
 }
 endsnippet
@@ -235,23 +234,23 @@ endsnippet
 #facade
 snippet l_f "Laravel Facade" b
 /*!
- * \namespace   ${1:Services}
- * \class       ${2:`!v expand('%:t:r')`}
+ * \namespace   $1
+ * \class       $2
  *
- * \author      ${3:`!v g:snips_author`}
+ * \author      ${5:`!v g:snips_author`}
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-namespace $1;
+namespace ${1:Services};
 
 use \Illuminate\Support\Facades\Facade;
 
-class $2 extends Facade {
+class ${2:`!v expand('%:t:r')`} extends Facade {
     /*!
      * \fn          getFacadeAccessor
      *
      * \return      string
      */
-    protected static function getFacadeAccessor() { return '${5:${4}Service}'; }
+    protected static function getFacadeAccessor() { return '${4:${3}Service}'; }
 }
 endsnippet

From e5e94eb42c355433c494858e58540f64111dfa7d Mon Sep 17 00:00:00 2001
From: Corentin Peuvrel <corentin.peuvrel@gmail.com>
Date: Fri, 10 Apr 2015 13:47:46 +0200
Subject: [PATCH 0621/1587] Add snippet base for basic C Makefile

---
 snippets/make.snippets | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index 121e6238c..ec131ba24 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -1,3 +1,23 @@
+# base
+snippet base
+	.PHONY: clean, mrproper
+	CC = gcc
+	CFLAGS = -g -Wall
+
+	all : $1
+
+	%.o : %.c
+		$(CC) $(CFLAGS) -c -o $@ $<
+	
+	${1:out} : $1.o
+		$(CC) $(CFLAGS) -o $@ $+
+
+	clean :
+		rm -f *.o core.*
+
+	mrproper : clean
+		rm -f $1
+# ifeq
 snippet ifeq
 	ifeq (${1:cond0},${2:cond1})
 		${0}

From 61ec4998443f23051b332962f8017161b47becb6 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 10 Apr 2015 19:00:19 +0100
Subject: [PATCH 0622/1587] Make: Add debug print snippet

---
 snippets/make.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index 121e6238c..87464c1d2 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -1,3 +1,5 @@
+snippet print
+	print-%: ; @echo $*=$($*)
 snippet ifeq
 	ifeq (${1:cond0},${2:cond1})
 		${0}

From 371110a991a550da519233743e9759fd761fd6af Mon Sep 17 00:00:00 2001
From: Corentin Peuvrel <corentin.peuvrel@gmail.com>
Date: Sat, 11 Apr 2015 00:16:34 +0200
Subject: [PATCH 0623/1587] Add snippet 'add' in Makefile (new binary)

It adds the rule for a new binary (from a source file with the same name
as the binary, but with a ".c" extension)
---
 snippets/make.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index ec131ba24..ece9b1952 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -17,6 +17,11 @@ snippet base
 
 	mrproper : clean
 		rm -f $1
+# add
+snippet add
+	${1:out} : $1.o
+		$(CC) $(CFLAGS) -o $@ $+
+	
 # ifeq
 snippet ifeq
 	ifeq (${1:cond0},${2:cond1})

From 5850ea9b21c7ed5a69b9e0d994518052d140a282 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 13 Apr 2015 15:55:44 +0200
Subject: [PATCH 0624/1587] python: docstring: do not add a newline after '"""'

Ref: https://www.python.org/dev/peps/pep-0257/#multi-line-docstrings
---
 snippets/python.snippets | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index f30add306..ea5f2c98f 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -148,8 +148,7 @@ snippet pudb
 snippet pprint
 	import pprint; pprint.pprint(${1})
 snippet "
-	"""
-	${0:doc}
+	"""${0:doc}
 	"""
 # assertions
 snippet a=
@@ -200,8 +199,7 @@ snippet lc
 snippet li
 	logger.info(${0:msg})
 snippet epydoc
-	"""
-	${1:Description}
+	"""${1:Description}
 
 	@param ${2:param}: ${3: Description}
 	@type  $2: ${4: Type}

From ba7ab97da5bf3d7385abdb399e153a425777c678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?=
 =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= <ciro.santilli@gmail.com>
Date: Mon, 13 Apr 2015 23:56:04 +0200
Subject: [PATCH 0625/1587] java: prinlna to print array

---
 snippets/java.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index 8971b3d68..e40bbf523 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -226,6 +226,8 @@ snippet printf
 	System.out.printf("${1:Message}", ${0:args});
 snippet println
 	System.out.println(${0});
+snippet printlna
+	System.out.println(Arrays.toString(${0}));
 ##
 ## Render Methods
 snippet ren

From d789b0abef59b16699c46b2db5eee77f4cc39d55 Mon Sep 17 00:00:00 2001
From: Gabriel Chavez <gabriel@chavezgu.com>
Date: Tue, 14 Apr 2015 11:17:25 +0300
Subject: [PATCH 0626/1587] Change for, if, else, and struct to K&R style.

---
 UltiSnips/c.snippets | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 618bfe3d8..c621a3669 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -46,15 +46,13 @@ int main(int argc, char *argv[])
 endsnippet
 
 snippet for "for loop (for)"
-for (${2:i} = 0; $2 < ${1:count}; ${3:++$2})
-{
+for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
 	${VISUAL}${0}
 }
 endsnippet
 
 snippet fori "for int loop (fori)"
-for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
-{
+for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
 	${VISUAL}${0}
 }
 endsnippet
@@ -100,8 +98,7 @@ fprintf(${1:stderr}, "${2:%s}\n"${2/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$3${2/([^%]|%
 endsnippet
 
 snippet if "if .. (if)"
-if (${1:/* condition */})
-{
+if (${1:/* condition */}) {
 	${VISUAL}${0}
 }
 endsnippet
@@ -119,12 +116,9 @@ else if (${1:/* condition */}) {
 endsnippet
 
 snippet ife "if .. else (ife)"
-if (${1:/* condition */})
-{
+if (${1:/* condition */}) {
 	${2}
-}
-else
-{
+} else {
 	${3:/* else */}
 }
 endsnippet
@@ -134,8 +128,7 @@ printf("${1:%s}\n"${1/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$2${1/([^%]|%%)*(%.)?.*/(?2
 endsnippet
 
 snippet st "struct"
-struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`}
-{
+struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
 	${0:/* data */}
 };
 endsnippet

From fb297da38e87d8dc3213d58d0e523e8046454bb6 Mon Sep 17 00:00:00 2001
From: Corentin Peuvrel <corentin.peuvrel@gmail.com>
Date: Thu, 16 Apr 2015 18:55:07 +0200
Subject: [PATCH 0627/1587] Remove space between rule and colon in make

---
 snippets/make.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index 2246bd1d9..8b7cb01b2 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -4,22 +4,22 @@ snippet base
 	CC = gcc
 	CFLAGS = -g -Wall
 
-	all : $1
+	all: $1
 
-	%.o : %.c
+	%.o: %.c
 		$(CC) $(CFLAGS) -c -o $@ $<
 	
-	${1:out} : $1.o
+	${1:out}: $1.o
 		$(CC) $(CFLAGS) -o $@ $+
 
-	clean :
+	clean:
 		rm -f *.o core.*
 
-	mrproper : clean
+	mrproper: clean
 		rm -f $1
 # add
 snippet add
-	${1:out} : $1.o
+	${1:out}: $1.o
 		$(CC) $(CFLAGS) -o $@ $+
 # print
 snippet print

From 0fa2518a602029757d8628af21a6bbe77c5919a9 Mon Sep 17 00:00:00 2001
From: Claudio Maradonna <claudiom@keyson.it>
Date: Fri, 17 Apr 2015 20:00:16 +0200
Subject: [PATCH 0628/1587] New snippet for laravel(Snipmate). Small fix in
 laravel snippet(Ultisnips)

---
 UltiSnips/php_laravel.snippets |   4 +-
 snippets/laravel.snippets      | 248 +++++++++++++++++++++++++++++++++
 2 files changed, 250 insertions(+), 2 deletions(-)
 create mode 100644 snippets/laravel.snippets

diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php_laravel.snippets
index 8b3396279..3ad26c632 100644
--- a/UltiSnips/php_laravel.snippets
+++ b/UltiSnips/php_laravel.snippets
@@ -7,7 +7,7 @@ snippet l_rsc "Laravel resource controller" b
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-class ${1:`!v expand('%:t:r')`} extends ${2: BaseController} {
+class ${1:`!v expand('%:t:r')`} extends ${2:BaseController} {
     function __construct() {
     }
     
@@ -17,7 +17,7 @@ class ${1:`!v expand('%:t:r')`} extends ${2: BaseController} {
     public function create() {
     }
     
-    public function store($id) {
+    public function store() {
     }
     
     public function show($id) {
diff --git a/snippets/laravel.snippets b/snippets/laravel.snippets
new file mode 100644
index 000000000..c71a6e5be
--- /dev/null
+++ b/snippets/laravel.snippets
@@ -0,0 +1,248 @@
+#resource controller
+snippet l_rsc
+/*!
+ * \class       $1
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+class ${1:`!v expand('%:t:r')`} extends ${2:BaseController} {
+    function __construct() {
+    }
+    
+    public function index() {
+    }
+    
+    public function create() {
+    }
+    
+    public function store() {
+    }
+    
+    public function show($id) {
+    }
+    
+    public function edit($id) {
+    }
+    
+    public function update($id) {
+    }
+    
+    public function destroy($id) {
+    }
+}
+
+#service service provider
+snippet l_ssp
+/*!
+ * \namespace   $1
+ * \class       $2
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${1:Services};
+
+use Illuminate\Support\ServiceProvider;
+
+class ${2:`!v expand('%:t:r')`} extends ServiceProvider {
+    
+    public function register() {
+        $this->app->bind('${4}Service', function ($app) {
+            return new ${5}(
+                $app->make('Repositories\\${6}Interface')
+            );
+        });
+    }
+}
+
+#repository service provider
+snippet l_rsp
+/*!
+ * \namespace   $2
+ * \class       $3
+ *
+ * \author      ${4:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${2:Repositories\\${1:}};
+
+use Entities\\$1;
+use $2\\$1Repository;
+use Illuminate\Support\ServiceProvider;
+
+class ${3:`!v expand('%:t:r')`} extends ServiceProvider {
+    /*!
+     * \var     defer
+     * \brief   Defer service
+     */
+    protected $defer = ${5:true};
+
+    public function register() {
+        $this->app->bind('$2\\$1Interface', function($app) {
+            return new $1Repository(new $1());
+        });
+    }
+
+    /*!
+     * \brief   If $defer == true need this fn
+     */ 
+    public function provides() {
+        return ['$2\\$1Interface'];
+    }
+}
+
+#model
+snippet l_md
+/*!
+ * \namespace   $1
+ * \class       $2
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${1:Entities};
+
+class ${2:`!v expand('%:t:r')`} extends \Eloquent {
+    protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
+
+    public $timestamps = ${5:false};
+
+    protected $hidden  = array(${6});
+
+    protected $guarded = array(${7:'id'});
+}
+
+#abstract repository
+snippet l_ar
+/*!
+ * \namespace   $1
+ * \class       $2
+ * \implements  $3
+ *
+ * \author      ${4:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${1:Repositories};
+
+use Illuminate\Database\Eloquent\Model;
+
+abstract class ${2:`!v expand('%:t:r')`} implements ${3:BaseRepositoryInterface} {
+    protected $model;
+
+    /*!
+     * \fn      __construct
+     *
+     * \brief   Take the model
+     */
+
+    public function __construct(Model $model) {
+        $this->model = $model;
+    }
+
+    /*!
+     * \fn      all
+     *
+     * \return  Illuminate\Database\Eloquent\Collection
+     */
+    public function all($columns = array('*')) {
+        return $this->model->all()->toArray();
+    }
+
+    /*!
+     * \fn      create
+     *
+     * \return  Illuminate\Database\Eloquent\Model
+     */
+    public function create(array $attributes) {
+        return $this->model->create($attributes);
+    }
+
+    /*!
+     * \fn      destroy
+     *
+     * \return  int
+     */
+    public function destroy($ids) {
+        return $this->model->destroy($ids);
+    }
+
+    /*!
+     * \fn      find
+     *
+     * \return  mixed
+     */
+    public function find($id, $columns = array('*')) {
+        return $this->model->find($id, $columns);
+    }
+}
+
+#repository
+snippet l_r
+/*!
+ * \namespace   $1
+ * \class       $3
+ * \implements  $4
+ *
+ * \author      ${5:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${1:Repositories\\${2}};
+
+class ${3:`!v expand('%:t:r')`} extends \\${6} implements ${4:$3RepositoryInterface} {
+    ${7}
+}
+
+#service
+snippet l_s
+/*!
+ * \namespace   $1
+ * \class       $2
+ *
+ * \author      ${6:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace Services\\${1};
+
+use ${3:Repositories\\${4:Interface}};
+
+class ${2:`!v expand('%:t:r')`} {
+    protected $${5:repo};
+    
+    /*!
+     * \fn      __construct
+     */
+    public function __construct($4 $repo) {
+        $this->$5 = $repo;
+    }
+}
+
+#facade
+snippet l_f
+/*!
+ * \namespace   $1
+ * \class       $2
+ *
+ * \author      ${5:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${1:Services};
+
+use \Illuminate\Support\Facades\Facade;
+
+class ${2:`!v expand('%:t:r')`} extends Facade {
+    /*!
+     * \fn          getFacadeAccessor
+     *
+     * \return      string
+     */
+    protected static function getFacadeAccessor() { return '${4:${3}Service}'; }
+}

From 33162739e60e7a813152881adc4709c0278a611d Mon Sep 17 00:00:00 2001
From: Corentin Peuvrel <corentin.peuvrel@gmail.com>
Date: Wed, 22 Apr 2015 22:29:14 +0200
Subject: [PATCH 0629/1587] Add a space after ifeq comma

---
 snippets/make.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index 8b7cb01b2..8367b8fe6 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -26,6 +26,6 @@ snippet print
 	print-%: ; @echo $*=$($*)
 # ifeq
 snippet ifeq
-	ifeq (${1:cond0},${2:cond1})
+	ifeq (${1:cond0}, ${2:cond1})
 		${0}
 	endif

From f41ab9d4448fb14015324552433989fb8470b41a Mon Sep 17 00:00:00 2001
From: Chad Paradis <cparadis6191@users.noreply.github.com>
Date: Wed, 22 Apr 2015 20:45:45 -0400
Subject: [PATCH 0630/1587] Changed style for c snippets

Moved braces to same line for main and fun snippets.
---
 UltiSnips/c.snippets | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index c621a3669..8a0cba29b 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -38,8 +38,7 @@ $0
 endsnippet
 
 snippet main "main() (main)"
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
 	${VISUAL}${0}
 	return 0;
 }
@@ -134,8 +133,7 @@ struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
 endsnippet
 
 snippet fun "function" b
-${1:void} ${2:function_name}(${3})
-{
+${1:void} ${2:function_name}(${3}) {
 	${VISUAL}${0}
 }
 endsnippet

From 6da49bb38b83403bf1a7f6e040ca476c6a4169f3 Mon Sep 17 00:00:00 2001
From: rtorralba <rtorralba@nrs-group.com>
Date: Thu, 23 Apr 2015 17:04:57 +0200
Subject: [PATCH 0631/1587] fixed $this->table attribute access

---
 snippets/codeigniter.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/codeigniter.snippets b/snippets/codeigniter.snippets
index 0fabcc579..798805e8c 100644
--- a/snippets/codeigniter.snippets
+++ b/snippets/codeigniter.snippets
@@ -44,17 +44,17 @@ snippet ci_model_complet
 
 		public function getRows()
 		{
-			return $this->db->get($table)->result();
+			return $this->db->get($this->table)->result();
 		}
 
 		public function getRow($id)
 		{
-			return $this->db->get_where($table, array('id', $id))->result();
+			return $this->db->get_where($this->table, array('id', $id))->result();
 		}
 
 		public function insert($data)
 		{
-			if($this->db->insert($table, $data))
+			if($this->db->insert($this->table, $data))
 				return true;
 			else
 				return false;
@@ -62,7 +62,7 @@ snippet ci_model_complet
 
 		public function update($id, $data)
 		{
-			if($this->db->where('id', $id)->update($table, $data))
+			if($this->db->where('id', $id)->update($this->table, $data))
 				return true;
 			else
 				return false;

From 3ca0742a2a1ef105797b150935a02dc2a05dc3ff Mon Sep 17 00:00:00 2001
From: rtorralba <rtorralba@nrs-group.com>
Date: Thu, 23 Apr 2015 17:11:59 +0200
Subject: [PATCH 0632/1587] removed comments

---
 snippets/codeigniter.snippets | 47 -----------------------------------
 1 file changed, 47 deletions(-)

diff --git a/snippets/codeigniter.snippets b/snippets/codeigniter.snippets
index 1564d4ef1..efd76201c 100644
--- a/snippets/codeigniter.snippets
+++ b/snippets/codeigniter.snippets
@@ -42,14 +42,6 @@ snippet ci_model_crudl
 			${3:// code...}
 		}
 
-		// public create(data) {{{
-		/**
-		 * create
-		 *
-		 * @param mixed $data
-		 * @access public
-		 * @return boolean
-		 */
 		public function create($data)
 		{
 			if($this->db->insert($table, $data))
@@ -57,31 +49,12 @@ snippet ci_model_crudl
 			else
 				return false;
 		}
-		// }}}
 
-		// public read(id) {{{
-		/**
-		 * read
-		 *
-		 * @param int $id
-		 * @access public
-		 * @return boolean
-		 */
 		public function read($id)
 		{
 			return $this->db->get_where($this->table, array('id', $id))->result();
 		}
-		// }}}
 
-		// public update(id,data) {{{
-		/**
-		 * update
-		 *
-		 * @param int $id
-		 * @param mixed $data
-		 * @access public
-		 * @return boolean
-		 */
 		public function update($id, $data)
 		{
 			if($this->db->update($table, $data, array('id' => $id)))
@@ -89,16 +62,7 @@ snippet ci_model_crudl
 			else
 				return false;
 		}
-		// }}}
 
-		// public delete(id) {{{
-		/**
-		 * delete
-		 *
-		 * @param mixed $id (int o array of int)
-		 * @access public
-		 * @return boolean
-		 */
 		public function delete($id)
 		{
 			if(is_array($id))
@@ -116,24 +80,13 @@ snippet ci_model_crudl
 					return false;
 			}
 		}
-		// }}}
 
-		// public listRows(limit=null,offset=0) {{{
-		/**
-		 * listRows
-		 *
-		 * @param int $limit
-		 * @param int $offset
-		 * @access public
-		 * @return boolean
-		 */
 		public function listRows($limit = null, $offset = 0)
 		{
 			if(!is_null($limit))
 				$this->db->limit($limit, $offset);
 			return $this->db->get($table)->result();
 		}
-		// }}}
 	}
 # Load view
 snippet ci_load-view

From 570ba25eea1b5d349cc33ca916e98e8667f0bd5a Mon Sep 17 00:00:00 2001
From: Louis Pilfold <lpil@users.noreply.github.com>
Date: Sun, 26 Apr 2015 16:30:51 +0100
Subject: [PATCH 0633/1587] Revert "Changed style for c snippets"

---
 UltiSnips/c.snippets | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 8a0cba29b..c621a3669 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -38,7 +38,8 @@ $0
 endsnippet
 
 snippet main "main() (main)"
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
 	${VISUAL}${0}
 	return 0;
 }
@@ -133,7 +134,8 @@ struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
 endsnippet
 
 snippet fun "function" b
-${1:void} ${2:function_name}(${3}) {
+${1:void} ${2:function_name}(${3})
+{
 	${VISUAL}${0}
 }
 endsnippet

From 73f22df5ca68739da372c3f0c89bab53205204fe Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 26 Apr 2015 19:44:26 +0100
Subject: [PATCH 0634/1587] C: Remove some duplication

---
 UltiSnips/c.snippets | 20 --------------------
 snippets/c.snippets  | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index c621a3669..5c4299c6d 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -97,32 +97,12 @@ snippet fprintf "fprintf ..."
 fprintf(${1:stderr}, "${2:%s}\n"${2/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$3${2/([^%]|%%)*(%.)?.*/(?2:\);)/}
 endsnippet
 
-snippet if "if .. (if)"
-if (${1:/* condition */}) {
-	${VISUAL}${0}
-}
-endsnippet
-
-snippet el "else .. (else)"
-else {
-	${VISUAL}${0}
-}
-endsnippet
-
 snippet eli "else if .. (eli)"
 else if (${1:/* condition */}) {
 	${VISUAL}${0}
 }
 endsnippet
 
-snippet ife "if .. else (ife)"
-if (${1:/* condition */}) {
-	${2}
-} else {
-	${3:/* else */}
-}
-endsnippet
-
 snippet printf "printf .. (printf)"
 printf("${1:%s}\n"${1/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$2${1/([^%]|%%)*(%.)?.*/(?2:\);)/}
 endsnippet
diff --git a/snippets/c.snippets b/snippets/c.snippets
index 96e19a0ab..aa7ce847f 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -52,22 +52,28 @@ snippet once
 ## Control Statements
 # if
 snippet if
-	if (${1:/* condition */}) {
+	if (${1:true}) {
+		${0}
+	}
+snippet ife
+	if (${1:true}) {
 		${2}
+	} else {
+		${0}
 	}
 # else
 snippet el
 	else {
-		${1}
+		${0}
 	}
 # else if
 snippet elif
-	else if (${1:/* condition */}) {
-		${2}
+	else if (${1:true}) {
+		${0}
 	}
 # ifi
 snippet ifi
-	if (${1:/* condition */}) ${2};
+	if (${1:true}) ${0};
 # ternary
 snippet t
 	${1:/* condition */} ? ${2:a} : ${3:b}

From e6ff9976a063d01a8b8b4c39109e93d795b3c875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20N=C3=B8rgaard?= <benjamin@webtoad.dk>
Date: Mon, 27 Apr 2015 12:34:58 +0200
Subject: [PATCH 0635/1587] Elixir: Improve indentation of rec snippet

---
 snippets/elixir.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 30ed557a1..8ca37912b 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -97,8 +97,8 @@ snippet mdoc
 	"""
 snippet rec
 	receive do
-	${1} ->
-		${0}
+		${1} ->
+			${0}
 	end
 snippet req
 	require ${0:module_name}

From 764e06d4a34d1a68534d4e2193d6a48cbaeb2844 Mon Sep 17 00:00:00 2001
From: rtorralba <rtorralba@nrs-group.com>
Date: Tue, 28 Apr 2015 17:23:45 +0200
Subject: [PATCH 0636/1587] Fixed ->table attribute access

---
 snippets/codeigniter.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/snippets/codeigniter.snippets b/snippets/codeigniter.snippets
index efd76201c..c38aa4dbd 100644
--- a/snippets/codeigniter.snippets
+++ b/snippets/codeigniter.snippets
@@ -44,7 +44,7 @@ snippet ci_model_crudl
 
 		public function create($data)
 		{
-			if($this->db->insert($table, $data))
+			if($this->db->insert($this->table, $data))
 				return true;
 			else
 				return false;
@@ -57,7 +57,7 @@ snippet ci_model_crudl
 
 		public function update($id, $data)
 		{
-			if($this->db->update($table, $data, array('id' => $id)))
+			if($this->db->update($this->table, $data, array('id' => $id)))
 				return true;
 			else
 				return false;
@@ -69,12 +69,12 @@ snippet ci_model_crudl
 			{
 				$this->db->trans_start();
 				foreach($id as $elem)
-					$this->db->delete($table, array('id' => $elem));
+					$this->db->delete($this->table, array('id' => $elem));
 				$this->db->trans_complete();
 			}
 			else
 			{
-				if($this->db->delete($table, array('id' => $id)))
+				if($this->db->delete($this->table, array('id' => $id)))
 					return true;
 				else
 					return false;
@@ -85,7 +85,7 @@ snippet ci_model_crudl
 		{
 			if(!is_null($limit))
 				$this->db->limit($limit, $offset);
-			return $this->db->get($table)->result();
+			return $this->db->get($this->table)->result();
 		}
 	}
 # Load view

From 2099d74f5069af3e90d820e2bc8e1f254f64578c Mon Sep 17 00:00:00 2001
From: skv <skv-headless@yandex.ru>
Date: Sat, 2 May 2015 08:28:03 +0300
Subject: [PATCH 0637/1587] js debugger

---
 snippets/javascript/javascript.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 4113e9e62..4832815da 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -235,7 +235,8 @@ snippet qsa
 	${1:document}.querySelectorAll('${0:CSS selector}')
 
 # Debugging
-
+snippet de
+	debugger;
 # console.log
 snippet cl
 	console.log(${0});

From 1327c1ba54c8c367995b536b8cb7d8e7cc7c4c03 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 5 May 2015 16:57:16 +0100
Subject: [PATCH 0638/1587] Ruby: Remove some duplication

---
 UltiSnips/ruby.snippets | 12 ------------
 snippets/ruby.snippets  | 18 +++---------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index 6114cfaf8..b8a00922d 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -302,18 +302,6 @@ begin
 end while ${1:expression}
 endsnippet
 
-snippet "\b(r|attr)" "attr_reader :<attr_names>" r
-attr_reader :${0:attr_names}
-endsnippet
-
-snippet "\b(w|attr)" "attr_writer :<attr_names>" r
-attr_writer :${0:attr_names}
-endsnippet
-
-snippet "\b(rw|attr)" "attr_accessor :<attr_names>" r
-attr_accessor :${0:attr_names}
-endsnippet
-
 snippet begin "begin ... rescue ... end"
 begin
 	$1
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index c4bcc43d2..22878c31c 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -121,23 +121,17 @@ snippet cla class .. initialize .. end
 			${0}
 		end
 	end
-snippet cla class .. < ParentClass .. initialize .. end
+snippet cla< class .. < ParentClass .. initialize .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < ${2:ParentClass}
 		def initialize(${3:args})
 			${0}
 		end
 	end
-snippet cla ClassName = Struct .. do .. end
-	${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} = Struct.new(:${2:attr_names}) do
-		def ${3:method_name}
-			${0}
-		end
-	end
-snippet cla class BlankSlate .. initialize .. end
+snippet blankslate class BlankSlate .. initialize .. end
 	class ${0:BlankSlate}
 		instance_methods.each { |meth| undef_method(meth) unless meth =~ /\A__/ }
 	end
-snippet cla class << self .. end
+snippet claself class << self .. end
 	class << ${1:self}
 		${0}
 	end
@@ -152,12 +146,6 @@ snippet cla-
 	end
 snippet mod module .. end
 	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		${0}
-	end
-snippet mod module .. module_function .. end
-	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		module_function
-
 		${0}
 	end
 snippet mod module .. ClassMethods .. end

From cd34c3accbd7aa4c02eb3cb5bdfc95c76aba9fe0 Mon Sep 17 00:00:00 2001
From: Jacques Kvam <jacques@verdigris.co>
Date: Thu, 7 May 2015 16:04:52 -0700
Subject: [PATCH 0639/1587] add numpy style

---
 UltiSnips/python.snippets | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index af32c52b3..73c98fd46 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -35,6 +35,7 @@ NORMAL  = 0x1
 DOXYGEN = 0x2
 SPHINX  = 0x3
 GOOGLE  = 0x4
+NUMPY   = 0x5
 
 SINGLE_QUOTES = "'"
 DOUBLE_QUOTES = '"'
@@ -105,6 +106,7 @@ def get_style(snip):
 	if    style == "doxygen": return DOXYGEN
 	elif  style == "sphinx": return SPHINX
 	elif  style == "google": return GOOGLE
+	elif  style == "numpy": return NUMPY
 	else: return NORMAL
 
 
@@ -117,6 +119,8 @@ def format_arg(arg, style):
 		return ":%s: TODO" % arg
 	elif style == GOOGLE:
 		return "%s (TODO): TODO" % arg
+	elif style == NUMPY:
+		return "%s : TODO" % arg
 
 
 def format_return(style):
@@ -139,6 +143,8 @@ def write_docstring_args(args, snip):
 
 	if style == GOOGLE:
 		write_google_docstring_args(args, snip)
+	elif style == NUMPY:
+		write_numpy_docstring_args(args, snip)
 	else:
 		for arg in args:
 			snip += format_arg(arg, style)
@@ -165,6 +171,23 @@ def write_google_docstring_args(args, snip):
 		snip.rv += '\n' + snip.mkline('', indent='')
 
 
+def write_numpy_docstring_args(args, snip):
+	if args:
+		snip += "Parameters"
+		snip += "----------"
+
+	kwargs = [arg for arg in args if arg.is_kwarg()]
+	args = [arg for arg in args if not arg.is_kwarg()]
+
+	if args:
+		for arg in args:
+			snip += format_arg(arg, NUMPY)
+	if kwargs:
+		for kwarg in kwargs:
+			snip += format_arg(kwarg, NUMPY) + ', optional'
+	snip.rv += '\n' + snip.mkline('', indent='')
+
+
 def write_init_body(args, parents, snip):
 	parents = [p.strip() for p in parents.split(",")]
 	parents = [p for p in parents if p != 'object']
@@ -199,7 +222,13 @@ def write_function_docstring(t, snip):
 		write_docstring_args(args, snip)
 
 	style = get_style(snip)
-	snip += format_return(style)
+
+	if style == NUMPY:
+		snip += 'Returns'
+		snip += '-------'
+		snip += 'TODO'
+	else:
+		snip += format_return(style)
 	snip.rv += '\n' + snip.mkline('', indent='')
 	snip += triple_quotes(snip)
 

From aa05eda641f8152bfa7349f24cb67e12e479737d Mon Sep 17 00:00:00 2001
From: Gert <gert@gepe-biljarts.be>
Date: Sat, 16 May 2015 16:59:48 +0200
Subject: [PATCH 0640/1587] arduino

---
 snippets/arduino.snippets | 107 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 snippets/arduino.snippets

diff --git a/snippets/arduino.snippets b/snippets/arduino.snippets
new file mode 100644
index 000000000..2332544b9
--- /dev/null
+++ b/snippets/arduino.snippets
@@ -0,0 +1,107 @@
+snippet setup
+    void setup()
+    {
+        ${0}
+        Serial.begin(9600);
+    }
+
+snippet loop
+    void loop()
+    {
+        ${0}
+    }
+
+snippet inc
+    #include <${1}.h>
+
+# if
+snippet if
+	if (${1:/* condition */}) {
+		${2}
+	}
+# else
+snippet el
+	else {
+		${1}
+	}
+# else if
+snippet elif
+	else if (${1:/* condition */}) {
+		${2}
+	}
+# ifi
+snippet ifi
+	if (${1:/* condition */}) ${2};
+
+# switch
+snippet switch
+	switch (${1:/* variable */}) {
+		case ${2:/* variable case */}:
+			${3}
+			${4:break;}${5}
+		default:
+			${6}
+    }
+
+
+snippet case
+	case ${1:/* variable case */}:
+		${2}
+		${3:break;}
+
+# for
+snippet for
+	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
+		${4}
+	}
+# for (custom)
+snippet forr
+	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
+		${5}
+	}
+# while
+snippet wh
+	while (${1:/* condition */}) {
+		${2}
+	}
+# do... while
+snippet do
+	do {
+		${2}
+	} while (${1:/* condition */});
+##
+## Functions
+# function definition
+snippet fun
+	${1:void} ${2:function_name}(${3})
+	{
+		${4}
+	}
+
+## IO
+# pinMode OUTPUT
+snippet pinout
+    pinMode(${1}, OUTPUT);
+# pinMode INPUT
+snippet pinin
+    pinMode(${1}, INPUT);
+# digitalWrite HIGH
+snippet dwHigh
+    digitalWrite(${1}, HIGH);
+# digitalWrite LOW
+snippet dwLow
+    digitalWrite(${1}, LOW);
+# digitalRead
+snippet dr
+    digitalRead(${1});
+# serialRead
+snippet sr
+    serialRead();
+# serial.println
+snippet sp
+    serial.println(${1});
+
+
+# delay
+snippet dl
+    delay(${1});

From 8be99daa68442be0953800f1cda1d82cd63ffcd0 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 17 May 2015 19:55:08 +0100
Subject: [PATCH 0641/1587] Fix rust for snippets

---
 UltiSnips/rust.snippets | 2 +-
 snippets/rust.snippets  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index a27d6fafa..4a65d7725 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -59,7 +59,7 @@ mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
 endsnippet
 
 snippet for "for .. in .." b
-for ${1:i} in ${2:${3:0us}..${4:10}} {
+for ${1:i} in ${2} {
 	${VISUAL}${0}
 }
 endsnippet
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 77e513291..c273f5371 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -111,7 +111,7 @@ snippet while "while loop"
 		${0}
 	}
 snippet for "for ... in ... loop"
-	for ${1:i} in ${2:0u..10} {
+	for ${1:i} in ${2} {
 		${0}
 	}
 # TODO commenting

From 10f2e6ebcf28b8214ed7a02d989a5867f286eed0 Mon Sep 17 00:00:00 2001
From: Gert <switch87@users.noreply.github.com>
Date: Mon, 18 May 2015 16:44:24 +0200
Subject: [PATCH 0642/1587] tabs

---
 snippets/arduino.snippets | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/snippets/arduino.snippets b/snippets/arduino.snippets
index 2332544b9..717397c1e 100644
--- a/snippets/arduino.snippets
+++ b/snippets/arduino.snippets
@@ -1,18 +1,18 @@
 snippet setup
-    void setup()
-    {
-        ${0}
-        Serial.begin(9600);
-    }
+	void setup()
+	{
+		${0}
+		Serial.begin(9600);
+	}
 
 snippet loop
-    void loop()
-    {
-        ${0}
-    }
+	void loop()
+	{
+		${0}
+	}
 
 snippet inc
-    #include <${1}.h>
+	#include <${1}.h>
 
 # if
 snippet if
@@ -81,27 +81,27 @@ snippet fun
 ## IO
 # pinMode OUTPUT
 snippet pinout
-    pinMode(${1}, OUTPUT);
+	pinMode(${1}, OUTPUT);
 # pinMode INPUT
 snippet pinin
-    pinMode(${1}, INPUT);
+	pinMode(${1}, INPUT);
 # digitalWrite HIGH
 snippet dwHigh
-    digitalWrite(${1}, HIGH);
+	digitalWrite(${1}, HIGH);
 # digitalWrite LOW
 snippet dwLow
-    digitalWrite(${1}, LOW);
+	digitalWrite(${1}, LOW);
 # digitalRead
 snippet dr
-    digitalRead(${1});
+	digitalRead(${1});
 # serialRead
 snippet sr
-    serialRead();
+	serialRead();
 # serial.println
 snippet sp
-    serial.println(${1});
+	serial.println(${1});
 
 
 # delay
 snippet dl
-    delay(${1});
+	delay(${1});

From 84a4b197a8551b387567330d8bd0ba5e4384390c Mon Sep 17 00:00:00 2001
From: Ngo The Trung <ngothetrung@javelinbrowser.com>
Date: Sat, 23 May 2015 20:29:31 +0800
Subject: [PATCH 0643/1587] Fixed 'supervisor' snippet

---
 snippets/erlang.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index 2a0d1a4c3..18f1c6de5 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -103,8 +103,8 @@ snippet supervisor
 	    supervisor:start_link({local, ?SERVER}, ?MODULE, []).
 
 	init([]) ->
-	    Server = {${0:my_server}, {$2, start_link, []},
-	      permanent, 2000, worker, [$2]},
+	    Server = {${0:my_server}, {${2}, start_link, []},
+	      permanent, 2000, worker, [${2}]},
 	    Children = [Server],
 	    RestartStrategy = {one_for_one, 0, 1},
 	    {ok, {RestartStrategy, Children}}.

From 2c40fab0287ed39a3fadb4b93726f1ffc23f38d4 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 30 May 2015 18:33:27 +0100
Subject: [PATCH 0644/1587] Fix broken C sharp snippets

@switch87 broke these by intenting with spaces rather than tabs.

d956ce5
41c1148
77fcae8

Closes #585. Thanks @Chiel92 for the bug report.
---
 snippets/cs.snippets | 109 +++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 56 deletions(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index c1fe94f3f..40e9c8f9e 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -70,9 +70,9 @@ snippet simc
 		}
 	}
 snippet svm
-    ${1:public }static void Main(string[] args) {
-        ${0}
-    }
+	${1:public }static void Main(string[] args) {
+		${0}
+	}
 # if condition
 snippet if
 	if (${1:true}) {
@@ -391,30 +391,30 @@ snippet cw
 
 # equals override
 snippet eq
-        public override bool Equals(object obj) {
-            if (obj == null || GetType() != obj.GetType()) {
-                return false;
-            }
-            ${0:throw new NotImplementedException();}
-            return base.Equals(obj);
-        }
+	public override bool Equals(object obj) {
+		if (obj == null || GetType() != obj.GetType()) {
+			return false;
+		}
+		${0:throw new NotImplementedException();}
+		return base.Equals(obj);
+	}
 # exception 
 snippet exc
 	public class ${1:MyException} : ${2:Exception} {
-            public $1() { }
-            public $1(string message) : base(message) { }
-            public $1(string message, Exception inner) : base(message, inner) { }
-            protected $1(
-              System.Runtime.Serialization.SerializationInfo info,
-              System.Runtime.Serialization.StreamingContext context)
-                : base(info, context) { }
-        }
+		public $1() { }
+		public $1(string message) : base(message) { }
+		public $1(string message, Exception inner) : base(message, inner) { }
+		protected $1(
+			System.Runtime.Serialization.SerializationInfo info,
+			System.Runtime.Serialization.StreamingContext context)
+				: base(info, context) { }
+	}
 # indexer 
 snippet index
 	public ${1:object} this[${2:int} index] {
-            get { ${0} }
-            set { ${0} }
-        }
+		get { ${0} }
+		set { ${0} }
+	}
 # eventhandler 
 snippet inv
 	EventHandler temp = ${1:MyEvent};
@@ -423,51 +423,48 @@ snippet inv
 	}
 # lock
 snippet lock
-    lock (${1:this}) {
-        ${0}
-    }
+	lock (${1:this}) {
+		${0}
+	}
 # namespace
 snippet namespace
-    namespace ${1:MyNamespace} {
-        ${0}
-    }
+	namespace ${1:MyNamespace} {
+		${0}
+	}
 # property
 snippet prop
-    public ${1:int} ${2:MyProperty} { get; set; }
+	public ${1:int} ${2:MyProperty} { get; set; }
 snippet propf
-    private ${1:int} ${2:myVar};
-
-    public $1 ${3:MyProperty} {
-        get { return $2; }
-        set { $2 = value; }
-    }
+	private ${1:int} ${2:myVar};
+		public $1 ${3:MyProperty} {
+			get { return $2; }
+			set { $2 = value; }
+		}
 snippet propg
-    public ${1:int} ${2:MyProperty} { get; private set; }
+	public ${1:int} ${2:MyProperty} { get; private set; }
 # switch    
 snippet switch
-    switch (${1:switch_on}) {
-        ${0}
-        default:
-    }
+	switch (${1:switch_on}) {
+		${0}
+		default:
+	}
 # try
 snippet try
-    try {
-        ${0}
-    }
-    catch (${1:System.Exception}) {
-        throw;
-    }
+	try {
+			${0}
+	}
+	catch (${1:System.Exception}) {
+			throw;
+	}
 snippet tryf
-    try {
-        ${0}
-    }
-    finally {
-        ${1}
-    }
+	try {
+		${0}
+	}
+	finally {
+		${1}
+	}
 # using
 snippet usi
-    using(${1:resource}) {
-        ${0}
-    }
-
-
+	using(${1:resource}) {
+		${0}
+	}

From abdd0578517a032cf0ee5b384eede1c51dd32863 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 30 May 2015 19:54:33 +0100
Subject: [PATCH 0645/1587] Add test for incorrect indentation, add Travis CI

---
 .travis.yml |  8 ++++++++
 tests.sh    | 15 +++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 .travis.yml
 create mode 100755 tests.sh

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..74f279681
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: c
+sudo: false
+
+notifications:
+  email: false
+
+script:
+  - ./tests.sh
diff --git a/tests.sh b/tests.sh
new file mode 100755
index 000000000..33293c343
--- /dev/null
+++ b/tests.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+SPACED=$(grep -REn '^ .+' --include '*.snippets' snippets);
+
+if [[ -n SPACED ]]; then
+  echo These snippet lines are indented with spaces:;
+  echo;
+  echo "$SPACED";
+  echo;
+  echo Tests failed!
+  exit 1;
+fi
+
+echo Tests passed!
+exit 0;

From 0e9eff1bf36728b6423171f962a8d6e5de7a4621 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 31 May 2015 23:15:12 +0100
Subject: [PATCH 0646/1587] Fix arduino snippets

---
 snippets/arduino.snippets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/snippets/arduino.snippets b/snippets/arduino.snippets
index 717397c1e..77ee46fa4 100644
--- a/snippets/arduino.snippets
+++ b/snippets/arduino.snippets
@@ -41,8 +41,7 @@ snippet switch
 			${4:break;}${5}
 		default:
 			${6}
-    }
-
+	}
 
 snippet case
 	case ${1:/* variable case */}:

From 7aeba4cf57397d99a54e4c767b14936679de4b6a Mon Sep 17 00:00:00 2001
From: ToruIwashita <toru.iwashita@gmail.com>
Date: Wed, 3 Jun 2015 22:44:00 +0900
Subject: [PATCH 0647/1587] Add new snippets for rspec

---
 snippets/ruby.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 22878c31c..c999ba2c0 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -723,3 +723,11 @@ snippet is
 	it { should ${0} }
 snippet isn
 	it { should_not ${0} }
+snippet iexp
+  it { expect(${1:object}).${1} ${0} }
+snippet iexpb
+  it { expect { ${1:object} }.${1} ${0} }
+snippet iiexp
+  it { is_expected.to ${0} }
+snippet iiexpn
+  it { is_expected.not_to ${0} }

From 043a902c90d9f84d6d4c1c9ebc7adaf4e3683e72 Mon Sep 17 00:00:00 2001
From: Daeyun Shin <daeyun@daeyunshin.com>
Date: Fri, 5 Jun 2015 23:58:52 -0400
Subject: [PATCH 0648/1587] cpp extends c

---
 snippets/cpp.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index cdccf1eba..632f76f92 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -1,3 +1,5 @@
+extends c
+
 ## STL Collections
 # std::array
 snippet array

From d95d8e1999f99346eb70e923bd3c1f4c20f4d892 Mon Sep 17 00:00:00 2001
From: jake romer <jkrmr@users.noreply.github.com>
Date: Sun, 7 Jun 2015 12:12:37 -0400
Subject: [PATCH 0649/1587] Replace soft tabs with hard ones.

Conforms to the snippet syntax in the rest of the file.
Also resolves an error raised in UltiSnips referenced in https://github.com/SirVer/ultisnips/issues/233
---
 snippets/ruby.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index c999ba2c0..6b9d85d7c 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -724,10 +724,10 @@ snippet is
 snippet isn
 	it { should_not ${0} }
 snippet iexp
-  it { expect(${1:object}).${1} ${0} }
+	it { expect(${1:object}).${1} ${0} }
 snippet iexpb
-  it { expect { ${1:object} }.${1} ${0} }
+	it { expect { ${1:object} }.${1} ${0} }
 snippet iiexp
-  it { is_expected.to ${0} }
+	it { is_expected.to ${0} }
 snippet iiexpn
-  it { is_expected.not_to ${0} }
+	it { is_expected.not_to ${0} }

From fe844b6757b80ca584153de53dd06efa5073b768 Mon Sep 17 00:00:00 2001
From: Honza Pokorny <me@honza.ca>
Date: Mon, 8 Jun 2015 10:17:14 -0300
Subject: [PATCH 0650/1587] Add travis-ci badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a552082e3..f41606501 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 snipMate & UltiSnip Snippets
 ============================
 
+[![Build Status](https://travis-ci.org/honza/vim-snippets.svg)](https://travis-ci.org/honza/vim-snippets)
+
 This repository contains snippets files for various programming languages.
 
 It is community-maintained and many people have contributed snippet files and

From 0146195dbf1f8f17f6b5450e26ba30789602a54d Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 8 Jun 2015 15:16:01 +0100
Subject: [PATCH 0651/1587] Fix test & laravel snippets

---
 snippets/laravel.snippets | 446 +++++++++++++++++++-------------------
 tests.sh                  |   2 +-
 2 files changed, 221 insertions(+), 227 deletions(-)

diff --git a/snippets/laravel.snippets b/snippets/laravel.snippets
index c71a6e5be..e7435e3b9 100644
--- a/snippets/laravel.snippets
+++ b/snippets/laravel.snippets
@@ -1,248 +1,242 @@
 #resource controller
 snippet l_rsc
-/*!
- * \class       $1
- *
- * \author      ${3:`!v g:snips_author`}
- * \date        `!v strftime('%d-%m-%y')`
- */
-
-class ${1:`!v expand('%:t:r')`} extends ${2:BaseController} {
-    function __construct() {
-    }
-    
-    public function index() {
-    }
-    
-    public function create() {
-    }
-    
-    public function store() {
-    }
-    
-    public function show($id) {
-    }
-    
-    public function edit($id) {
-    }
-    
-    public function update($id) {
-    }
-    
-    public function destroy($id) {
-    }
-}
-
+	/*!
+	* \class       $1
+	*
+	* \author      ${3:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	class ${1:`!v expand('%:t:r')`} extends ${2:BaseController} {
+		function __construct() {
+		}
+		
+		public function index() {
+		}
+		
+		public function create() {
+		}
+		
+		public function store() {
+		}
+		
+		public function show($id) {
+		}
+		
+		public function edit($id) {
+		}
+		
+		public function update($id) {
+		}
+		
+		public function destroy($id) {
+		}
+	}
 #service service provider
 snippet l_ssp
-/*!
- * \namespace   $1
- * \class       $2
- *
- * \author      ${3:`!v g:snips_author`}
- * \date        `!v strftime('%d-%m-%y')`
- */
-
-namespace ${1:Services};
-
-use Illuminate\Support\ServiceProvider;
-
-class ${2:`!v expand('%:t:r')`} extends ServiceProvider {
-    
-    public function register() {
-        $this->app->bind('${4}Service', function ($app) {
-            return new ${5}(
-                $app->make('Repositories\\${6}Interface')
-            );
-        });
-    }
-}
-
+	/*!
+	* \namespace   $1
+	* \class       $2
+	*
+	* \author      ${3:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${1:Services};
+
+	use Illuminate\Support\ServiceProvider;
+
+	class ${2:`!v expand('%:t:r')`} extends ServiceProvider {
+		
+		public function register() {
+			$this->app->bind('${4}Service', function ($app) {
+				return new ${5}(
+					$app->make('Repositories\\${6}Interface')
+				);
+			});
+		}
+	}
 #repository service provider
 snippet l_rsp
-/*!
- * \namespace   $2
- * \class       $3
- *
- * \author      ${4:`!v g:snips_author`}
- * \date        `!v strftime('%d-%m-%y')`
- */
-
-namespace ${2:Repositories\\${1:}};
-
-use Entities\\$1;
-use $2\\$1Repository;
-use Illuminate\Support\ServiceProvider;
-
-class ${3:`!v expand('%:t:r')`} extends ServiceProvider {
-    /*!
-     * \var     defer
-     * \brief   Defer service
-     */
-    protected $defer = ${5:true};
-
-    public function register() {
-        $this->app->bind('$2\\$1Interface', function($app) {
-            return new $1Repository(new $1());
-        });
-    }
-
-    /*!
-     * \brief   If $defer == true need this fn
-     */ 
-    public function provides() {
-        return ['$2\\$1Interface'];
-    }
-}
-
+	/*!
+	* \namespace   $2
+	* \class       $3
+	*
+	* \author      ${4:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${2:Repositories\\${1:}};
+
+	use Entities\\$1;
+	use $2\\$1Repository;
+	use Illuminate\Support\ServiceProvider;
+
+	class ${3:`!v expand('%:t:r')`} extends ServiceProvider {
+		/*!
+		* \var     defer
+		* \brief   Defer service
+		*/
+		protected $defer = ${5:true};
+
+		public function register() {
+				$this->app->bind('$2\\$1Interface', function($app) {
+						return new $1Repository(new $1());
+				});
+		}
+
+		/*!
+		* \brief   If $defer == true need this fn
+		*/ 
+		public function provides() {
+				return ['$2\\$1Interface'];
+		}
+	}
 #model
 snippet l_md
-/*!
- * \namespace   $1
- * \class       $2
- *
- * \author      ${3:`!v g:snips_author`}
- * \date        `!v strftime('%d-%m-%y')`
- */
-
-namespace ${1:Entities};
+	/*!
+	* \namespace   $1
+	* \class       $2
+	*
+	* \author      ${3:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
 
-class ${2:`!v expand('%:t:r')`} extends \Eloquent {
-    protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
+	namespace ${1:Entities};
 
-    public $timestamps = ${5:false};
+	class ${2:`!v expand('%:t:r')`} extends \Eloquent {
+		protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
 
-    protected $hidden  = array(${6});
+		public $timestamps = ${5:false};
 
-    protected $guarded = array(${7:'id'});
-}
+		protected $hidden  = array(${6});
 
+		protected $guarded = array(${7:'id'});
+	}
 #abstract repository
 snippet l_ar
-/*!
- * \namespace   $1
- * \class       $2
- * \implements  $3
- *
- * \author      ${4:`!v g:snips_author`}
- * \date        `!v strftime('%d-%m-%y')`
- */
-
-namespace ${1:Repositories};
-
-use Illuminate\Database\Eloquent\Model;
-
-abstract class ${2:`!v expand('%:t:r')`} implements ${3:BaseRepositoryInterface} {
-    protected $model;
-
-    /*!
-     * \fn      __construct
-     *
-     * \brief   Take the model
-     */
-
-    public function __construct(Model $model) {
-        $this->model = $model;
-    }
-
-    /*!
-     * \fn      all
-     *
-     * \return  Illuminate\Database\Eloquent\Collection
-     */
-    public function all($columns = array('*')) {
-        return $this->model->all()->toArray();
-    }
-
-    /*!
-     * \fn      create
-     *
-     * \return  Illuminate\Database\Eloquent\Model
-     */
-    public function create(array $attributes) {
-        return $this->model->create($attributes);
-    }
-
-    /*!
-     * \fn      destroy
-     *
-     * \return  int
-     */
-    public function destroy($ids) {
-        return $this->model->destroy($ids);
-    }
-
-    /*!
-     * \fn      find
-     *
-     * \return  mixed
-     */
-    public function find($id, $columns = array('*')) {
-        return $this->model->find($id, $columns);
-    }
-}
+	/*!
+	* \namespace   $1
+	* \class       $2
+	* \implements  $3
+	*
+	* \author      ${4:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${1:Repositories};
+
+	use Illuminate\Database\Eloquent\Model;
+
+	abstract class ${2:`!v expand('%:t:r')`} implements ${3:BaseRepositoryInterface} {
+		protected $model;
+
+		/*!
+		* \fn      __construct
+		*
+		* \brief   Take the model
+		*/
+
+		public function __construct(Model $model) {
+				$this->model = $model;
+		}
+
+		/*!
+		* \fn      all
+		*
+		* \return  Illuminate\Database\Eloquent\Collection
+		*/
+		public function all($columns = array('*')) {
+				return $this->model->all()->toArray();
+		}
+
+		/*!
+		* \fn      create
+		*
+		* \return  Illuminate\Database\Eloquent\Model
+		*/
+		public function create(array $attributes) {
+				return $this->model->create($attributes);
+		}
+
+		/*!
+		* \fn      destroy
+		*
+		* \return  int
+		*/
+		public function destroy($ids) {
+				return $this->model->destroy($ids);
+		}
+
+		/*!
+		* \fn      find
+		*
+		* \return  mixed
+		*/
+		public function find($id, $columns = array('*')) {
+			return $this->model->find($id, $columns);
+		}
+	}
 
 #repository
 snippet l_r
-/*!
- * \namespace   $1
- * \class       $3
- * \implements  $4
- *
- * \author      ${5:`!v g:snips_author`}
- * \date        `!v strftime('%d-%m-%y')`
- */
-
-namespace ${1:Repositories\\${2}};
-
-class ${3:`!v expand('%:t:r')`} extends \\${6} implements ${4:$3RepositoryInterface} {
-    ${7}
-}
-
+	/*!
+	* \namespace   $1
+	* \class       $3
+	* \implements  $4
+	*
+	* \author      ${5:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${1:Repositories\\${2}};
+
+	class ${3:`!v expand('%:t:r')`} extends \\${6} implements ${4:$3RepositoryInterface} {
+		${7}
+	}
 #service
 snippet l_s
-/*!
- * \namespace   $1
- * \class       $2
- *
- * \author      ${6:`!v g:snips_author`}
- * \date        `!v strftime('%d-%m-%y')`
- */
-
-namespace Services\\${1};
-
-use ${3:Repositories\\${4:Interface}};
-
-class ${2:`!v expand('%:t:r')`} {
-    protected $${5:repo};
-    
-    /*!
-     * \fn      __construct
-     */
-    public function __construct($4 $repo) {
-        $this->$5 = $repo;
-    }
-}
-
+	/*!
+	* \namespace $1
+	* \class     $2
+	*
+	* \author    ${6:`!v g:snips_author`}
+	* \date      `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace Services\\${1};
+
+	use ${3:Repositories\\${4:Interface}};
+
+	class ${2:`!v expand('%:t:r')`} {
+		protected $${5:repo};
+
+		/*!
+		* \fn      __construct
+		*/
+		public function __construct($4 $repo) {
+			$this->$5 = $repo;
+		}
+	}
 #facade
 snippet l_f
-/*!
- * \namespace   $1
- * \class       $2
- *
- * \author      ${5:`!v g:snips_author`}
- * \date        `!v strftime('%d-%m-%y')`
- */
-
-namespace ${1:Services};
-
-use \Illuminate\Support\Facades\Facade;
-
-class ${2:`!v expand('%:t:r')`} extends Facade {
-    /*!
-     * \fn          getFacadeAccessor
-     *
-     * \return      string
-     */
-    protected static function getFacadeAccessor() { return '${4:${3}Service}'; }
-}
+	/*!
+	* \namespace   $1
+	* \class       $2
+	*
+	* \author      ${5:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${1:Services};
+
+	use \Illuminate\Support\Facades\Facade;
+
+	class ${2:`!v expand('%:t:r')`} extends Facade {
+		/*!
+		* \fn          getFacadeAccessor
+		*
+		* \return      string
+		*/
+		protected static function getFacadeAccessor() { return '${4:${3}Service}'; }
+	}
diff --git a/tests.sh b/tests.sh
index 33293c343..5b93b6baf 100755
--- a/tests.sh
+++ b/tests.sh
@@ -2,7 +2,7 @@
 
 SPACED=$(grep -REn '^ .+' --include '*.snippets' snippets);
 
-if [[ -n SPACED ]]; then
+if [[ $? -ne 1 ]]; then
   echo These snippet lines are indented with spaces:;
   echo;
   echo "$SPACED";

From cfed9fabf5cdb0b23cca4991d12312aa1ea99499 Mon Sep 17 00:00:00 2001
From: Kevin Lui <kevinywlui@gmail.com>
Date: Sun, 7 Jun 2015 21:21:08 -0700
Subject: [PATCH 0652/1587] added delimiter,fixed eq conflict

---
 snippets/tex.snippets | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index d48b263c0..0727cb451 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -45,10 +45,15 @@ snippet gat gather(ed) environment
 # Equation
 snippet eq equation environment
 	\begin{equation}
-	\label{eq:${2}}
 		${0}
 	\end{equation}
 # Equation
+snippet eql Labeled equation environment
+	\begin{equation}
+		\label{eq:${2}}
+	${0}
+	\end{equation}
+# Equation
 snippet eq* unnumbered equation environment
 	\begin{equation*}
 		${0}
@@ -206,6 +211,13 @@ snippet rm roman font text
 	\textrm{${0:text}}
 snippet tt typewriter (monospace) text
 	\texttt{${0:text}}
+#Math font
+snippet mf mathfrak
+	\mathfrak{${0:text}}
+snippet mc mathcal
+	\mathcal{${0:text}}
+snippet ms mathscr
+	\mathscr{${0:text}}
 #misc
 snippet ft \footnote
 	\footnote{${0:text}}
@@ -263,6 +275,18 @@ snippet col2 two-column environment
 			${0}
 		\end{column}
 	\end{columns}
+#delimiter
+snippet lr( left( right) 
+	\left( ${0} \right)
+snippet lr| left| right| 
+	\left| ${0} \right|
+snippet lr{ left\{ right\} 
+	\left\\{ ${0} \right\\}
+snippet lr[ left[ right] 
+	\left[ ${0} \right]
+snippet lra langle rangle 
+	\langle ${0} \rangle
+
 # Code listings
 snippet lst
 	\begin{listing}[language=${1:language}]

From 18d1fc346c335d6131f74c5ce50e1393b9eede5f Mon Sep 17 00:00:00 2001
From: Konstantin <linux0uid@gmail.com>
Date: Fri, 26 Jun 2015 15:27:09 +0300
Subject: [PATCH 0653/1587] Added Symfony2 use.. snippets

---
 UltiSnips/php_symfony2.snippets | 51 ++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/php_symfony2.snippets b/UltiSnips/php_symfony2.snippets
index 55423e713..520e366b9 100644
--- a/UltiSnips/php_symfony2.snippets
+++ b/UltiSnips/php_symfony2.snippets
@@ -278,6 +278,55 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
-snippet redir "Symfony2 redirect"
+snippet redir "Symfony2 redirect" b
 $this->redirect($this->generateUrl('${1}', ${2}));
 endsnippet
+
+snippet usecontroller "Symfony2 use Symfony\..\Controller" b
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;${1}
+endsnippet
+
+snippet usereauest "Symfony2 use Symfony\..\Request" b
+use Symfony\Component\HttpFoundation\Request;${1}
+endsnippet
+
+snippet useroute "Symfony2 use Sensio\..\Route" b
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;${1}
+endsnippet
+
+snippet useresponse "Symfony2 use Symfony\..\Response" b
+use Symfony\Component\HttpFoundation\Response;${1}
+endsnippet
+
+snippet usefile "Symfony2 use Symfony\..\File" b
+use Symfony\Component\HttpFoundation\File\UploadedFile;${1}
+endsnippet
+
+snippet useassert "Symfony2 use Symfony\..\Constraints as Assert" b
+use Symfony\Component\Validator\Constraints as Assert;${1}
+endsnippet
+
+snippet usetemplate "Symfony2 use Sensio\..\Template" b
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;${1}
+endsnippet
+
+snippet usecache "Symfony2 use Sensio\..\Cache" b
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;${1}
+endsnippet
+
+snippet usemethod "Symfony2 use Sensio\..\Method" b
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;${1}
+endsnippet
+
+snippet usearray "Symfony2 use Doctrine\..\ArrayCollection" b
+use Doctrine\Common\Collections\ArrayCollection;${1}
+endsnippet
+
+snippet useorm "Symfony2 use Doctrine\..\Mapping as ORM" b
+use Doctrine\ORM\Mapping as ORM;${1}
+endsnippet
+
+snippet usesecure "Symfony2 use JMS\..\Secure" b
+use JMS\SecurityExtraBundle\Annotation\Secure;${1}
+endsnippet
+

From 360167009427eacc5c1bba532efb9dd44586c4ec Mon Sep 17 00:00:00 2001
From: laxtiz <laxtiz@gmail.com>
Date: Tue, 30 Jun 2015 04:50:35 +0800
Subject: [PATCH 0654/1587] Some variables need default value

---
 plugin/vimsnippets.vim | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugin/vimsnippets.vim b/plugin/vimsnippets.vim
index 3c3ecf923..f58374cd8 100644
--- a/plugin/vimsnippets.vim
+++ b/plugin/vimsnippets.vim
@@ -3,6 +3,19 @@ if exists("b:done_vimsnippets")
 endif
 let b:done_vimsnippets = 1
 
+" Some variables need default value
+if !exists("g:snips_author")
+    let g:snips_author = "yourname"
+endif
+
+if !exists("g:snips_email")
+    let g:snips_email = "yourname@email.com"
+endif
+
+if !exists("g:snips_github")
+    let g:snips_github = "https://github.com/yourname"
+endif
+
 " Expanding the path is not needed on Vim 7.4
 if &cp || version >= 704
     finish

From f1e014e259d34df7f66050ce8be596f7964caf2b Mon Sep 17 00:00:00 2001
From: Tevin Zhang <mail2tevin@gmail.com>
Date: Thu, 9 Jul 2015 12:11:22 +0800
Subject: [PATCH 0655/1587] recommended python encoding declaration

---
 UltiSnips/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index af32c52b3..5dabb098c 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -7,7 +7,7 @@ priority -50
 #! header
 snippet #! "Shebang header for python scripts" b
 #!/usr/bin/env python
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 $0
 endsnippet
 

From 60084929e49a73fb2d8efafd945b630b38ebe386 Mon Sep 17 00:00:00 2001
From: Paulo Romeira <paulo@pauloromeira.com>
Date: Fri, 10 Jul 2015 03:23:52 -0300
Subject: [PATCH 0656/1587] Add visual placeholders to python snippets

---
 UltiSnips/python.snippets | 46 +++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index af32c52b3..aba242419 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -13,12 +13,12 @@ endsnippet
 
 snippet ifmain "ifmain" b
 if __name__ == '__main__':
-	${1:main()}$0
+	${1:${VISUAL:main()}}
 endsnippet
 
 snippet for "for loop" b
 for ${1:item} in ${2:iterable}:
-	${3:pass}
+	${3:${VISUAL:pass}}
 endsnippet
 
 ##########
@@ -447,7 +447,7 @@ if snip.indent:
 	snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
 	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
 write_function_docstring(t, snip) `
-	${0:pass}
+	${0:${VISUAL:pass}}
 endsnippet
 
 
@@ -458,7 +458,7 @@ if snip.indent:
 	snip.rv = 'cls' + (", " if len(t[2]) else "")`${2:arg1}):
 	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
 write_function_docstring(t, snip) `
-	${0:pass}
+	${0:${VISUAL:pass}}
 endsnippet
 
 
@@ -467,7 +467,7 @@ snippet defs "static method with docstrings" b
 def ${1:function}(${2:arg1}):
 	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
 write_function_docstring(t, snip) `
-	${0:pass}
+	${0:${VISUAL:pass}}
 endsnippet
 
 
@@ -520,19 +520,19 @@ endsnippet
 ####################
 snippet if "If" b
 if ${1:condition}:
-	${2:pass}
+	${2:${VISUAL:pass}}
 endsnippet
 
 snippet ife "If / Else" b
 if ${1:condition}:
-	${2:pass}
+	${2:${VISUAL:pass}}
 else:
 	${3:pass}
 endsnippet
 
 snippet ifee "If / Elif / Else" b
 if ${1:condition}:
-	${2:pass}
+	${2:${VISUAL:pass}}
 elif ${3:condition}:
 	${4:pass}
 else:
@@ -545,14 +545,14 @@ endsnippet
 ##########################
 snippet try "Try / Except" b
 try:
-	${1:pass}
+	${1:${VISUAL:pass}}
 except ${2:Exception}, ${3:e}:
 	${4:raise $3}
 endsnippet
 
 snippet try "Try / Except / Else" b
 try:
-	${1:pass}
+	${1:${VISUAL:pass}}
 except ${2:Exception}, ${3:e}:
 	${4:raise $3}
 else:
@@ -561,7 +561,7 @@ endsnippet
 
 snippet try "Try / Except / Finally" b
 try:
-	${1:pass}
+	${1:${VISUAL:pass}}
 except ${2:Exception}, ${3:e}:
 	${4:raise $3}
 finally:
@@ -570,7 +570,7 @@ endsnippet
 
 snippet try "Try / Except / Else / Finally" b
 try:
-	${1:pass}
+	${1:${VISUAL:pass}}
 except${2: ${3:Exception}, ${4:e}}:
 	${5:raise}
 else:
@@ -597,31 +597,31 @@ import pudb; pudb.set_trace()
 endsnippet
 
 snippet ae "Assert equal" b
-self.assertEqual(${1:first},${2:second})
+self.assertEqual(${1:${VISUAL:first}},${2:second})
 endsnippet
 
 snippet at "Assert True" b
-self.assertTrue(${0:exp})
+self.assertTrue(${1:${VISUAL:expression}})
 endsnippet
 
 snippet af "Assert False" b
-self.assertFalse(${1:expression})
+self.assertFalse(${1:${VISUAL:expression}})
 endsnippet
 
 snippet aae "Assert almost equal" b
-self.assertAlmostEqual(${1:first},${2:second})
+self.assertAlmostEqual(${1:${VISUAL:first}},${2:second})
 endsnippet
 
 snippet ar "Assert raises" b
-self.assertRaises(${1:exception}, ${2:func}${3/.+/, /}${3:arguments})
+self.assertRaises(${1:exception}, ${2:${VISUAL:func}}${3/.+/, /}${3:arguments})
 endsnippet
 
 snippet an "Assert is None" b
-self.assertIsNone(${0:expression})
+self.assertIsNone(${1:${VISUAL:expression}})
 endsnippet
 
 snippet ann "Assert is not None" b
-self.assertIsNotNone(${0:expression})
+self.assertIsNotNone(${1:${VISUAL:expression}})
 endsnippet
 
 snippet testcase "pyunit testcase" b
@@ -636,24 +636,24 @@ class Test${1:Class}(${2:unittest.TestCase}):
 		${5:pass}
 
 	def test_${6:name}(self):
-		${7:pass}
+		${7:${VISUAL:pass}}
 endsnippet
 
 snippet " "triple quoted string (double quotes)" b
 """
-${1:doc}
+${1:${VISUAL:doc}}
 `!p triple_quotes_handle_trailing(snip, '"')`
 endsnippet
 
 snippet ' "triple quoted string (single quotes)" b
 '''
-${1:doc}
+${1:${VISUAL:doc}}
 `!p triple_quotes_handle_trailing(snip, "'")`
 endsnippet
 
 snippet doc "doc block (triple quotes)"
 `!p snip.rv = triple_quotes(snip)`
-${1:doc}
+${1:${VISUAL:doc}}
 `!p snip.rv = triple_quotes(snip)`
 endsnippet
 

From 39a4a3922f59b9a73796d030c840b36d1d12016e Mon Sep 17 00:00:00 2001
From: Paulo Romeira <paulo@pauloromeira.com>
Date: Fri, 10 Jul 2015 03:30:40 -0300
Subject: [PATCH 0657/1587] Set new tab triggers to try-catch blocks

---
 UltiSnips/python.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index aba242419..d4d93dba3 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -550,7 +550,7 @@ except ${2:Exception}, ${3:e}:
 	${4:raise $3}
 endsnippet
 
-snippet try "Try / Except / Else" b
+snippet trye "Try / Except / Else" b
 try:
 	${1:${VISUAL:pass}}
 except ${2:Exception}, ${3:e}:
@@ -559,7 +559,7 @@ else:
 	${5:pass}
 endsnippet
 
-snippet try "Try / Except / Finally" b
+snippet tryf "Try / Except / Finally" b
 try:
 	${1:${VISUAL:pass}}
 except ${2:Exception}, ${3:e}:
@@ -568,7 +568,7 @@ finally:
 	${5:pass}
 endsnippet
 
-snippet try "Try / Except / Else / Finally" b
+snippet tryef "Try / Except / Else / Finally" b
 try:
 	${1:${VISUAL:pass}}
 except${2: ${3:Exception}, ${4:e}}:

From 356ebb88a64e068eedb6f4f74dc1e9da116db68e Mon Sep 17 00:00:00 2001
From: Paulo Romeira <paulo@pauloromeira.com>
Date: Fri, 10 Jul 2015 04:06:53 -0300
Subject: [PATCH 0658/1587] Fix some python snippets tabstops

---
 UltiSnips/python.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index d4d93dba3..e1245b703 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -447,7 +447,7 @@ if snip.indent:
 	snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
 	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
 write_function_docstring(t, snip) `
-	${0:${VISUAL:pass}}
+	${5:${VISUAL:pass}}
 endsnippet
 
 
@@ -458,7 +458,7 @@ if snip.indent:
 	snip.rv = 'cls' + (", " if len(t[2]) else "")`${2:arg1}):
 	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
 write_function_docstring(t, snip) `
-	${0:${VISUAL:pass}}
+	${5:${VISUAL:pass}}
 endsnippet
 
 
@@ -467,7 +467,7 @@ snippet defs "static method with docstrings" b
 def ${1:function}(${2:arg1}):
 	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
 write_function_docstring(t, snip) `
-	${0:${VISUAL:pass}}
+	${5:${VISUAL:pass}}
 endsnippet
 
 

From f3f25f2b9b420d8d4aaf228fb055d4977a9ed8f5 Mon Sep 17 00:00:00 2001
From: "M. Maxwell Watson" <hi@mmwtsn.com>
Date: Mon, 15 Jun 2015 21:29:33 -0400
Subject: [PATCH 0659/1587] Remove vendor snippets from default namespace

---
 UltiSnips/{coffee_jasmine.snippets => coffee-jasmine.snippets}    | 0
 .../{javascript_angular.snippets => javascript-angular.snippets}  | 0
 .../{javascript_ember.snippets => javascript-ember.snippets}      | 0
 .../{javascript_jasmine.snippets => javascript-jasmine.snippets}  | 0
 .../{javascript_jsdoc.snippets => javascript-jsdoc.snippets}      | 0
 UltiSnips/{php_laravel.snippets => php-laravel.snippets}          | 0
 UltiSnips/{php_phpunit.snippets => php-phpunit.snippets}          | 0
 UltiSnips/{php_symfony2.snippets => php-symfony2.snippets}        | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename UltiSnips/{coffee_jasmine.snippets => coffee-jasmine.snippets} (100%)
 rename UltiSnips/{javascript_angular.snippets => javascript-angular.snippets} (100%)
 rename UltiSnips/{javascript_ember.snippets => javascript-ember.snippets} (100%)
 rename UltiSnips/{javascript_jasmine.snippets => javascript-jasmine.snippets} (100%)
 rename UltiSnips/{javascript_jsdoc.snippets => javascript-jsdoc.snippets} (100%)
 rename UltiSnips/{php_laravel.snippets => php-laravel.snippets} (100%)
 rename UltiSnips/{php_phpunit.snippets => php-phpunit.snippets} (100%)
 rename UltiSnips/{php_symfony2.snippets => php-symfony2.snippets} (100%)

diff --git a/UltiSnips/coffee_jasmine.snippets b/UltiSnips/coffee-jasmine.snippets
similarity index 100%
rename from UltiSnips/coffee_jasmine.snippets
rename to UltiSnips/coffee-jasmine.snippets
diff --git a/UltiSnips/javascript_angular.snippets b/UltiSnips/javascript-angular.snippets
similarity index 100%
rename from UltiSnips/javascript_angular.snippets
rename to UltiSnips/javascript-angular.snippets
diff --git a/UltiSnips/javascript_ember.snippets b/UltiSnips/javascript-ember.snippets
similarity index 100%
rename from UltiSnips/javascript_ember.snippets
rename to UltiSnips/javascript-ember.snippets
diff --git a/UltiSnips/javascript_jasmine.snippets b/UltiSnips/javascript-jasmine.snippets
similarity index 100%
rename from UltiSnips/javascript_jasmine.snippets
rename to UltiSnips/javascript-jasmine.snippets
diff --git a/UltiSnips/javascript_jsdoc.snippets b/UltiSnips/javascript-jsdoc.snippets
similarity index 100%
rename from UltiSnips/javascript_jsdoc.snippets
rename to UltiSnips/javascript-jsdoc.snippets
diff --git a/UltiSnips/php_laravel.snippets b/UltiSnips/php-laravel.snippets
similarity index 100%
rename from UltiSnips/php_laravel.snippets
rename to UltiSnips/php-laravel.snippets
diff --git a/UltiSnips/php_phpunit.snippets b/UltiSnips/php-phpunit.snippets
similarity index 100%
rename from UltiSnips/php_phpunit.snippets
rename to UltiSnips/php-phpunit.snippets
diff --git a/UltiSnips/php_symfony2.snippets b/UltiSnips/php-symfony2.snippets
similarity index 100%
rename from UltiSnips/php_symfony2.snippets
rename to UltiSnips/php-symfony2.snippets

From ea2a95015deab052a47b87d8c74e50af4063d267 Mon Sep 17 00:00:00 2001
From: "M. Maxwell Watson" <hi@mmwtsn.com>
Date: Wed, 17 Jun 2015 00:12:51 -0400
Subject: [PATCH 0660/1587] Adds vendor snippet note to README

---
 README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/README.md b/README.md
index f41606501..8b24a2b4f 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,24 @@ improved by Adnan Zafar. So maybe time is not ready to make a final decision yet
 
 [github issue/discussion](https://github.com/honza/vim-snippets/issues/363)
 
+Vendor Snippets
+---------------
+
+Additional library and framework snippets are available for UltiSnips users in
+the `UltiSnips/` directory. These files are removed from the default language
+namespaces to prevent them from all being loaded automatically. If there is a
+separate library, framework, or package you would like to support open a pull
+request!
+
+Additional snippets can be added to the current buffer with the
+`:UltiSnipsAddFiletypes` command followed by the snippet name without the
+"snippets" ending. For example, to add the JavaScript Jasmine snippets, run:
+`:UltiSnipsAddFiletypes javascript-jasmine`. To have this snippet loaded
+everytime a JavaScript file is opened or created you can add the command to your
+`.vim/ftplugin/javascript.vim` file.
+
+For more see the UltiSnips docs (`:help UltiSnips`).
+
 Installation
 ------------
 

From c5000e2d77382f04269bf60a75aa5863161ed05d Mon Sep 17 00:00:00 2001
From: Nguyen Le <nguyentle7@gmail.com>
Date: Fri, 17 Jul 2015 09:27:09 -0700
Subject: [PATCH 0661/1587] Javascript Postincrementers

---
 snippets/javascript/javascript.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 4832815da..9215c879c 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -88,12 +88,12 @@ snippet ret
 
 # for loop
 snippet for
-	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
+	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2++) {
 		var ${3:v} = $1[$2];${0:}
 	}
 # Reversed for loop
 snippet forr
-	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2 --) {
+	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2--) {
 		var ${3:v} = $1[$2];${0:}
 	}
 # While loop

From ff76104e92b764287583fe6e0fdebe3577c3721a Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 21 Jul 2015 12:57:55 +0100
Subject: [PATCH 0662/1587] Typescript extends Javascript

---
 UltiSnips/typescript.snippets | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 UltiSnips/typescript.snippets

diff --git a/UltiSnips/typescript.snippets b/UltiSnips/typescript.snippets
new file mode 100644
index 000000000..11072ddd8
--- /dev/null
+++ b/UltiSnips/typescript.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends javascript

From 2a8f1b6295c0a5253d60eee508e8557183104d58 Mon Sep 17 00:00:00 2001
From: Roland Sommer <rol@ndsommer.de>
Date: Thu, 23 Jul 2015 14:29:08 +0200
Subject: [PATCH 0663/1587] UltiSnips/python: Honour quoting config for ifmain
 snippet

---
 UltiSnips/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 1e270ae4e..8fe2172cc 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -12,7 +12,7 @@ $0
 endsnippet
 
 snippet ifmain "ifmain" b
-if __name__ == '__main__':
+if __name__ == `!p snip.rv = get_quoting_style(snip)`__main__`!p snip.rv = get_quoting_style(snip)`:
 	${1:${VISUAL:main()}}
 endsnippet
 

From 6c1bf5e71dd58e5464d9d220c14fd380aeedb056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Audrius=20Ka=C5=BEukauskas?= <audrius@neutrino.lt>
Date: Sat, 25 Jul 2015 16:45:15 +0300
Subject: [PATCH 0664/1587] python: Allow to set triple quote style separately

---
 UltiSnips/python.snippets | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 8fe2172cc..3ee7d928e 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -70,7 +70,10 @@ def get_quoting_style(snip):
 	return DOUBLE_QUOTES
 
 def triple_quotes(snip):
-	return get_quoting_style(snip) * 3
+	style = snip.opt("g:ultisnips_python_triple_quoting_style")
+	if not style:
+		return get_quoting_style(snip) * 3
+	return (SINGLE_QUOTES if style == 'single' else DOUBLE_QUOTES) * 3
 
 def triple_quotes_handle_trailing(snip, quoting_style):
 	"""

From 613d84e2ac2d087faba492f4939c09618ae46294 Mon Sep 17 00:00:00 2001
From: Renzo Poddighe <poddighe.renzo@gmail.com>
Date: Wed, 29 Jul 2015 15:26:14 +0200
Subject: [PATCH 0665/1587] Add CommonJS snippet

---
 UltiSnips/javascript.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 6c177bc1b..3381c3378 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -162,4 +162,10 @@ snippet req "require an AMD module"
 require([${1:'dependencies'}], ${2:callback});
 endsnippet
 
+# CommonJS snippets
+
+snippet vreq "assign a CommonJS-style module to a var"
+var ${0:${1/(.+\/)*(\w+)(-|\b|$)(\..+$)?/\u$2/g}} = require('${1}');
+endsnippet
+
 # vim:ft=snippets:

From 3ef5eeec53e23a5d6b82bf2c1507e7a79e03624f Mon Sep 17 00:00:00 2001
From: Renzo Poddighe <poddighe.renzo@gmail.com>
Date: Wed, 29 Jul 2015 16:44:20 +0200
Subject: [PATCH 0666/1587] Make separate Node file

---
 UltiSnips/javascript-node.snippets | 6 ++++++
 UltiSnips/javascript.snippets      | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 UltiSnips/javascript-node.snippets

diff --git a/UltiSnips/javascript-node.snippets b/UltiSnips/javascript-node.snippets
new file mode 100644
index 000000000..402d55bfb
--- /dev/null
+++ b/UltiSnips/javascript-node.snippets
@@ -0,0 +1,6 @@
+priority -50
+
+snippet vreq "assign a CommonJS-style module to a var"
+var ${0:${1/(.+\/)*(\w+)(-|\b|$)(\..+$)?/\u$2/g}} = require('${1}');
+endsnippet
+
diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 3381c3378..6c177bc1b 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -162,10 +162,4 @@ snippet req "require an AMD module"
 require([${1:'dependencies'}], ${2:callback});
 endsnippet
 
-# CommonJS snippets
-
-snippet vreq "assign a CommonJS-style module to a var"
-var ${0:${1/(.+\/)*(\w+)(-|\b|$)(\..+$)?/\u$2/g}} = require('${1}');
-endsnippet
-
 # vim:ft=snippets:

From 5647a7fc51e59f9f661d0ce994a56e932ae51209 Mon Sep 17 00:00:00 2001
From: Renzo Poddighe <poddighe.renzo@gmail.com>
Date: Wed, 29 Jul 2015 17:04:35 +0200
Subject: [PATCH 0667/1587] Add sensible Node snippets

---
 UltiSnips/javascript-node.snippets | 45 ++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/UltiSnips/javascript-node.snippets b/UltiSnips/javascript-node.snippets
index 402d55bfb..fcc2a61e2 100644
--- a/UltiSnips/javascript-node.snippets
+++ b/UltiSnips/javascript-node.snippets
@@ -1,6 +1,51 @@
 priority -50
 
+snippet #! "shebang"
+#!/usr/bin/env node
+endsnippet
+
 snippet vreq "assign a CommonJS-style module to a var"
 var ${0:${1/(.+\/)*(\w+)(-|\b|$)(\..+$)?/\u$2/g}} = require('${1}');
 endsnippet
 
+snippet ex "module.exports"
+module.exports = ${1};
+endsnippet
+
+snippet hcs
+http.createServer(${1}).listen(${2});
+endsnippet
+
+snippet ncs
+net.createServer(function(${1:socket}){
+	${1}.on('data', function(${3:data}){
+		${4}
+	});
+	${1}.on('end', function(){
+		${5}
+	});
+}).listen(${6:8124});
+endsnippet
+
+snippet pipe
+pipe(${1:stream})${2}
+endsnippet
+
+# Express snippets
+
+snippet eget
+${1:app}.get('${2}', ${3});
+endsnippet
+
+snippet epost
+${1:app}.post('${2}', ${3});
+endsnippet
+
+snippet eput
+${1:app}.put('${2}', ${3});
+endsnippet
+
+snippet edelete
+${1:app}.delete('${2}', ${3});
+endsnippet
+

From e87dfec535d700a284d81b00f2a40b87235ca306 Mon Sep 17 00:00:00 2001
From: Renzo Poddighe <poddighe.renzo@gmail.com>
Date: Wed, 29 Jul 2015 17:09:06 +0200
Subject: [PATCH 0668/1587] Add omitted descriptions

---
 UltiSnips/javascript-node.snippets | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/UltiSnips/javascript-node.snippets b/UltiSnips/javascript-node.snippets
index fcc2a61e2..5b1a9cc4f 100644
--- a/UltiSnips/javascript-node.snippets
+++ b/UltiSnips/javascript-node.snippets
@@ -12,11 +12,11 @@ snippet ex "module.exports"
 module.exports = ${1};
 endsnippet
 
-snippet hcs
+snippet hcs "http.createServer"
 http.createServer(${1}).listen(${2});
 endsnippet
 
-snippet ncs
+snippet ncs "net.createServer"
 net.createServer(function(${1:socket}){
 	${1}.on('data', function(${3:data}){
 		${4}
@@ -27,25 +27,25 @@ net.createServer(function(${1:socket}){
 }).listen(${6:8124});
 endsnippet
 
-snippet pipe
+snippet pipe "pipe"
 pipe(${1:stream})${2}
 endsnippet
 
 # Express snippets
 
-snippet eget
+snippet eget "express GET"
 ${1:app}.get('${2}', ${3});
 endsnippet
 
-snippet epost
+snippet epost "express POST"
 ${1:app}.post('${2}', ${3});
 endsnippet
 
-snippet eput
+snippet eput "express PUT"
 ${1:app}.put('${2}', ${3});
 endsnippet
 
-snippet edelete
+snippet edelete "express DELETE"
 ${1:app}.delete('${2}', ${3});
 endsnippet
 

From c278d602e667277fafa128a2c2248f6e63e2c07f Mon Sep 17 00:00:00 2001
From: Renzo Poddighe <poddighe.renzo@gmail.com>
Date: Wed, 29 Jul 2015 17:15:01 +0200
Subject: [PATCH 0669/1587] Add process snippets

---
 UltiSnips/javascript-node.snippets | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/UltiSnips/javascript-node.snippets b/UltiSnips/javascript-node.snippets
index 5b1a9cc4f..7a14deeb9 100644
--- a/UltiSnips/javascript-node.snippets
+++ b/UltiSnips/javascript-node.snippets
@@ -49,3 +49,17 @@ snippet edelete "express DELETE"
 ${1:app}.delete('${2}', ${3});
 endsnippet
 
+# process snippets
+
+snippet stdout "stdout"
+process.stdout
+endsnippet
+
+snippet stdin "stdin"
+process.stdin
+endsnippet
+
+snippet stderr "stderr"
+process.stderr
+endsnippet
+

From af3c2d3f66a6c7bf200f671ee76efdbad33ce69f Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 2 Aug 2015 12:56:54 +0100
Subject: [PATCH 0670/1587] Rust: pub fn, correct while trigger

---
 UltiSnips/rust.snippets | 6 ++++++
 snippets/rust.snippets  | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 4a65d7725..b377fa971 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -18,6 +18,12 @@ fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
 }
 endsnippet
 
+snippet pfn "A public function, optionally with arguments and return type."
+pub fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
+	${VISUAL}${0}
+}
+endsnippet
+
 snippet arg "Function Arguments" i
 ${1:a}: ${2:T}${3:, arg}
 endsnippet
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index c273f5371..eeab689c4 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -7,6 +7,10 @@ snippet fn "Function definition"
 	fn ${1:function_name}(${2})${3} {
 		${0}
 	}
+snippet pfn "Function definition"
+	pub fn ${1:function_name}(${2})${3} {
+		${0}
+	}
 snippet test "Unit test function"
 	#[test]
 	fn ${1:test_function_name}() {
@@ -106,7 +110,7 @@ snippet loop "loop {}" b
 	loop {
 		${0}
 	}
-snippet while "while loop"
+snippet wh "while loop"
 	while ${1:condition} {
 		${0}
 	}

From dfa8c37d54ad2c8c96ddf7e68e9a41b696125952 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Fri, 10 Jul 2015 16:45:53 -0400
Subject: [PATCH 0671/1587] Django forms snippets done

---
 UltiSnips/django.snippets | 131 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 9d6ce279b..7d02f39c8 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -1,5 +1,136 @@
 priority -50
 
+# This files will define django snippets from sublime text djaneiro
+
+###########################################################################
+#                             FORMS SNIPPETS                              #
+###########################################################################
+snippet form
+class ${1:FORMNAME}(forms.Form):
+    ${2:# TODO: Define form fields here}
+endsnippet
+
+snippet modelform
+class ${1:MODELNAME}Form(forms.ModelForm):
+    class Meta:
+        model = $1
+endsnippet
+
+snippet fbool
+${1:FIELDNAME} = forms.BooleanField($2)
+endsnippet
+
+snippet fchar
+${1:FIELDNAME} = forms.CharField($2)
+endsnippet
+
+snippet fchoice
+${1:FIELDNAME} = forms.ChoiceField($2)
+endsnippet
+
+snippet fcombo
+${1:FIELDNAME} = forms.ComboField($2)
+endsnippet
+
+snippet fdate
+${1:FIELDNAME} = forms.DateField($2)
+endsnippet
+
+snippet fdatetime
+${1:FIELDNAME} = forms.DateTimeField($2)
+endsnippet
+
+snippet fdecimal
+${1:FIELDNAME} = forms.DecimalField($2)
+endsnippet
+
+snippet fmail
+${1:FIELDNAME} = forms.EmailField($2)
+endsnippet
+
+snippet ffile
+${1:FIELDNAME} = forms.FileField($2)
+endsnippet
+
+snippet ffilepath
+${1:FIELDNAME} = forms.FilePathField($2)
+endsnippet
+
+snippet ffloat
+${1:FIELDNAME} = forms.FloatField($2)
+endsnippet
+
+snippet fip
+${1:FIELDNAME} = forms.IPAddressField($2)
+endsnippet
+
+snippet fimg
+${1:FIELDNAME} = forms.ImageField($2)
+endsnippet
+
+snippet fint
+${1:FIELDNAME} = forms.IntegerField($2)
+endsnippet
+
+snippet fmochoice
+${1:FIELDNAME} = forms.ModelChoiceField($2)
+endsnippet
+
+snippet fmomuchoice
+${1:FIELDNAME} = forms.ModelMultipleChoiceField($2)
+endsnippet
+
+snippet fmuval
+${1:FIELDNAME} = forms.MultiValueField($2)
+endsnippet
+
+snippet fmuchoice
+${1:FIELDNAME} = forms.MultipleChoiceField($2)
+endsnippet
+
+snippet fnullbool
+${1:FIELDNAME} = forms.NullBooleanField($2)
+endsnippet
+
+snippet freg
+${1:FIELDNAME} = forms.RegexField($2)
+endsnippet
+
+snippet fslug
+${1:FIELDNAME} = forms.SlugField($2)
+endsnippet
+
+snippet fsdatetime
+${1:FIELDNAME} = forms.SplitDateTimeField($2)
+endsnippet
+
+snippet ftime
+${1:FIELDNAME} = forms.TimeField($2)
+endsnippet
+
+snippet ftchoice
+${1:FIELDNAME} = forms.TypedChoiceField($2)
+endsnippet
+
+snippet ftmuchoice
+${1:FIELDNAME} = forms.TypedMultipleChoiceField($2)
+endsnippet
+
+snippet furl
+${1:FIELDNAME} = forms.URLField($2)
+endsnippet
+
+#########################################################################################
+# Models
+#########################################################################################
+
+#########################################################################################
+# Views
+#########################################################################################
+
+#########################################################################################
+# Forms
+#########################################################################################
 # Generic Tags
 snippet %
 {% ${1} %}${2}

From 348236ab9e24247e90fcb465de5e0e70588400c0 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Fri, 10 Jul 2015 19:43:24 -0400
Subject: [PATCH 0672/1587] Start migration from djaneiro

---
 UltiSnips/django.snippets     | 359 +++++++++++++++++-----------------
 UltiSnips/htmldjango.snippets | 239 +++++++++++++++++++++-
 2 files changed, 417 insertions(+), 181 deletions(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 7d02f39c8..6144e97dc 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -5,365 +5,364 @@ priority -50
 ###########################################################################
 #                             FORMS SNIPPETS                              #
 ###########################################################################
-snippet form
+snippet form "Form"
 class ${1:FORMNAME}(forms.Form):
+
     ${2:# TODO: Define form fields here}
 endsnippet
 
-snippet modelform
+snippet modelform "ModelForm"
 class ${1:MODELNAME}Form(forms.ModelForm):
+
     class Meta:
         model = $1
 endsnippet
 
-snippet fbool
+snippet fbool "BooleanField (fbool)"
 ${1:FIELDNAME} = forms.BooleanField($2)
 endsnippet
 
-snippet fchar
+snippet fchar "CharField (fchar)"
 ${1:FIELDNAME} = forms.CharField($2)
 endsnippet
 
-snippet fchoice
+snippet fchoice "ChoiceField (fchoice)"
 ${1:FIELDNAME} = forms.ChoiceField($2)
 endsnippet
 
-snippet fcombo
+snippet fcombo "ComboField (fcombo)"
 ${1:FIELDNAME} = forms.ComboField($2)
 endsnippet
 
-snippet fdate
+snippet fdate "DateField (fdate)"
 ${1:FIELDNAME} = forms.DateField($2)
 endsnippet
 
-snippet fdatetime
+snippet fdatetime "DateTimeField (fdatetime)"
 ${1:FIELDNAME} = forms.DateTimeField($2)
 endsnippet
 
-snippet fdecimal
+snippet fdecimal "DecimalField (fdecimal)"
 ${1:FIELDNAME} = forms.DecimalField($2)
 endsnippet
 
-snippet fmail
+snippet fmail "EmailField (femail)"
 ${1:FIELDNAME} = forms.EmailField($2)
 endsnippet
 
-snippet ffile
+snippet ffile "FileField (ffile)"
 ${1:FIELDNAME} = forms.FileField($2)
 endsnippet
 
-snippet ffilepath
+snippet ffilepath "FilePathField (ffilepath)"
 ${1:FIELDNAME} = forms.FilePathField($2)
 endsnippet
 
-snippet ffloat
+snippet ffloat "FloatField (ffloat)"
 ${1:FIELDNAME} = forms.FloatField($2)
 endsnippet
 
-snippet fip
+snippet fip "IPAddressField (fip)"
 ${1:FIELDNAME} = forms.IPAddressField($2)
 endsnippet
 
-snippet fimg
+snippet fimg "ImageField (fimg)"
 ${1:FIELDNAME} = forms.ImageField($2)
 endsnippet
 
-snippet fint
+snippet fint "IntegerField (fint)"
 ${1:FIELDNAME} = forms.IntegerField($2)
 endsnippet
 
-snippet fmochoice
+snippet fmochoice "ModelChoiceField (fmochoice)"
 ${1:FIELDNAME} = forms.ModelChoiceField($2)
 endsnippet
 
-snippet fmomuchoice
+snippet fmomuchoice "ModelMultipleChoiceField (fmomuchoice)"
 ${1:FIELDNAME} = forms.ModelMultipleChoiceField($2)
 endsnippet
 
-snippet fmuval
+snippet fmuval "MultiValueField (fmuval)"
 ${1:FIELDNAME} = forms.MultiValueField($2)
 endsnippet
 
-snippet fmuchoice
+snippet fmuchoice "MultipleChoiceField (fmuchoice)"
 ${1:FIELDNAME} = forms.MultipleChoiceField($2)
 endsnippet
 
-snippet fnullbool
+snippet fnullbool "NullBooleanField (fnullbool)"
 ${1:FIELDNAME} = forms.NullBooleanField($2)
 endsnippet
 
-snippet freg
+snippet freg "RegexField (fregex)"
 ${1:FIELDNAME} = forms.RegexField($2)
 endsnippet
 
-snippet fslug
+snippet fslug "SlugField (fslug)"
 ${1:FIELDNAME} = forms.SlugField($2)
 endsnippet
 
-snippet fsdatetime
+snippet fsdatetime "SplitDateTimeField (fsdatetime)"
 ${1:FIELDNAME} = forms.SplitDateTimeField($2)
 endsnippet
 
-snippet ftime
+snippet ftime "TimeField (ftime)"
 ${1:FIELDNAME} = forms.TimeField($2)
 endsnippet
 
-snippet ftchoice
+snippet ftchoice "TypedChoiceField (ftchoice)"
 ${1:FIELDNAME} = forms.TypedChoiceField($2)
 endsnippet
 
-snippet ftmuchoice
+snippet ftmuchoice "TypedMultipleChoiceField (ftmuchoice)"
 ${1:FIELDNAME} = forms.TypedMultipleChoiceField($2)
 endsnippet
 
-snippet furl
+snippet furl "URLField (furl)"
 ${1:FIELDNAME} = forms.URLField($2)
 endsnippet
 
-#########################################################################################
-# Models
-#########################################################################################
+###########################################################################
+#                             MODELS SNIPPETS                             #
+###########################################################################
 
-#########################################################################################
-# Views
-#########################################################################################
+snippet model "Model"
+class ${1:MODELNAME}(models.Model):
 
-#########################################################################################
-# Forms
-#########################################################################################
-# Generic Tags
-snippet %
-{% ${1} %}${2}
-endsnippet
+    class Meta:
+        verbose_name = "$1"
+        verbose_name_plural = "$1s"
 
-snippet %%
-{% ${1:tag_name} %}
-	${2}
-{% end$1 %}
-endsnippet
+    def __str__(self):
+        pass
 
-snippet {
-{{ ${1} }}${2}
 endsnippet
 
-# Template Tags
+snippet modelfull "Model (full)"
+class ${1:MODELNAME}(models.Model):
+    ${2:# TODO: Define fields here}
 
-snippet autoescape
-{% autoescape ${1:off} %}
-	${2}
-{% endautoescape %}
-endsnippet
+    class Meta:
+        verbose_name = "$1"
+        verbose_name_plural = "$1s"
 
-snippet block
-{% block ${1} %}
-	${2}
-{% endblock $1 %}
-endsnippet
+    def __str__(self):
+        pass
 
-snippet #
-{# ${1:comment} #}
-endsnippet
+    def save(self):
+        pass
 
-snippet comment
-{% comment %}
-	${1}
-{% endcomment %}
-endsnippet
+    @models.permalink
+    def get_absolute_url(self):
+        return ('')
 
-snippet cycle
-{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
-endsnippet
+    ${3:# TODO: Define custom methods here}
 
-snippet debug
-{% debug %}
 endsnippet
 
-snippet extends
-{% extends "${1:base.html}" %}
+snippet mauto "AutoField (mauto)"
+${1:FIELDNAME} = models.AutoField($2)
 endsnippet
 
-snippet filter
-{% filter ${1} %}
-	${2}
-{% endfilter %}
+snippet mbigint "BigIntegerField (mbigint)"
+${1:FIELDNAME} = models.BigIntegerField($2)
 endsnippet
 
-snippet firstof
-{% firstof ${1} %}
+snippet mbool "BooleanField (mbool)"
+${1:FIELDNAME} = models.BooleanField($2)
 endsnippet
 
-snippet for
-{% for ${1} in ${2} %}
-	${3}
-{% endfor %}
+snippet mchar "CharField (mchar)"
+${1:FIELDNAME} = models.CharField($2, max_length=${3:50})
 endsnippet
 
-snippet empty
-{% empty %}
-	${1}
+snippet mcoseint "CommaSeparatedIntegerField (mcoseint)"
+${1:FIELDNAME} = models.CommaSeparatedIntegerField($2)
 endsnippet
 
-snippet if
-{% if ${1} %}
-	${2}
-{% endif %}
+snippet mdate "DateField (mdate)"
+${1:FIELDNAME} = models.DateField($2)
 endsnippet
 
-snippet else
-{% else %}
-	${1}
+snippet mdatetime "DateTimeField (mdatetime)"
+${1:FIELDNAME} = models.DateTimeField($2)
 endsnippet
 
-snippet ifchanged
-{% ifchanged %}${1}{% endifchanged %}
+snippet mdecimal "DecimalField (mdecimal)"
+${1:FIELDNAME} = models.DateTimeField($2)
 endsnippet
 
-snippet ifequal
-{% ifequal ${1} ${2} %}
-	${3}
-{% endifequal %}
+snippet memail "EmailField (memail)"
+${1:FIELDNAME} = models.EmailField($2)
 endsnippet
 
-snippet ifnotequal
-{% ifnotequal ${1} ${2} %}
-	${3}
-{% endifnotequal %}
+snippet mfile "FileField (mfile)"
+${1:FIELDNAME} = models.FileField($2)
 endsnippet
 
-snippet include
-{% include "${1}" %}
+snippet mfilepath "FilePathField (mfilepath)"
+${1:FIELDNAME} = models.FilePathField($2)
 endsnippet
 
-snippet load
-{% load ${1} %}
+snippet mfloat "FloatField (mfloat)"
+${1:FIELDNAME} = models.FloatField($2)
 endsnippet
 
-snippet now
-{% now "${1:jS F Y H:i}" %}
+snippet fk "ForeignKey (fk)"
+${1:FIELDNAME} = models.ForeignKey($2)
 endsnippet
 
-snippet regroup
-{% regroup ${1} by ${2} as ${3} %}
+snippet mip "IPAddressField (mip)"
+${1:FIELDNAME} = models.IPAddressField($2)
 endsnippet
 
-snippet spaceless
-{% spaceless %}${1}{% endspaceless %}
+snippet mimg "ImageField (mimg)"
+${1:FIELDNAME} = models.ImageField($2)
 endsnippet
 
-snippet ssi
-{% ssi ${1} %}
+snippet mint "IntegerField (mint)"
+${1:FIELDNAME} = models.IntegerField($2)
 endsnippet
 
-snippet trans
-{% trans "${1:string}" %}
+snippet m2m "ManyToManyField (m2m)"
+${1:FIELDNAME} = models.ManyToManyField($2)
 endsnippet
 
-snippet url
-{% url ${1} as ${2} %}
+snippet mnullbool "NullBooleanField (mnullbool)"
+${1:FIELDNAME} = models.NullBooleanField($2)
 endsnippet
 
-snippet widthratio
-{% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
+snippet o2o "OneToOneField (o2o)"
+${1:FIELDNAME} = models.OneToOneField($2)
 endsnippet
 
-snippet with
-{% with ${1} as ${2} %}
-endsnippet
-
-# Template Filters
-
-# Note: Since SnipMate can't determine which template filter you are
-# expanding without the "|" character, these do not add the "|"
-# character.  These save a few keystrokes still.
-
-# Note: Template tags that take no arguments are not implemented.
-
-snippet add
-add:"${1}"
+snippet mphone "PhoneNumberField (mphone)"
+${1:FIELDNAME} = models.PhoneNumberField($2)
 endsnippet
 
-snippet center
-center:"${1}"
+snippet mposint "PositiveIntegerField (mposint)"
+${1:FIELDNAME} = models.PositiveIntegerField($2)
 endsnippet
 
-snippet cut
-cut:"${1}"
+snippet mpossmallint "PositiveSmallIntegerField (mpossmallint)"
+${1:FIELDNAME} = models.PositiveSmallIntegerField($2)
 endsnippet
 
-snippet date
-date:"${1}"
+snippet mslug "SlugField (mslug)"
+${1:FIELDNAME} = models.SlugField($2)
 endsnippet
 
-snippet default
-default:"${1}"
+snippet msmallint "SmallIntegerField (msmallint)"
+${1:FIELDNAME} = models.SmallIntegerField($2)
 endsnippet
 
-snippet defaultifnone
-default_if_none:"${1}"
+snippet mtext "TextField (mtext)"
+${1:FIELDNAME} = models.TextField($2)
 endsnippet
 
-snippet dictsort
-dictsort:"${1}"
+snippet mtime "TimeField (mtime)"
+${1:FIELDNAME} = models.TimeField($2)
 endsnippet
 
-snippet dictsortrev
-dictsortreversed:"${1}"
+snippet murl "URLField (murl)"
+${1:FIELDNAME} = models.URLField($2)
 endsnippet
 
-snippet divisibleby
-divisibleby:"${1}"
+snippet musstate "USStateField (musstate)"
+${1:FIELDNAME} = models.USStateField($2)
 endsnippet
 
-snippet floatformat
-floatformat:"${1}"
+snippet mxml "XMLField (mxml)"
+${1:FIELDNAME} = models.XMLField($2)
 endsnippet
 
-snippet getdigit
-get_digit:"${1}"
-endsnippet
+###########################################################################
+#                             VIEWS  SNIPPETS                             #
+###########################################################################
 
-snippet join
-join:"${1}"
+snippet adminview "Model Admin View" 
+class ${1}Admin(admin.ModelAdmin):
+    '''
+        Admin View for ${1}
+    '''
+    list_display = ('${2}',)
+    list_filter = ('${3}',)
+    inlines = [
+        ${4}Inline,
+    ]
+    raw_id_fields = ('${5}',)
+    readonly_fields = ('${6}',)
+    search_fields = ['${7}']
+admin.site.register(${1}, ${1}Admin)
 endsnippet
 
-snippet lengthis
-length_is:"${1}"
+snippet createview "Generic Create View"
+class ${1:MODEL_NAME}CreateView(CreateView):
+    model = ${1:MODEL_NAME}
+    template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet pluralize
-pluralize:"${1}"
+snippet deleteview "Generic Delete View"
+class ${1:MODEL_NAME}DeleteView(DeleteView):
+    model = ${1:MODEL_NAME}
+    template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet removetags
-removetags:"${1}"
+snippet detailview "Generic Detail View"
+class ${1:MODEL_NAME}DetailView(DetailView):
+    model = ${1:MODEL_NAME}
+    template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet slice
-slice:"${1}"
+snippet listview "Generic List View"
+class ${1:MODEL_NAME}ListView(ListView):
+    model = ${1:MODEL_NAME}
+    template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet stringformat
-stringformat:"${1}"
+snippet stackedinline "Stacked Inline"
+class ${1}Inline(admin.StackedInline):
+      '''
+          Stacked Inline View for ${1}
+      '''
+      model = ${2:${1}}
+      min_num = ${3:3}
+      max_num = ${4:20}
+      extra = ${5:1}
+      raw_id_fields = (${6},)
 endsnippet
 
-snippet time
-time:"${1}"
+snippet tabularinline "Tabular Inline"
+class ${1}Inline(admin.TabularInline):
+      '''
+          Tabular Inline View for ${1}
+      '''
+      model = ${2:${1}}
+      min_num = ${3:3}
+      max_num = ${4:20}
+      extra = ${5:1}
+      raw_id_fields = (${6},)
 endsnippet
 
-snippet truncatewords
-truncatewords:${1}
+snippet templateview "Generic Template View"
+class ${1:CLASS_NAME}(TemplateView):
+    template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet truncatewordshtml
-truncatewords_html:${1}
+snippet updateview "Generic Update View"
+class ${1:MODEL_NAME}UpdateView(UpdateView):
+    model = ${1:MODEL_NAME}
+    template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet urlizetrunc
-urlizetrunc:${1}
+snippet dispatch "Dispatch View method"
+def dispatch(self, request, *args, **kwargs):
+    return super(${1:CLASS_NAME}, self).dispatch(request, *args, **kwargs)
 endsnippet
 
-snippet wordwrap
-wordwrap:${1}
+snippet context "get_context_data view method"
+def get_context_data(self, **kwargs):
+    context = super(${1:CLASS_NAME}, self).get_context_data(**kwargs)
+    return context
 endsnippet
 
-# vim:ft=snippets:
diff --git a/UltiSnips/htmldjango.snippets b/UltiSnips/htmldjango.snippets
index 5836a2f69..f77ad880e 100644
--- a/UltiSnips/htmldjango.snippets
+++ b/UltiSnips/htmldjango.snippets
@@ -1,3 +1,240 @@
 priority -50
 
-extends html, django
+extends html
+
+# Generic Tags
+snippet %
+{% ${1} %}${2}
+endsnippet
+
+snippet %%
+{% ${1:tag_name} %}
+	${2}
+{% end$1 %}
+endsnippet
+
+snippet {
+{{ ${1} }}${2}
+endsnippet
+
+# Template Tags
+
+snippet autoescape
+{% autoescape ${1:off} %}
+	${2}
+{% endautoescape %}
+endsnippet
+
+snippet block
+{% block ${1} %}
+	${2}
+{% endblock $1 %}
+endsnippet
+
+snippet #
+{# ${1:comment} #}
+endsnippet
+
+snippet comment
+{% comment %}
+	${1}
+{% endcomment %}
+endsnippet
+
+snippet cycle
+{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
+endsnippet
+
+snippet debug
+{% debug %}
+endsnippet
+
+snippet extends
+{% extends "${1:base.html}" %}
+endsnippet
+
+snippet filter
+{% filter ${1} %}
+	${2}
+{% endfilter %}
+endsnippet
+
+snippet firstof
+{% firstof ${1} %}
+endsnippet
+
+snippet for
+{% for ${1} in ${2} %}
+	${3}
+{% endfor %}
+endsnippet
+
+snippet empty
+{% empty %}
+	${1}
+endsnippet
+
+snippet if
+{% if ${1} %}
+	${2}
+{% endif %}
+endsnippet
+
+snippet else
+{% else %}
+	${1}
+endsnippet
+
+snippet ifchanged
+{% ifchanged %}${1}{% endifchanged %}
+endsnippet
+
+snippet ifequal
+{% ifequal ${1} ${2} %}
+	${3}
+{% endifequal %}
+endsnippet
+
+snippet ifnotequal
+{% ifnotequal ${1} ${2} %}
+	${3}
+{% endifnotequal %}
+endsnippet
+
+snippet include
+{% include "${1}" %}
+endsnippet
+
+snippet load
+{% load ${1} %}
+endsnippet
+
+snippet now
+{% now "${1:jS F Y H:i}" %}
+endsnippet
+
+snippet regroup
+{% regroup ${1} by ${2} as ${3} %}
+endsnippet
+
+snippet spaceless
+{% spaceless %}${1}{% endspaceless %}
+endsnippet
+
+snippet ssi
+{% ssi ${1} %}
+endsnippet
+
+snippet trans
+{% trans "${1:string}" %}
+endsnippet
+
+snippet url
+{% url ${1} as ${2} %}
+endsnippet
+
+snippet widthratio
+{% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
+endsnippet
+
+snippet with
+{% with ${1} as ${2} %}
+endsnippet
+
+# Template Filters
+
+# Note: Since SnipMate can't determine which template filter you are
+# expanding without the "|" character, these do not add the "|"
+# character.  These save a few keystrokes still.
+
+# Note: Template tags that take no arguments are not implemented.
+
+snippet add
+add:"${1}"
+endsnippet
+
+snippet center
+center:"${1}"
+endsnippet
+
+snippet cut
+cut:"${1}"
+endsnippet
+
+snippet date
+date:"${1}"
+endsnippet
+
+snippet default
+default:"${1}"
+endsnippet
+
+snippet defaultifnone
+default_if_none:"${1}"
+endsnippet
+
+snippet dictsort
+dictsort:"${1}"
+endsnippet
+
+snippet dictsortrev
+dictsortreversed:"${1}"
+endsnippet
+
+snippet divisibleby
+divisibleby:"${1}"
+endsnippet
+
+snippet floatformat
+floatformat:"${1}"
+endsnippet
+
+snippet getdigit
+get_digit:"${1}"
+endsnippet
+
+snippet join
+join:"${1}"
+endsnippet
+
+snippet lengthis
+length_is:"${1}"
+endsnippet
+
+snippet pluralize
+pluralize:"${1}"
+endsnippet
+
+snippet removetags
+removetags:"${1}"
+endsnippet
+
+snippet slice
+slice:"${1}"
+endsnippet
+
+snippet stringformat
+stringformat:"${1}"
+endsnippet
+
+snippet time
+time:"${1}"
+endsnippet
+
+snippet truncatewords
+truncatewords:${1}
+endsnippet
+
+snippet truncatewordshtml
+truncatewords_html:${1}
+endsnippet
+
+snippet urlizetrunc
+urlizetrunc:${1}
+endsnippet
+
+snippet wordwrap
+wordwrap:${1}
+endsnippet
+
+# vim:ft=snippets:

From d1f383ab5399ba03ea42ffcbc8393ad69cb7b9e0 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Fri, 10 Jul 2015 20:02:33 -0400
Subject: [PATCH 0673/1587] Start migration from djaneiro

---
 UltiSnips/python.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 3ee7d928e..c02450a6d 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -1,5 +1,7 @@
 priority -50
 
+extend django
+
 ###########################################################################
 #                            TEXTMATE SNIPPETS                            #
 ###########################################################################

From 0abbd8160b5957f4ce0291b9ebe513d56f6c5754 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Fri, 10 Jul 2015 20:10:52 -0400
Subject: [PATCH 0674/1587] Start migration from djaneiro

---
 UltiSnips/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index c02450a6d..1b6391c75 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -1,6 +1,6 @@
 priority -50
 
-extend django
+extends django
 
 ###########################################################################
 #                            TEXTMATE SNIPPETS                            #

From 8b2e2c2bdfd39f3110be5da1f47e0a2a10f8fda4 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Fri, 10 Jul 2015 21:20:39 -0400
Subject: [PATCH 0675/1587] Improve htmldjango

---
 UltiSnips/htmldjango.snippets | 59 +++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/UltiSnips/htmldjango.snippets b/UltiSnips/htmldjango.snippets
index f77ad880e..3c6bc59aa 100644
--- a/UltiSnips/htmldjango.snippets
+++ b/UltiSnips/htmldjango.snippets
@@ -80,11 +80,28 @@ snippet if
 {% endif %}
 endsnippet
 
+snippet iif
+{% if ${1} %}${2}{% endif %}
+endsnippet
+
+snippet ielse
+{% else %}${1}
+endsnippet
+
 snippet else
 {% else %}
 	${1}
 endsnippet
 
+snippet ielif
+{% elif %}${1}
+endsnippet
+
+snippet elif
+{% elif %}
+	${1}
+endsnippet
+
 snippet ifchanged
 {% ifchanged %}${1}{% endifchanged %}
 endsnippet
@@ -139,6 +156,48 @@ endsnippet
 
 snippet with
 {% with ${1} as ${2} %}
+	${3:$VISUAL}
+{% endwith %}
+endsnippet
+
+snippet verbatim
+{% verbatim %}
+	${1:$VISUAL}
+{% endverbatim %}
+endsnippet
+
+snippet super
+{{ block.super }}
+endsnippet
+
+snippet staticu
+{{ STATIC_URL }}
+endsnippet
+
+snippet static
+{% static "${1:$VISUAL}" %}
+endsnippet
+
+snippet mediau
+{{ MEDIA_URL }}
+endsnippet
+
+snippet iblock
+{% block ${1:blockname} %}${2:$VISUAL}{% endblock ${1:blockname} %}
+endsnippet
+
+snippet csfr
+{% csrf_token %}
+endsnippet
+
+snippet blocktrans
+{% blocktrans %}
+    ${1:$VISUAL}
+{% endblocktrans %}
+endsnippet
+
+snippet lorem
+{% lorem ${1} %}
 endsnippet
 
 # Template Filters

From a53a23b4cc32e833a9dd0c1d75dfc424beb4af60 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Fri, 10 Jul 2015 22:31:01 -0400
Subject: [PATCH 0676/1587] To test attributes

---
 UltiSnips/django.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 6144e97dc..4c5309046 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -366,3 +366,10 @@ def get_context_data(self, **kwargs):
     return context
 endsnippet
 
+###########################################################################
+#                     MODEL FIELDS SNIPPETS                               #
+###########################################################################
+
+snippet null
+null=${1:True}
+endsnippet

From b1063c08f4841fb4ea1b79f04175ad1e9b6c0272 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Fri, 10 Jul 2015 22:37:56 -0400
Subject: [PATCH 0677/1587] To test attributes

---
 UltiSnips/django.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 4c5309046..7d74cb236 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -370,6 +370,6 @@ endsnippet
 #                     MODEL FIELDS SNIPPETS                               #
 ###########################################################################
 
-snippet null
+snippet null w
 null=${1:True}
 endsnippet

From 8e5178d2365b71b23bff16d3458289fc1feceebc Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Fri, 10 Jul 2015 22:39:49 -0400
Subject: [PATCH 0678/1587] To test attributes

---
 UltiSnips/django.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 7d74cb236..4e45c21b9 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -370,6 +370,6 @@ endsnippet
 #                     MODEL FIELDS SNIPPETS                               #
 ###########################################################################
 
-snippet null w
+snippet null "null" w
 null=${1:True}
 endsnippet

From c69f680c6dd9e417b37811d807be43216a3e731e Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Fri, 10 Jul 2015 22:46:18 -0400
Subject: [PATCH 0679/1587] To test attributes

---
 UltiSnips/django.snippets | 44 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 4e45c21b9..f8a69efe0 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -8,14 +8,14 @@ priority -50
 snippet form "Form"
 class ${1:FORMNAME}(forms.Form):
 
-    ${2:# TODO: Define form fields here}
+	${2:# TODO: Define form fields here}
 endsnippet
 
 snippet modelform "ModelForm"
 class ${1:MODELNAME}Form(forms.ModelForm):
 
-    class Meta:
-        model = $1
+	class Meta:
+		model = $1
 endsnippet
 
 snippet fbool "BooleanField (fbool)"
@@ -128,35 +128,35 @@ endsnippet
 
 snippet model "Model"
 class ${1:MODELNAME}(models.Model):
+	${0}
+	class Meta:
+		verbose_name = "$1"
+		verbose_name_plural = "$1s"
 
-    class Meta:
-        verbose_name = "$1"
-        verbose_name_plural = "$1s"
-
-    def __str__(self):
-        pass
+	def __str__(self):
+		pass
 
 endsnippet
 
 snippet modelfull "Model (full)"
 class ${1:MODELNAME}(models.Model):
-    ${2:# TODO: Define fields here}
+	${2:# TODO: Define fields here}
 
-    class Meta:
-        verbose_name = "$1"
-        verbose_name_plural = "$1s"
+	class Meta:
+		verbose_name = "$1"
+		verbose_name_plural = "$1s"
 
-    def __str__(self):
-        pass
+	def __str__(self):
+		pass
 
-    def save(self):
-        pass
+	def save(self):
+		pass
 
-    @models.permalink
-    def get_absolute_url(self):
-        return ('')
+	@models.permalink
+	def get_absolute_url(self):
+		return ('')
 
-    ${3:# TODO: Define custom methods here}
+	${3:# TODO: Define custom methods here}
 
 endsnippet
 
@@ -370,6 +370,6 @@ endsnippet
 #                     MODEL FIELDS SNIPPETS                               #
 ###########################################################################
 
-snippet null "null" w
+snippet null "null" i
 null=${1:True}
 endsnippet

From cf8b0ecad069cf1b7de710b03b84cf481c9423e5 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Fri, 10 Jul 2015 22:50:24 -0400
Subject: [PATCH 0680/1587] Ready for pull request

---
 UltiSnips/django.snippets | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index f8a69efe0..838c12799 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -365,11 +365,3 @@ def get_context_data(self, **kwargs):
     context = super(${1:CLASS_NAME}, self).get_context_data(**kwargs)
     return context
 endsnippet
-
-###########################################################################
-#                     MODEL FIELDS SNIPPETS                               #
-###########################################################################
-
-snippet null "null" i
-null=${1:True}
-endsnippet

From f0a9a1e80b164e05f4b3d1eb6429c01a8f800a6e Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Sun, 2 Aug 2015 23:37:31 -0400
Subject: [PATCH 0681/1587] Add some options to test on templates

---
 UltiSnips/django.snippets     | 238 +++++++++++++++++-----------------
 UltiSnips/htmldjango.snippets |  12 +-
 UltiSnips/python.snippets     |   2 -
 3 files changed, 122 insertions(+), 130 deletions(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 838c12799..62715942c 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -1,132 +1,128 @@
 priority -50
 
 # This files will define django snippets from sublime text djaneiro
+# FORMS SNIPPETS
 
-###########################################################################
-#                             FORMS SNIPPETS                              #
-###########################################################################
-snippet form "Form"
+snippet form "Form" b
 class ${1:FORMNAME}(forms.Form):
 
 	${2:# TODO: Define form fields here}
 endsnippet
 
-snippet modelform "ModelForm"
+snippet modelform "ModelForm" b
 class ${1:MODELNAME}Form(forms.ModelForm):
 
 	class Meta:
 		model = $1
 endsnippet
 
-snippet fbool "BooleanField (fbool)"
+snippet fbool "BooleanField" b
 ${1:FIELDNAME} = forms.BooleanField($2)
 endsnippet
 
-snippet fchar "CharField (fchar)"
+snippet fchar "CharField" b
 ${1:FIELDNAME} = forms.CharField($2)
 endsnippet
 
-snippet fchoice "ChoiceField (fchoice)"
+snippet fchoice "ChoiceField" b
 ${1:FIELDNAME} = forms.ChoiceField($2)
 endsnippet
 
-snippet fcombo "ComboField (fcombo)"
+snippet fcombo "ComboField" b
 ${1:FIELDNAME} = forms.ComboField($2)
 endsnippet
 
-snippet fdate "DateField (fdate)"
+snippet fdate "DateField" b
 ${1:FIELDNAME} = forms.DateField($2)
 endsnippet
 
-snippet fdatetime "DateTimeField (fdatetime)"
+snippet fdatetime "DateTimeField" b
 ${1:FIELDNAME} = forms.DateTimeField($2)
 endsnippet
 
-snippet fdecimal "DecimalField (fdecimal)"
+snippet fdecimal "DecimalField" b
 ${1:FIELDNAME} = forms.DecimalField($2)
 endsnippet
 
-snippet fmail "EmailField (femail)"
+snippet fmail "EmailField" b
 ${1:FIELDNAME} = forms.EmailField($2)
 endsnippet
 
-snippet ffile "FileField (ffile)"
+snippet ffile "FileField" b
 ${1:FIELDNAME} = forms.FileField($2)
 endsnippet
 
-snippet ffilepath "FilePathField (ffilepath)"
+snippet ffilepath "FilePathField" b
 ${1:FIELDNAME} = forms.FilePathField($2)
 endsnippet
 
-snippet ffloat "FloatField (ffloat)"
+snippet ffloat "FloatField" b
 ${1:FIELDNAME} = forms.FloatField($2)
 endsnippet
 
-snippet fip "IPAddressField (fip)"
+snippet fip "IPAddressField" b
 ${1:FIELDNAME} = forms.IPAddressField($2)
 endsnippet
 
-snippet fimg "ImageField (fimg)"
+snippet fimg "ImageField" b
 ${1:FIELDNAME} = forms.ImageField($2)
 endsnippet
 
-snippet fint "IntegerField (fint)"
+snippet fint "IntegerField" b
 ${1:FIELDNAME} = forms.IntegerField($2)
 endsnippet
 
-snippet fmochoice "ModelChoiceField (fmochoice)"
+snippet fmochoice "ModelChoiceField" b
 ${1:FIELDNAME} = forms.ModelChoiceField($2)
 endsnippet
 
-snippet fmomuchoice "ModelMultipleChoiceField (fmomuchoice)"
+snippet fmomuchoice "ModelMultipleChoiceField" b
 ${1:FIELDNAME} = forms.ModelMultipleChoiceField($2)
 endsnippet
 
-snippet fmuval "MultiValueField (fmuval)"
+snippet fmuval "MultiValueField" b
 ${1:FIELDNAME} = forms.MultiValueField($2)
 endsnippet
 
-snippet fmuchoice "MultipleChoiceField (fmuchoice)"
+snippet fmuchoice "MultipleChoiceField" b
 ${1:FIELDNAME} = forms.MultipleChoiceField($2)
 endsnippet
 
-snippet fnullbool "NullBooleanField (fnullbool)"
+snippet fnullbool "NullBooleanField" b
 ${1:FIELDNAME} = forms.NullBooleanField($2)
 endsnippet
 
-snippet freg "RegexField (fregex)"
+snippet freg "RegexField" b
 ${1:FIELDNAME} = forms.RegexField($2)
 endsnippet
 
-snippet fslug "SlugField (fslug)"
+snippet fslug "SlugField" b
 ${1:FIELDNAME} = forms.SlugField($2)
 endsnippet
 
-snippet fsdatetime "SplitDateTimeField (fsdatetime)"
+snippet fsdatetime "SplitDateTimeField" b
 ${1:FIELDNAME} = forms.SplitDateTimeField($2)
 endsnippet
 
-snippet ftime "TimeField (ftime)"
+snippet ftime "TimeField" b
 ${1:FIELDNAME} = forms.TimeField($2)
 endsnippet
 
-snippet ftchoice "TypedChoiceField (ftchoice)"
+snippet ftchoice "TypedChoiceField" b
 ${1:FIELDNAME} = forms.TypedChoiceField($2)
 endsnippet
 
-snippet ftmuchoice "TypedMultipleChoiceField (ftmuchoice)"
+snippet ftmuchoice "TypedMultipleChoiceField" b
 ${1:FIELDNAME} = forms.TypedMultipleChoiceField($2)
 endsnippet
 
-snippet furl "URLField (furl)"
+snippet furl "URLField" b
 ${1:FIELDNAME} = forms.URLField($2)
 endsnippet
 
-###########################################################################
-#                             MODELS SNIPPETS                             #
-###########################################################################
+# MODELS SNIPPETS
 
-snippet model "Model"
+snippet model "Model" b
 class ${1:MODELNAME}(models.Model):
 	${0}
 	class Meta:
@@ -138,7 +134,7 @@ class ${1:MODELNAME}(models.Model):
 
 endsnippet
 
-snippet modelfull "Model (full)"
+snippet modelfull "Model" b
 class ${1:MODELNAME}(models.Model):
 	${2:# TODO: Define fields here}
 
@@ -147,10 +143,10 @@ class ${1:MODELNAME}(models.Model):
 		verbose_name_plural = "$1s"
 
 	def __str__(self):
-		pass
+		return super($1, self).__str__()
 
 	def save(self):
-		pass
+		return super($1, self).save()
 
 	@models.permalink
 	def get_absolute_url(self):
@@ -160,208 +156,206 @@ class ${1:MODELNAME}(models.Model):
 
 endsnippet
 
-snippet mauto "AutoField (mauto)"
+snippet mauto "AutoField" b
 ${1:FIELDNAME} = models.AutoField($2)
 endsnippet
 
-snippet mbigint "BigIntegerField (mbigint)"
+snippet mbigint "BigIntegerField" b
 ${1:FIELDNAME} = models.BigIntegerField($2)
 endsnippet
 
-snippet mbool "BooleanField (mbool)"
+snippet mbool "BooleanField" b
 ${1:FIELDNAME} = models.BooleanField($2)
 endsnippet
 
-snippet mchar "CharField (mchar)"
+snippet mchar "CharField" b
 ${1:FIELDNAME} = models.CharField($2, max_length=${3:50})
 endsnippet
 
-snippet mcoseint "CommaSeparatedIntegerField (mcoseint)"
+snippet mcoseint "CommaSeparatedIntegerField" b
 ${1:FIELDNAME} = models.CommaSeparatedIntegerField($2)
 endsnippet
 
-snippet mdate "DateField (mdate)"
+snippet mdate "DateField" b
 ${1:FIELDNAME} = models.DateField($2)
 endsnippet
 
-snippet mdatetime "DateTimeField (mdatetime)"
+snippet mdatetime "DateTimeField" b
 ${1:FIELDNAME} = models.DateTimeField($2)
 endsnippet
 
-snippet mdecimal "DecimalField (mdecimal)"
+snippet mdecimal "DecimalField" b
 ${1:FIELDNAME} = models.DateTimeField($2)
 endsnippet
 
-snippet memail "EmailField (memail)"
+snippet memail "EmailField" b
 ${1:FIELDNAME} = models.EmailField($2)
 endsnippet
 
-snippet mfile "FileField (mfile)"
+snippet mfile "FileField" b
 ${1:FIELDNAME} = models.FileField($2)
 endsnippet
 
-snippet mfilepath "FilePathField (mfilepath)"
+snippet mfilepath "FilePathField" b
 ${1:FIELDNAME} = models.FilePathField($2)
 endsnippet
 
-snippet mfloat "FloatField (mfloat)"
+snippet mfloat "FloatField" b
 ${1:FIELDNAME} = models.FloatField($2)
 endsnippet
 
-snippet fk "ForeignKey (fk)"
+snippet fk "ForeignKey" b
 ${1:FIELDNAME} = models.ForeignKey($2)
 endsnippet
 
-snippet mip "IPAddressField (mip)"
+snippet mip "IPAddressField" b
 ${1:FIELDNAME} = models.IPAddressField($2)
 endsnippet
 
-snippet mimg "ImageField (mimg)"
+snippet mimg "ImageField" b
 ${1:FIELDNAME} = models.ImageField($2)
 endsnippet
 
-snippet mint "IntegerField (mint)"
+snippet mint "IntegerField" b
 ${1:FIELDNAME} = models.IntegerField($2)
 endsnippet
 
-snippet m2m "ManyToManyField (m2m)"
+snippet m2m "ManyToManyField" b
 ${1:FIELDNAME} = models.ManyToManyField($2)
 endsnippet
 
-snippet mnullbool "NullBooleanField (mnullbool)"
+snippet mnullbool "NullBooleanField" b
 ${1:FIELDNAME} = models.NullBooleanField($2)
 endsnippet
 
-snippet o2o "OneToOneField (o2o)"
+snippet o2o "OneToOneField" b
 ${1:FIELDNAME} = models.OneToOneField($2)
 endsnippet
 
-snippet mphone "PhoneNumberField (mphone)"
+snippet mphone "PhoneNumberField" b
 ${1:FIELDNAME} = models.PhoneNumberField($2)
 endsnippet
 
-snippet mposint "PositiveIntegerField (mposint)"
+snippet mposint "PositiveIntegerField" b
 ${1:FIELDNAME} = models.PositiveIntegerField($2)
 endsnippet
 
-snippet mpossmallint "PositiveSmallIntegerField (mpossmallint)"
+snippet mpossmallint "PositiveSmallIntegerField" b
 ${1:FIELDNAME} = models.PositiveSmallIntegerField($2)
 endsnippet
 
-snippet mslug "SlugField (mslug)"
+snippet mslug "SlugField" b
 ${1:FIELDNAME} = models.SlugField($2)
 endsnippet
 
-snippet msmallint "SmallIntegerField (msmallint)"
+snippet msmallint "SmallIntegerField" b
 ${1:FIELDNAME} = models.SmallIntegerField($2)
 endsnippet
 
-snippet mtext "TextField (mtext)"
+snippet mtext "TextField" b
 ${1:FIELDNAME} = models.TextField($2)
 endsnippet
 
-snippet mtime "TimeField (mtime)"
+snippet mtime "TimeField" b
 ${1:FIELDNAME} = models.TimeField($2)
 endsnippet
 
-snippet murl "URLField (murl)"
+snippet murl "URLField" b
 ${1:FIELDNAME} = models.URLField($2)
 endsnippet
 
-snippet musstate "USStateField (musstate)"
+snippet musstate "USStateField" b
 ${1:FIELDNAME} = models.USStateField($2)
 endsnippet
 
-snippet mxml "XMLField (mxml)"
+snippet mxml "XMLField" b
 ${1:FIELDNAME} = models.XMLField($2)
 endsnippet
 
-###########################################################################
-#                             VIEWS  SNIPPETS                             #
-###########################################################################
+# VIEWS SNIPPETS
 
-snippet adminview "Model Admin View" 
+snippet adminview "Model Admin View" b
 class ${1}Admin(admin.ModelAdmin):
-    '''
-        Admin View for ${1}
-    '''
-    list_display = ('${2}',)
-    list_filter = ('${3}',)
-    inlines = [
-        ${4}Inline,
-    ]
-    raw_id_fields = ('${5}',)
-    readonly_fields = ('${6}',)
-    search_fields = ['${7}']
+	'''
+		Admin View for ${1}
+	'''
+	list_display = ('${2}',)
+	list_filter = ('${3}',)
+	inlines = [
+		${4}Inline,
+	]
+	raw_id_fields = ('${5}',)
+	readonly_fields = ('${6}',)
+	search_fields = ['${7}']
 admin.site.register(${1}, ${1}Admin)
 endsnippet
 
-snippet createview "Generic Create View"
+snippet createview "Generic Create View" b
 class ${1:MODEL_NAME}CreateView(CreateView):
-    model = ${1:MODEL_NAME}
-    template_name = "${2:TEMPLATE_NAME}"
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet deleteview "Generic Delete View"
+snippet deleteview "Generic Delete View" b
 class ${1:MODEL_NAME}DeleteView(DeleteView):
-    model = ${1:MODEL_NAME}
-    template_name = "${2:TEMPLATE_NAME}"
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet detailview "Generic Detail View"
+snippet detailview "Generic Detail View" b
 class ${1:MODEL_NAME}DetailView(DetailView):
-    model = ${1:MODEL_NAME}
-    template_name = "${2:TEMPLATE_NAME}"
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet listview "Generic List View"
+snippet listview "Generic List View" b
 class ${1:MODEL_NAME}ListView(ListView):
-    model = ${1:MODEL_NAME}
-    template_name = "${2:TEMPLATE_NAME}"
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet stackedinline "Stacked Inline"
+snippet stackedinline "Stacked Inline" b
 class ${1}Inline(admin.StackedInline):
-      '''
-          Stacked Inline View for ${1}
-      '''
-      model = ${2:${1}}
-      min_num = ${3:3}
-      max_num = ${4:20}
-      extra = ${5:1}
-      raw_id_fields = (${6},)
+	'''
+	Stacked Inline View for ${1}
+	'''
+	model = ${2:${1}}
+	min_num = ${3:3}
+	max_num = ${4:20}
+	extra = ${5:1}
+	raw_id_fields = (${6},)
 endsnippet
 
-snippet tabularinline "Tabular Inline"
+snippet tabularinline "Tabular Inline" b
 class ${1}Inline(admin.TabularInline):
-      '''
-          Tabular Inline View for ${1}
-      '''
-      model = ${2:${1}}
-      min_num = ${3:3}
-      max_num = ${4:20}
-      extra = ${5:1}
-      raw_id_fields = (${6},)
+	'''
+	Tabular Inline View for ${1}
+	'''
+	model = ${2:${1}}
+	min_num = ${3:3}
+	max_num = ${4:20}
+	extra = ${5:1}
+	raw_id_fields = (${6},)
 endsnippet
 
-snippet templateview "Generic Template View"
+snippet templateview "Generic Template View" b
 class ${1:CLASS_NAME}(TemplateView):
-    template_name = "${2:TEMPLATE_NAME}"
+	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet updateview "Generic Update View"
+snippet updateview "Generic Update View" b
 class ${1:MODEL_NAME}UpdateView(UpdateView):
-    model = ${1:MODEL_NAME}
-    template_name = "${2:TEMPLATE_NAME}"
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
-snippet dispatch "Dispatch View method"
+snippet dispatch "Dispatch View method" b
 def dispatch(self, request, *args, **kwargs):
-    return super(${1:CLASS_NAME}, self).dispatch(request, *args, **kwargs)
+	return super(${1:CLASS_NAME}, self).dispatch(request, *args, **kwargs)
 endsnippet
 
-snippet context "get_context_data view method"
+snippet context "get_context_data view method" b
 def get_context_data(self, **kwargs):
-    context = super(${1:CLASS_NAME}, self).get_context_data(**kwargs)
-    return context
+	kwargs['extra_context'] = ${1:'New Value'}
+	return super(${2:CLASS_NAME}, self).get_context_data(**kwargs)
 endsnippet
diff --git a/UltiSnips/htmldjango.snippets b/UltiSnips/htmldjango.snippets
index 3c6bc59aa..c04fc9d4b 100644
--- a/UltiSnips/htmldjango.snippets
+++ b/UltiSnips/htmldjango.snippets
@@ -3,7 +3,7 @@ priority -50
 extends html
 
 # Generic Tags
-snippet %
+snippet % '' b
 {% ${1} %}${2}
 endsnippet
 
@@ -156,13 +156,13 @@ endsnippet
 
 snippet with
 {% with ${1} as ${2} %}
-	${3:$VISUAL}
+	${VISUAL}
 {% endwith %}
 endsnippet
 
 snippet verbatim
 {% verbatim %}
-	${1:$VISUAL}
+	${VISUAL}
 {% endverbatim %}
 endsnippet
 
@@ -175,7 +175,7 @@ snippet staticu
 endsnippet
 
 snippet static
-{% static "${1:$VISUAL}" %}
+{% static "${VISUAL}" %}
 endsnippet
 
 snippet mediau
@@ -183,7 +183,7 @@ snippet mediau
 endsnippet
 
 snippet iblock
-{% block ${1:blockname} %}${2:$VISUAL}{% endblock ${1:blockname} %}
+{% block ${1:blockname} %}${VISUAL}{% endblock $1 %}
 endsnippet
 
 snippet csfr
@@ -192,7 +192,7 @@ endsnippet
 
 snippet blocktrans
 {% blocktrans %}
-    ${1:$VISUAL}
+    ${VISUAL}
 {% endblocktrans %}
 endsnippet
 
diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 1b6391c75..3ee7d928e 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -1,7 +1,5 @@
 priority -50
 
-extends django
-
 ###########################################################################
 #                            TEXTMATE SNIPPETS                            #
 ###########################################################################

From 308dc53a4c1c6cd7e91c7eccc7483aab4bcaa8c6 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Sun, 2 Aug 2015 23:40:00 -0400
Subject: [PATCH 0682/1587] Test djangohtml options

---
 UltiSnips/htmldjango.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/htmldjango.snippets b/UltiSnips/htmldjango.snippets
index c04fc9d4b..4bb60f978 100644
--- a/UltiSnips/htmldjango.snippets
+++ b/UltiSnips/htmldjango.snippets
@@ -3,7 +3,7 @@ priority -50
 extends html
 
 # Generic Tags
-snippet % '' b
+snippet % b
 {% ${1} %}${2}
 endsnippet
 

From 7439b143fba4974e165d6e25e7f92e4a3241e90d Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Sun, 2 Aug 2015 23:41:17 -0400
Subject: [PATCH 0683/1587] Add some options to test on templates

---
 UltiSnips/htmldjango.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/htmldjango.snippets b/UltiSnips/htmldjango.snippets
index 4bb60f978..0ec67d6aa 100644
--- a/UltiSnips/htmldjango.snippets
+++ b/UltiSnips/htmldjango.snippets
@@ -3,7 +3,7 @@ priority -50
 extends html
 
 # Generic Tags
-snippet % b
+snippet % "" b
 {% ${1} %}${2}
 endsnippet
 

From 0af7853c6b671ffbc04ae14dd08263c29e7e0c0f Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Sun, 2 Aug 2015 23:51:19 -0400
Subject: [PATCH 0684/1587] Add some context for djangohtml

---
 UltiSnips/htmldjango.snippets | 128 +++++++++++++++++-----------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/UltiSnips/htmldjango.snippets b/UltiSnips/htmldjango.snippets
index 0ec67d6aa..ad5715049 100644
--- a/UltiSnips/htmldjango.snippets
+++ b/UltiSnips/htmldjango.snippets
@@ -3,200 +3,200 @@ priority -50
 extends html
 
 # Generic Tags
-snippet % "" b
+snippet % "" bi
 {% ${1} %}${2}
 endsnippet
 
-snippet %%
+snippet %% "" bi
 {% ${1:tag_name} %}
 	${2}
 {% end$1 %}
 endsnippet
 
-snippet {
+snippet { "" bi
 {{ ${1} }}${2}
 endsnippet
 
 # Template Tags
 
-snippet autoescape
+snippet autoescape "" bi
 {% autoescape ${1:off} %}
 	${2}
 {% endautoescape %}
 endsnippet
 
-snippet block
+snippet block "" bi
 {% block ${1} %}
 	${2}
 {% endblock $1 %}
 endsnippet
 
-snippet #
+snippet # "" bi
 {# ${1:comment} #}
 endsnippet
 
-snippet comment
+snippet comment "" bi
 {% comment %}
 	${1}
 {% endcomment %}
 endsnippet
 
-snippet cycle
+snippet cycle "" bi
 {% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
 endsnippet
 
-snippet debug
+snippet debug "" bi
 {% debug %}
 endsnippet
 
-snippet extends
+snippet extends "" bi
 {% extends "${1:base.html}" %}
 endsnippet
 
-snippet filter
+snippet filter "" bi
 {% filter ${1} %}
 	${2}
 {% endfilter %}
 endsnippet
 
-snippet firstof
+snippet firstof "" bi
 {% firstof ${1} %}
 endsnippet
 
-snippet for
+snippet for "" bi
 {% for ${1} in ${2} %}
 	${3}
 {% endfor %}
 endsnippet
 
-snippet empty
+snippet empty "" bi
 {% empty %}
 	${1}
 endsnippet
 
-snippet if
+snippet if "" bi
 {% if ${1} %}
 	${2}
 {% endif %}
 endsnippet
 
-snippet iif
+snippet iif "" bi
 {% if ${1} %}${2}{% endif %}
 endsnippet
 
-snippet ielse
+snippet ielse "" bi
 {% else %}${1}
 endsnippet
 
-snippet else
+snippet else "" bi
 {% else %}
 	${1}
 endsnippet
 
-snippet ielif
+snippet ielif "" bi
 {% elif %}${1}
 endsnippet
 
-snippet elif
+snippet elif "" bi
 {% elif %}
 	${1}
 endsnippet
 
-snippet ifchanged
+snippet ifchanged "" bi
 {% ifchanged %}${1}{% endifchanged %}
 endsnippet
 
-snippet ifequal
+snippet ifequal "" bi
 {% ifequal ${1} ${2} %}
 	${3}
 {% endifequal %}
 endsnippet
 
-snippet ifnotequal
+snippet ifnotequal "" bi
 {% ifnotequal ${1} ${2} %}
 	${3}
 {% endifnotequal %}
 endsnippet
 
-snippet include
+snippet include "" bi
 {% include "${1}" %}
 endsnippet
 
-snippet load
+snippet load "" bi
 {% load ${1} %}
 endsnippet
 
-snippet now
+snippet now "" bi
 {% now "${1:jS F Y H:i}" %}
 endsnippet
 
-snippet regroup
+snippet regroup "" bi
 {% regroup ${1} by ${2} as ${3} %}
 endsnippet
 
-snippet spaceless
+snippet spaceless "" bi
 {% spaceless %}${1}{% endspaceless %}
 endsnippet
 
-snippet ssi
+snippet ssi "" bi
 {% ssi ${1} %}
 endsnippet
 
-snippet trans
+snippet trans "" bi
 {% trans "${1:string}" %}
 endsnippet
 
-snippet url
+snippet url "" bi
 {% url ${1} as ${2} %}
 endsnippet
 
-snippet widthratio
+snippet widthratio "" bi
 {% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
 endsnippet
 
-snippet with
+snippet with "" bi
 {% with ${1} as ${2} %}
 	${VISUAL}
 {% endwith %}
 endsnippet
 
-snippet verbatim
+snippet verbatim "" bi
 {% verbatim %}
 	${VISUAL}
 {% endverbatim %}
 endsnippet
 
-snippet super
+snippet super "" bi
 {{ block.super }}
 endsnippet
 
-snippet staticu
+snippet staticu "" bi
 {{ STATIC_URL }}
 endsnippet
 
-snippet static
+snippet static "" bi
 {% static "${VISUAL}" %}
 endsnippet
 
-snippet mediau
+snippet mediau "" bi
 {{ MEDIA_URL }}
 endsnippet
 
-snippet iblock
+snippet iblock "" bi
 {% block ${1:blockname} %}${VISUAL}{% endblock $1 %}
 endsnippet
 
-snippet csfr
+snippet csfr "" bi
 {% csrf_token %}
 endsnippet
 
-snippet blocktrans
+snippet blocktrans "" bi
 {% blocktrans %}
     ${VISUAL}
 {% endblocktrans %}
 endsnippet
 
-snippet lorem
+snippet lorem "" bi
 {% lorem ${1} %}
 endsnippet
 
@@ -208,91 +208,91 @@ endsnippet
 
 # Note: Template tags that take no arguments are not implemented.
 
-snippet add
+snippet add "" bi
 add:"${1}"
 endsnippet
 
-snippet center
+snippet center "" bi
 center:"${1}"
 endsnippet
 
-snippet cut
+snippet cut "" bi
 cut:"${1}"
 endsnippet
 
-snippet date
+snippet date "" bi
 date:"${1}"
 endsnippet
 
-snippet default
+snippet default "" bi
 default:"${1}"
 endsnippet
 
-snippet defaultifnone
+snippet defaultifnone "" bi
 default_if_none:"${1}"
 endsnippet
 
-snippet dictsort
+snippet dictsort "" bi
 dictsort:"${1}"
 endsnippet
 
-snippet dictsortrev
+snippet dictsortrev "" bi
 dictsortreversed:"${1}"
 endsnippet
 
-snippet divisibleby
+snippet divisibleby "" bi
 divisibleby:"${1}"
 endsnippet
 
-snippet floatformat
+snippet floatformat "" bi
 floatformat:"${1}"
 endsnippet
 
-snippet getdigit
+snippet getdigit "" bi
 get_digit:"${1}"
 endsnippet
 
-snippet join
+snippet join "" bi
 join:"${1}"
 endsnippet
 
-snippet lengthis
+snippet lengthis "" bi
 length_is:"${1}"
 endsnippet
 
-snippet pluralize
+snippet pluralize "" bi
 pluralize:"${1}"
 endsnippet
 
-snippet removetags
+snippet removetags "" bi
 removetags:"${1}"
 endsnippet
 
-snippet slice
+snippet slice "" bi
 slice:"${1}"
 endsnippet
 
-snippet stringformat
+snippet stringformat "" bi
 stringformat:"${1}"
 endsnippet
 
-snippet time
+snippet time "" bi
 time:"${1}"
 endsnippet
 
-snippet truncatewords
+snippet truncatewords "" bi
 truncatewords:${1}
 endsnippet
 
-snippet truncatewordshtml
+snippet truncatewordshtml "" bi
 truncatewords_html:${1}
 endsnippet
 
-snippet urlizetrunc
+snippet urlizetrunc "" bi
 urlizetrunc:${1}
 endsnippet
 
-snippet wordwrap
+snippet wordwrap "" bi
 wordwrap:${1}
 endsnippet
 

From 97ca04d5044b52d50fdd5038dd25617d01163053 Mon Sep 17 00:00:00 2001
From: Sergey Lebedev <s.lebedev@li.ru>
Date: Tue, 4 Aug 2015 14:52:52 +0300
Subject: [PATCH 0685/1587] added small snippet for use python3 interpreter

---
 snippets/python.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index ea5f2c98f..faf144c34 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -1,6 +1,9 @@
 snippet #!
 	#!/usr/bin/env python
 	# -*- coding: utf-8 -*-
+snippet #!3
+	#!/usr/bin/env python3
+	# -*- coding: utf-8 -*-
 snippet imp
 	import ${0:module}
 snippet uni

From 2fdfe801b8331d44a8048f534c296f594f0d83cb Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 4 Aug 2015 13:22:58 +0100
Subject: [PATCH 0686/1587] Test: Remove superfluous semicolons

---
 tests.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests.sh b/tests.sh
index 5b93b6baf..07f0ff315 100755
--- a/tests.sh
+++ b/tests.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
-SPACED=$(grep -REn '^ .+' --include '*.snippets' snippets);
+SPACED=$(grep -REn '^ .+' --include '*.snippets' snippets)
 
 if [[ $? -ne 1 ]]; then
-  echo These snippet lines are indented with spaces:;
-  echo;
-  echo "$SPACED";
-  echo;
+  echo These snippet lines are indented with spaces:
+  echo
+  echo "$SPACED"
+  echo
   echo Tests failed!
-  exit 1;
+  exit 1
 fi
 
 echo Tests passed!
-exit 0;
+exit 0

From a463438a3d238396a884b420400ccffaaf106a49 Mon Sep 17 00:00:00 2001
From: twabiko <wabiko.takuma@gmail.com>
Date: Tue, 4 Aug 2015 22:24:24 +0900
Subject: [PATCH 0687/1587] fix typo.

---
 snippets/rst.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index f4d99d7ad..72263ece6 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -56,7 +56,7 @@ snippet err:
 snippet cau:
 	.. caution::
 		${0:Watch out!}
-#Spinx only
+#Sphinx only
 snippet sid:
 	.. sidebar:: ${1:Title}
 

From d4e3f9193e4e2d65820a4ed005600930efc31651 Mon Sep 17 00:00:00 2001
From: twabiko <wabiko.takuma@gmail.com>
Date: Tue, 4 Aug 2015 22:30:38 +0900
Subject: [PATCH 0688/1587] add 'todo' for Sphinx.

---
 snippets/rst.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index 72263ece6..f79be0b94 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -60,6 +60,9 @@ snippet cau:
 snippet sid:
 	.. sidebar:: ${1:Title}
 
+		${0}
+snippet tod:
+	.. todo::
 		${0}
 # CJK optimize, CJK has no space between charaters
 snippet *c

From 59fcc690bc478f71f30f3a32f1e1d10b344525a1 Mon Sep 17 00:00:00 2001
From: twabiko <wabiko.takuma@gmail.com>
Date: Tue, 4 Aug 2015 22:37:56 +0900
Subject: [PATCH 0689/1587] add 'list-tables' for Sphinx

---
 snippets/rst.snippets | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index f79be0b94..c407dbba1 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -64,6 +64,21 @@ snippet sid:
 snippet tod:
 	.. todo::
 		${0}
+snippet tod:
+	.. list-table:: ${0:Title}
+		:header-rows: 1
+		:stub-columns: 1
+
+	* - x1,y1
+	  - x2,y1
+	  - x3,y1
+	* - x1,y2
+	  - x2,y2
+	  - x3,y2
+	* - x1,y3
+	  - x2,y3
+	  - x3,y3
+
 # CJK optimize, CJK has no space between charaters
 snippet *c
 	\ *${1:Emphasis}*\ ${0}

From 6340f55102b5eb899fb42593695d5f24be577f7d Mon Sep 17 00:00:00 2001
From: twabiko <wabiko.takuma@gmail.com>
Date: Tue, 4 Aug 2015 22:40:27 +0900
Subject: [PATCH 0690/1587] add 'toc-tree' for Sphinx

---
 snippets/rst.snippets | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index c407dbba1..e845b8b76 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -64,21 +64,26 @@ snippet sid:
 snippet tod:
 	.. todo::
 		${0}
-snippet tod:
+snippet lis:
 	.. list-table:: ${0:Title}
 		:header-rows: 1
 		:stub-columns: 1
 
-	* - x1,y1
-	  - x2,y1
-	  - x3,y1
-	* - x1,y2
-	  - x2,y2
-	  - x3,y2
-	* - x1,y3
-	  - x2,y3
-	  - x3,y3
+		* - x1,y1
+		  - x2,y1
+		  - x3,y1
+		* - x1,y2
+		  - x2,y2
+		  - x3,y2
+		* - x1,y3
+		  - x2,y3
+		  - x3,y3
+
+snippet toc:
+	.. toctree::
+		:maxdepth: 2
 
+		${0}
 # CJK optimize, CJK has no space between charaters
 snippet *c
 	\ *${1:Emphasis}*\ ${0}

From c8d852e3ab868572f45e974a94d060859ede0dde Mon Sep 17 00:00:00 2001
From: twabiko <wabiko.takuma@gmail.com>
Date: Tue, 4 Aug 2015 22:43:52 +0900
Subject: [PATCH 0691/1587] add 'download' for Sphinx

---
 snippets/rst.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index e845b8b76..2ed26f077 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -84,6 +84,8 @@ snippet toc:
 		:maxdepth: 2
 
 		${0}
+snippet dow:
+	:download:`${0:text} <${1:path}>`
 # CJK optimize, CJK has no space between charaters
 snippet *c
 	\ *${1:Emphasis}*\ ${0}

From 081380e73a7385a883e785615587cf55df2c14e9 Mon Sep 17 00:00:00 2001
From: twabiko <wabiko.takuma@gmail.com>
Date: Tue, 4 Aug 2015 22:45:32 +0900
Subject: [PATCH 0692/1587] add 'ref' for Sphinx

---
 snippets/rst.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index 2ed26f077..65d7a458e 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -86,6 +86,8 @@ snippet toc:
 		${0}
 snippet dow:
 	:download:`${0:text} <${1:path}>`
+snippet ref:
+	:ref:`${0:text} <${1:path}>`
 # CJK optimize, CJK has no space between charaters
 snippet *c
 	\ *${1:Emphasis}*\ ${0}

From 3809ffb17a717fa5fcfc767e9ce4ed8073de0b32 Mon Sep 17 00:00:00 2001
From: twabiko <wabiko.takuma@gmail.com>
Date: Tue, 4 Aug 2015 22:46:18 +0900
Subject: [PATCH 0693/1587] add 'doc' for Sphinx

---
 snippets/rst.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index 65d7a458e..b1852458f 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -88,6 +88,8 @@ snippet dow:
 	:download:`${0:text} <${1:path}>`
 snippet ref:
 	:ref:`${0:text} <${1:path}>`
+snippet doc:
+	:doc:`${0:text} <${1:path}>`
 # CJK optimize, CJK has no space between charaters
 snippet *c
 	\ *${1:Emphasis}*\ ${0}

From ba44606abdc76003555dca66d3153883f38a7531 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz Carballo <lcruzc@linkux-it.com>
Date: Wed, 5 Aug 2015 08:28:51 -0400
Subject: [PATCH 0694/1587] Add default __str__ method

---
 UltiSnips/django.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 62715942c..eabd80f74 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -130,7 +130,7 @@ class ${1:MODELNAME}(models.Model):
 		verbose_name_plural = "$1s"
 
 	def __str__(self):
-		pass
+		return super($1, self).__str__()
 
 endsnippet
 

From 7f327c60ea3cb17432e85267e1150f28c0eae4f9 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 10 Aug 2015 20:31:01 +0100
Subject: [PATCH 0695/1587] Supercollider: Add first snippets

---
 README.md                       |  1 +
 snippets/supercollider.snippets | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 snippets/supercollider.snippets

diff --git a/README.md b/README.md
index 8b24a2b4f..4522ccee2 100644
--- a/README.md
+++ b/README.md
@@ -234,6 +234,7 @@ This list is kept up-to-date on a best effort basis.
 * Python - [honza](http://github.com/honza)
 * Ruby - [taq](http://github.com/taq)
 * Scala - [gorodinskiy](https://github.com/gorodinskiy)
+* Supercollider - [lpil](https://github.com/lpil)
 
 License
 -------
diff --git a/snippets/supercollider.snippets b/snippets/supercollider.snippets
new file mode 100644
index 000000000..0d54cc064
--- /dev/null
+++ b/snippets/supercollider.snippets
@@ -0,0 +1,14 @@
+snippet b
+	(
+		${0}
+	)
+snippet if
+	if (${1}) {
+		${0}
+	}
+snippet ife
+	if (${1}) {
+		${2}
+	} {
+		${0}
+	}

From bf34d94bac96eac78ab89f9d9f7d66bbf294088d Mon Sep 17 00:00:00 2001
From: Ruben Vereecken <rubenvereecken@gmail.com>
Date: Tue, 11 Aug 2015 20:35:59 +0200
Subject: [PATCH 0696/1587] Deleted newline

It broke the comments.
---
 snippets/javascript/javascript.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 9215c879c..2549f0674 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -203,7 +203,6 @@ snippet @par
 	@param {${1:type}} ${2:name} ${0:description}
 snippet @ret
 	@return {${1:type}} ${0:description}
-
 # JSON
 
 # JSON.parse

From c00f373485c890d48909eb2fdb65ced6e108e206 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 14 Aug 2015 14:32:20 +0100
Subject: [PATCH 0697/1587] Supercollider: for snippets

---
 UltiSnips/supercollider.snippets | 5 +++++
 snippets/supercollider.snippets  | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 UltiSnips/supercollider.snippets

diff --git a/UltiSnips/supercollider.snippets b/UltiSnips/supercollider.snippets
new file mode 100644
index 000000000..d59ce4302
--- /dev/null
+++ b/UltiSnips/supercollider.snippets
@@ -0,0 +1,5 @@
+snippet for
+for (${1:1}, ${2:10}) {${3: |i}|}
+	$0
+}
+endsnippet
diff --git a/snippets/supercollider.snippets b/snippets/supercollider.snippets
index 0d54cc064..39ab6a7d6 100644
--- a/snippets/supercollider.snippets
+++ b/snippets/supercollider.snippets
@@ -12,3 +12,7 @@ snippet ife
 	} {
 		${0}
 	}
+snippet for
+	for (${1:1}, ${2:10}) { |i|
+		${0}
+	}

From 9b43dbc3db54b16daf327f296e090b2e19e37706 Mon Sep 17 00:00:00 2001
From: ricardogcolombo <ricardogcolombo@gmail.com>
Date: Fri, 14 Aug 2015 13:31:29 -0300
Subject: [PATCH 0698/1587] rename openui5 snippets file according to the
 standard nomenclature

---
 .../javascript_openui5.snippets                                   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename snippets/javascript/javascript.openui5.snippets => UltiSnips/javascript_openui5.snippets (100%)

diff --git a/snippets/javascript/javascript.openui5.snippets b/UltiSnips/javascript_openui5.snippets
similarity index 100%
rename from snippets/javascript/javascript.openui5.snippets
rename to UltiSnips/javascript_openui5.snippets

From 8b2a7120075cc67c1e7bb49decdfc01af7ecb830 Mon Sep 17 00:00:00 2001
From: Yves Lange <kursion@gmail.com>
Date: Fri, 14 Aug 2015 14:26:25 +0200
Subject: [PATCH 0699/1587] Adding reactJS for coffeescript support

---
 UltiSnips/coffee-react.snippets | 80 +++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 UltiSnips/coffee-react.snippets

diff --git a/UltiSnips/coffee-react.snippets b/UltiSnips/coffee-react.snippets
new file mode 100644
index 000000000..4cdb40f83
--- /dev/null
+++ b/UltiSnips/coffee-react.snippets
@@ -0,0 +1,80 @@
+#
+# CoffeeScript versions -- adapted from coffee-jasmine
+# for some ReactJS matchers.
+#
+priority -50
+
+extends coffee
+
+priority -49
+
+snippet createClass "React define Class" b
+${1:classname}Class = React.createClass
+	displayName: "$1"
+	render: ->
+		${2}
+$1 = React.createFactory($1)
+endsnippet
+
+snippet PropTypes "React define propTypes" b
+propTypes: ->
+	${1:myVar}: React.PropTypes.${2:type}${3:.isRequired}
+endsnippet
+
+snippet propType "React propType (key/value)" b
+${1:myVar}: React.PropTypes.${2:type}${3:.isRequired}
+${4}
+endsnippet
+
+snippet setState "React setState" b
+@setState
+	${1:myvar}: ${2:myvalue}
+	${3}
+endsnippet
+
+snippet getInitialState "React define getInitialState" b
+getInitialState: ->
+	${1:myvar}: ${2:myvalue}
+	${3}
+endsnippet
+
+snippet getDefaultProps "React define getDefaultProps" b
+getDefaultProps: ->
+	${1:myvar}: ${2:myvalue}
+	${3}
+endsnippet
+
+snippet componentWillMount "React define componentWillMount" b
+componentWillMount: ->
+	${1}
+endsnippet
+
+snippet componentDidMount "React define componentDidMount" b
+componentDidMount: ->
+	${1}
+endsnippet
+
+snippet componentWillReceiveProps "React define componentWillReceiveProps" b
+componentWillReceiveProps: (nextProps) ->
+	${1}
+endsnippet
+
+snippet shouldComponentUpdate "React define shouldComponentUpdate" b
+shouldComponentUpdate: (nextProps, nextState) ->
+	${1}
+endsnippet
+
+snippet componentWillUpdate "React define componentWillUpdate" b
+componentWillUpdate: (nextProps, nextState) ->
+	${1}
+endsnippet
+
+snippet componentDidUpdate "React define componentDidUpdate" b
+componentDidUpdate: (prevProps, prevState) ->
+	${1}
+endsnippet
+
+snippet componentWillUnmount "React define componentWillUnmount" b
+componentWillUnmount: ->
+	${1}
+endsnippet

From ab03bcfac17ad8d7cb79916e636efa8e89d6f8bb Mon Sep 17 00:00:00 2001
From: Yves Lange <kursion@gmail.com>
Date: Mon, 17 Aug 2015 09:58:52 +0200
Subject: [PATCH 0700/1587] Adding coffeescript kv ('key:value') snippet

---
 UltiSnips/coffee.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
index 467b2b57c..75e7d0628 100644
--- a/UltiSnips/coffee.snippets
+++ b/UltiSnips/coffee.snippets
@@ -94,3 +94,7 @@ endsnippet
 snippet log "Log" b
 console.log ${1:"${2:msg}"}
 endsnippet
+
+snippet kv "Key:value for object" b
+${1:key}:${2:value}
+endsnippet

From 5529c28c27387ec40915b8e0ffab80c91390bb8e Mon Sep 17 00:00:00 2001
From: Markus Benning <ich@markusbenning.de>
Date: Mon, 17 Aug 2015 12:37:07 +0200
Subject: [PATCH 0701/1587] fix case of 'Desc' attribute in puppet/yumrepo
 snippet

Attribute 'Desc' must be changed to lowercase.
---
 snippets/puppet.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index 8b0a41090..9e9ceeb2b 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -221,7 +221,7 @@ snippet package
 
 snippet yumrepo
 	yumrepo { "${1:repo name}":
-		Descr   => "${2:$1}",
+		descr   => "${2:$1}",
 		enabled => ${0:1},
 	}
 

From 2a173a59f25f92e00466fd49465e1fb49174746e Mon Sep 17 00:00:00 2001
From: netei <edgar.hipp@netapsys.fr>
Date: Wed, 19 Aug 2015 14:08:02 +0200
Subject: [PATCH 0702/1587] Update javascript.snippets : f should expand near
 words

If you write

`http.get(f`

and hit tab, `f` won't be expanded to the function snippet.

This merge request fixes this, by specifying that it should be expanded near **w**ord boundaries.

>    w   Word boundary - With this option, the snippet is expanded if
>       the tab trigger start matches a word boundary and the tab trigger end
>       matches a word boundary. In other words the tab trigger must be
>       preceded and followed by non-word characters. Word characters are
>       defined by the 'iskeyword' setting. Use this option, for example, to
>       permit expansion where the tab trigger follows punctuation without
>       expanding suffixes of larger words.
---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 2549f0674..c8807b840 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -11,7 +11,7 @@ snippet fun
 		${0}
 	}
 # Anonymous Function
-snippet f
+snippet f "" w
 	function(${1}) {
 		${0}
 	}

From 6da30ab4b3f5530858162b0636dc24fd2cb6eadb Mon Sep 17 00:00:00 2001
From: SevereOverfl0w <overfl0w@narna.co>
Date: Sun, 23 Aug 2015 11:18:21 +0100
Subject: [PATCH 0703/1587] fix stylus indentation.

---
 snippets/stylus.snippets | 994 +++++++++++++++++++--------------------
 1 file changed, 497 insertions(+), 497 deletions(-)

diff --git a/snippets/stylus.snippets b/snippets/stylus.snippets
index d03d1781e..205f84792 100644
--- a/snippets/stylus.snippets
+++ b/snippets/stylus.snippets
@@ -1,993 +1,993 @@
 snippet !
-		!important
+	!important
 snippet bdi:m+
-		-moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+	-moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:m
-		-moz-border-image ${0}
+	-moz-border-image ${0}
 snippet bdrz:m
-		-moz-border-radius ${0}
+	-moz-border-radius ${0}
 snippet bxsh:m+
-		-moz-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+	-moz-box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh:m
-		-moz-box-shadow ${0}
+	-moz-box-shadow ${0}
 snippet bdi:w+
-		-webkit-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+	-webkit-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:w
-		-webkit-border-image ${0}
+	-webkit-border-image ${0}
 snippet bdrz:w
-		-webkit-border-radius ${0}
+	-webkit-border-radius ${0}
 snippet bxsh:w+
-		-webkit-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+	-webkit-box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh:w
-		-webkit-box-shadow ${0}
+	-webkit-box-shadow ${0}
 snippet @f
-		@font-face ${0}
+	@font-face ${0}
 snippet @i
-		@import '${0}'
+	@import '${0}'
 snippet @r
-		@require '${0}'
+	@require '${0}'
 snippet @m
-		@media ${1:screen}
+	@media ${1:screen}
 snippet @msmw
-		@media screen and (min-width: ${0}px)
+	@media screen and (min-width: ${0}px)
 snippet @ext
-		@extend .${1}
-		${0}
+	@extend .${1}
+	${0}
 snippet bg+
-		background ${1} url(${2}) ${3:0} ${4:0} ${0:no-repeat}
+	background ${1} url(${2}) ${3:0} ${4:0} ${0:no-repeat}
 snippet bga
-		background-attachment ${0}
+	background-attachment ${0}
 snippet bga:f
-		background-attachment fixed
+	background-attachment fixed
 snippet bga:s
-		background-attachment scroll
+	background-attachment scroll
 snippet bgbk
-		background-break ${0}
+	background-break ${0}
 snippet bgbk:bb
-		background-break bounding-box
+	background-break bounding-box
 snippet bgbk:c
-		background-break continuous
+	background-break continuous
 snippet bgbk:eb
-		background-break each-box
+	background-break each-box
 snippet bgcp
-		background-clip ${0}
+	background-clip ${0}
 snippet bgcp:bb
-		background-clip border-box
+	background-clip border-box
 snippet bgcp:cb
-		background-clip content-box
+	background-clip content-box
 snippet bgcp:nc
-		background-clip no-clip
+	background-clip no-clip
 snippet bgcp:pb
-		background-clip padding-box
+	background-clip padding-box
 snippet bgc
-		background-color ${0}
+	background-color ${0}
 snippet bgc:t
-		background-color transparent
+	background-color transparent
 snippet bgi
-		background-image url(${0})
+	background-image url(${0})
 snippet bgi:n
-		background-image none
+	background-image none
 snippet bgo
-		background-origin ${0}
+	background-origin ${0}
 snippet bgo:bb
-		background-origin border-box
+	background-origin border-box
 snippet bgo:cb
-		background-origin content-box
+	background-origin content-box
 snippet bgo:pb
-		background-origin padding-box
+	background-origin padding-box
 snippet bgpx
-		background-position-x ${0}
+	background-position-x ${0}
 snippet bgpy
-		background-position-y ${0}
+	background-position-y ${0}
 snippet bgp
-		background-position ${1:0} ${0:0}
+	background-position ${1:0} ${0:0}
 snippet bgr
-		background-repeat ${0}
+	background-repeat ${0}
 snippet bgr:n
-		background-repeat no-repeat
+	background-repeat no-repeat
 snippet bgr:x
-		background-repeat repeat-x
+	background-repeat repeat-x
 snippet bgr:y
-		background-repeat repeat-y
+	background-repeat repeat-y
 snippet bgr:r
-		background-repeat repeat
+	background-repeat repeat
 snippet bgz
-		background-size ${0}
+	background-size ${0}
 snippet bgz:a
-		background-size auto
+	background-size auto
 snippet bgz:ct
-		background-size contain
+	background-size contain
 snippet bgz:cv
-		background-size cover
+	background-size cover
 snippet bg
-		background ${0}
+	background ${0}
 snippet bg:ie
-		filter progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
+	filter progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
 snippet bg:n
-		background none
+	background none
 snippet bd+
-		border ${1:1px} ${2:solid} ${0}
+	border ${1:1px} ${2:solid} ${0}
 snippet bdb+
-		border-bottom ${1:1px} ${2:solid} ${0}
+	border-bottom ${1:1px} ${2:solid} ${0}
 snippet bdbc
-		border-bottom-color ${0}
+	border-bottom-color ${0}
 snippet bdbi
-		border-bottom-image url(${0})
+	border-bottom-image url(${0})
 snippet bdbi:n
-		border-bottom-image none
+	border-bottom-image none
 snippet bdbli
-		border-bottom-left-image url(${0})
+	border-bottom-left-image url(${0})
 snippet bdbli:c
-		border-bottom-left-image continue
+	border-bottom-left-image continue
 snippet bdbli:n
-		border-bottom-left-image none
+	border-bottom-left-image none
 snippet bdblrz
-		border-bottom-left-radius ${0}
+	border-bottom-left-radius ${0}
 snippet bdbri
-		border-bottom-right-image url(${0})
+	border-bottom-right-image url(${0})
 snippet bdbri:c
-		border-bottom-right-image continue
+	border-bottom-right-image continue
 snippet bdbri:n
-		border-bottom-right-image none
+	border-bottom-right-image none
 snippet bdbrrz
-		border-bottom-right-radius ${0}
+	border-bottom-right-radius ${0}
 snippet bdbs
-		border-bottom-style ${0}
+	border-bottom-style ${0}
 snippet bdbs:n
-		border-bottom-style none
+	border-bottom-style none
 snippet bdbw
-		border-bottom-width ${0}
+	border-bottom-width ${0}
 snippet bdb
-		border-bottom ${0}
+	border-bottom ${0}
 snippet bdb:n
-		border-bottom none
+	border-bottom none
 snippet bdbk
-		border-break ${0}
+	border-break ${0}
 snippet bdbk:c
-		border-break close
+	border-break close
 snippet bdcl
-		border-collapse ${0}
+	border-collapse ${0}
 snippet bdcl:c
-		border-collapse collapse
+	border-collapse collapse
 snippet bdcl:s
-		border-collapse separate
+	border-collapse separate
 snippet bdc
-		border-color ${0}
+	border-color ${0}
 snippet bdci
-		border-corner-image url(${0})
+	border-corner-image url(${0})
 snippet bdci:c
-		border-corner-image continue
+	border-corner-image continue
 snippet bdci:n
-		border-corner-image none
+	border-corner-image none
 snippet bdf
-		border-fit ${0}
+	border-fit ${0}
 snippet bdf:c
-		border-fit clip
+	border-fit clip
 snippet bdf:of
-		border-fit overwrite
+	border-fit overwrite
 snippet bdf:ow
-		border-fit overwrite
+	border-fit overwrite
 snippet bdf:r
-		border-fit repeat
+	border-fit repeat
 snippet bdf:sc
-		border-fit scale
+	border-fit scale
 snippet bdf:sp
-		border-fit space
+	border-fit space
 snippet bdf:st
-		border-fit stretch
+	border-fit stretch
 snippet bdi
-		border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+	border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:n
-		border-image none
+	border-image none
 snippet bdl+
-		border-left ${1:1px} ${2:solid} ${0}
+	border-left ${1:1px} ${2:solid} ${0}
 snippet bdlc
-		border-left-color ${0}
+	border-left-color ${0}
 snippet bdli
-		border-left-image url(${0})
+	border-left-image url(${0})
 snippet bdli:n
-		border-left-image none
+	border-left-image none
 snippet bdls
-		border-left-style ${0}
+	border-left-style ${0}
 snippet bdls:n
-		border-left-style none
+	border-left-style none
 snippet bdlw
-		border-left-width ${0}
+	border-left-width ${0}
 snippet bdl
-		border-left ${0}
+	border-left ${0}
 snippet bdl:n
-		border-left none
+	border-left none
 snippet bdlt
-		border-length ${0}
+	border-length ${0}
 snippet bdlt:a
-		border-length auto
+	border-length auto
 snippet bdrz
-		border-radius ${0}
+	border-radius ${0}
 snippet bdr+
-		border-right ${1:1px} ${2:solid} ${0}
+	border-right ${1:1px} ${2:solid} ${0}
 snippet bdrc
-		border-right-color ${0}
+	border-right-color ${0}
 snippet bdri
-		border-right-image url(${0})
+	border-right-image url(${0})
 snippet bdri:n
-		border-right-image none
+	border-right-image none
 snippet bdrs
-		border-right-style ${0}
+	border-right-style ${0}
 snippet bdrs:n
-		border-right-style none
+	border-right-style none
 snippet bdrw
-		border-right-width ${0}
+	border-right-width ${0}
 snippet bdr
-		border-right ${0}
+	border-right ${0}
 snippet bdr:n
-		border-right none
+	border-right none
 snippet bdsp
-		border-spacing ${0}
+	border-spacing ${0}
 snippet bds
-		border-style ${0}
+	border-style ${0}
 snippet bds:ds
-		border-style dashed
+	border-style dashed
 snippet bds:dtds
-		border-style dot-dash
+	border-style dot-dash
 snippet bds:dtdtds
-		border-style dot-dot-dash
+	border-style dot-dot-dash
 snippet bds:dt
-		border-style dotted
+	border-style dotted
 snippet bds:db
-		border-style double
+	border-style double
 snippet bds:g
-		border-style groove
+	border-style groove
 snippet bds:h
-		border-style hidden
+	border-style hidden
 snippet bds:i
-		border-style inset
+	border-style inset
 snippet bds:n
-		border-style none
+	border-style none
 snippet bds:o
-		border-style outset
+	border-style outset
 snippet bds:r
-		border-style ridge
+	border-style ridge
 snippet bds:s
-		border-style solid
+	border-style solid
 snippet bds:w
-		border-style wave
+	border-style wave
 snippet bdt+
-		border-top ${1:1px} ${2:solid} ${0}
+	border-top ${1:1px} ${2:solid} ${0}
 snippet bdtc
-		border-top-color ${0}
+	border-top-color ${0}
 snippet bdti
-		border-top-image url(${0})
+	border-top-image url(${0})
 snippet bdti:n
-		border-top-image none
+	border-top-image none
 snippet bdtli
-		border-top-left-image url(${0})
+	border-top-left-image url(${0})
 snippet bdtli:c
-		border-corner-image continue
+	border-corner-image continue
 snippet bdtli:n
-		border-corner-image none
+	border-corner-image none
 snippet bdtlrz
-		border-top-left-radius ${0}
+	border-top-left-radius ${0}
 snippet bdtri
-		border-top-right-image url(${0})
+	border-top-right-image url(${0})
 snippet bdtri:c
-		border-top-right-image continue
+	border-top-right-image continue
 snippet bdtri:n
-		border-top-right-image none
+	border-top-right-image none
 snippet bdtrrz
-		border-top-right-radius ${0}
+	border-top-right-radius ${0}
 snippet bdts
-		border-top-style ${0}
+	border-top-style ${0}
 snippet bdts:n
-		border-top-style none
+	border-top-style none
 snippet bdtw
-		border-top-width ${0}
+	border-top-width ${0}
 snippet bdt
-		border-top ${0}
+	border-top ${0}
 snippet bdt:n
-		border-top none
+	border-top none
 snippet bdw
-		border-width ${0}
+	border-width ${0}
 snippet bd
-		border ${0}
+	border ${0}
 snippet bd:n
-		border none
+	border none
 snippet b
-		bottom ${0}
+	bottom ${0}
 snippet b:a
-		bottom auto
+	bottom auto
 snippet bxsh+
-		box-shadow ${1:0} ${2:0} ${3:0} ${0}
+	box-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet bxsh
-		box-shadow ${0}
+	box-shadow ${0}
 snippet bxsh:n
-		box-shadow none
+	box-shadow none
 snippet bxz
-		box-sizing ${0}
+	box-sizing ${0}
 snippet bxz:bb
-		box-sizing border-box
+	box-sizing border-box
 snippet bxz:cb
-		box-sizing content-box
+	box-sizing content-box
 snippet cps
-		caption-side ${0}
+	caption-side ${0}
 snippet cps:b
-		caption-side bottom
+	caption-side bottom
 snippet cps:t
-		caption-side top
+	caption-side top
 snippet cl
-		clear ${0}
+	clear ${0}
 snippet cl:b
-		clear both
+	clear both
 snippet cl:l
-		clear left
+	clear left
 snippet cl:n
-		clear none
+	clear none
 snippet cl:r
-		clear right
+	clear right
 snippet cp
-		clip ${0}
+	clip ${0}
 snippet cp:a
-		clip auto
+	clip auto
 snippet cp:r
-		clip rect(${1:0} ${2:0} ${3:0} ${0:0})
+	clip rect(${1:0} ${2:0} ${3:0} ${0:0})
 snippet c
-		color ${0}
+	color ${0}
 snippet ct
-		content ${0}
+	content ${0}
 snippet ct:a
-		content attr(${0})
+	content attr(${0})
 snippet ct:cq
-		content close-quote
+	content close-quote
 snippet ct:c
-		content counter(${0})
+	content counter(${0})
 snippet ct:cs
-		content counters(${0})
+	content counters(${0})
 snippet ct:ncq
-		content no-close-quote
+	content no-close-quote
 snippet ct:noq
-		content no-open-quote
+	content no-open-quote
 snippet ct:n
-		content normal
+	content normal
 snippet ct:oq
-		content open-quote
+	content open-quote
 snippet coi
-		counter-increment ${0}
+	counter-increment ${0}
 snippet cor
-		counter-reset ${0}
+	counter-reset ${0}
 snippet cur
-		cursor ${0}
+	cursor ${0}
 snippet cur:a
-		cursor auto
+	cursor auto
 snippet cur:c
-		cursor crosshair
+	cursor crosshair
 snippet cur:d
-		cursor default
+	cursor default
 snippet cur:ha
-		cursor hand
+	cursor hand
 snippet cur:he
-		cursor help
+	cursor help
 snippet cur:m
-		cursor move
+	cursor move
 snippet cur:p
-		cursor pointer
+	cursor pointer
 snippet cur:t
-		cursor text
+	cursor text
 snippet d
-		display ${0}
+	display ${0}
 snippet d:mib
-		display -moz-inline-box
+	display -moz-inline-box
 snippet d:mis
-		display -moz-inline-stack
+	display -moz-inline-stack
 snippet d:b
-		display block
+	display block
 snippet d:cp
-		display compact
+	display compact
 snippet d:ib
-		display inline-block
+	display inline-block
 snippet d:itb
-		display inline-table
+	display inline-table
 snippet d:i
-		display inline
+	display inline
 snippet d:li
-		display list-item
+	display list-item
 snippet d:n
-		display none
+	display none
 snippet d:ri
-		display run-in
+	display run-in
 snippet d:tbcp
-		display table-caption
+	display table-caption
 snippet d:tbc
-		display table-cell
+	display table-cell
 snippet d:tbclg
-		display table-column-group
+	display table-column-group
 snippet d:tbcl
-		display table-column
+	display table-column
 snippet d:tbfg
-		display table-footer-group
+	display table-footer-group
 snippet d:tbhg
-		display table-header-group
+	display table-header-group
 snippet d:tbrg
-		display table-row-group
+	display table-row-group
 snippet d:tbr
-		display table-row
+	display table-row
 snippet d:tb
-		display table
+	display table
 snippet ec
-		empty-cells ${0}
+	empty-cells ${0}
 snippet ec:h
-		empty-cells hide
+	empty-cells hide
 snippet ec:s
-		empty-cells show
+	empty-cells show
 snippet exp
-		expression()
+	expression()
 snippet fl
-		float ${0}
+	float ${0}
 snippet fl:l
-		float left
+	float left
 snippet fl:n
-		float none
+	float none
 snippet fl:r
-		float right
+	float right
 snippet f+
-		font ${1:1em} ${2:Arial},${0:sans-serif}
+	font ${1:1em} ${2:Arial},${0:sans-serif}
 snippet fef
-		font-effect ${0}
+	font-effect ${0}
 snippet fef:eb
-		font-effect emboss
+	font-effect emboss
 snippet fef:eg
-		font-effect engrave
+	font-effect engrave
 snippet fef:n
-		font-effect none
+	font-effect none
 snippet fef:o
-		font-effect outline
+	font-effect outline
 snippet femp
-		font-emphasize-position ${0}
+	font-emphasize-position ${0}
 snippet femp:a
-		font-emphasize-position after
+	font-emphasize-position after
 snippet femp:b
-		font-emphasize-position before
+	font-emphasize-position before
 snippet fems
-		font-emphasize-style ${0}
+	font-emphasize-style ${0}
 snippet fems:ac
-		font-emphasize-style accent
+	font-emphasize-style accent
 snippet fems:c
-		font-emphasize-style circle
+	font-emphasize-style circle
 snippet fems:ds
-		font-emphasize-style disc
+	font-emphasize-style disc
 snippet fems:dt
-		font-emphasize-style dot
+	font-emphasize-style dot
 snippet fems:n
-		font-emphasize-style none
+	font-emphasize-style none
 snippet fem
-		font-emphasize ${0}
+	font-emphasize ${0}
 snippet ff
-		font-family ${0}
+	font-family ${0}
 snippet ff:c
-		font-family ${0:'Monotype Corsiva','Comic Sans MS'},cursive
+	font-family ${0:'Monotype Corsiva','Comic Sans MS'},cursive
 snippet ff:f
-		font-family ${0:Capitals,Impact},fantasy
+	font-family ${0:Capitals,Impact},fantasy
 snippet ff:m
-		font-family ${0:Monaco,'Courier New'},monospace
+	font-family ${0:Monaco,'Courier New'},monospace
 snippet ff:ss
-		font-family ${0:Helvetica,Arial},sans-serif
+	font-family ${0:Helvetica,Arial},sans-serif
 snippet ff:s
-		font-family ${0:Georgia,'Times New Roman'},serif
+	font-family ${0:Georgia,'Times New Roman'},serif
 snippet fza
-		font-size-adjust ${0}
+	font-size-adjust ${0}
 snippet fza:n
-		font-size-adjust none
+	font-size-adjust none
 snippet fz
-		font-size ${0}
+	font-size ${0}
 snippet fsm
-		font-smooth ${0}
+	font-smooth ${0}
 snippet fsm:aw
-		font-smooth always
+	font-smooth always
 snippet fsm:a
-		font-smooth auto
+	font-smooth auto
 snippet fsm:n
-		font-smooth never
+	font-smooth never
 snippet fst
-		font-stretch ${0}
+	font-stretch ${0}
 snippet fst:c
-		font-stretch condensed
+	font-stretch condensed
 snippet fst:e
-		font-stretch expanded
+	font-stretch expanded
 snippet fst:ec
-		font-stretch extra-condensed
+	font-stretch extra-condensed
 snippet fst:ee
-		font-stretch extra-expanded
+	font-stretch extra-expanded
 snippet fst:n
-		font-stretch normal
+	font-stretch normal
 snippet fst:sc
-		font-stretch semi-condensed
+	font-stretch semi-condensed
 snippet fst:se
-		font-stretch semi-expanded
+	font-stretch semi-expanded
 snippet fst:uc
-		font-stretch ultra-condensed
+	font-stretch ultra-condensed
 snippet fst:ue
-		font-stretch ultra-expanded
+	font-stretch ultra-expanded
 snippet fs
-		font-style ${0}
+	font-style ${0}
 snippet fs:i
-		font-style italic
+	font-style italic
 snippet fs:n
-		font-style normal
+	font-style normal
 snippet fs:o
-		font-style oblique
+	font-style oblique
 snippet fv
-		font-variant ${0}
+	font-variant ${0}
 snippet fv:n
-		font-variant normal
+	font-variant normal
 snippet fv:sc
-		font-variant small-caps
+	font-variant small-caps
 snippet fw
-		font-weight ${0}
+	font-weight ${0}
 snippet fw:b
-		font-weight bold
+	font-weight bold
 snippet fw:br
-		font-weight bolder
+	font-weight bolder
 snippet fw:lr
-		font-weight lighter
+	font-weight lighter
 snippet fw:n
-		font-weight normal
+	font-weight normal
 snippet f
-		font ${0}
+	font ${0}
 snippet h
-		height ${0}
+	height ${0}
 snippet h:a
-		height auto
+	height auto
 snippet l
-		left ${0}
+	left ${0}
 snippet l:a
-		left auto
+	left auto
 snippet lts
-		letter-spacing ${0}
+	letter-spacing ${0}
 snippet lh
-		line-height ${0}
+	line-height ${0}
 snippet lisi
-		list-style-image url(${0})
+	list-style-image url(${0})
 snippet lisi:n
-		list-style-image none
+	list-style-image none
 snippet lisp
-		list-style-position ${0}
+	list-style-position ${0}
 snippet lisp:i
-		list-style-position inside
+	list-style-position inside
 snippet lisp:o
-		list-style-position outside
+	list-style-position outside
 snippet list
-		list-style-type ${0}
+	list-style-type ${0}
 snippet list:c
-		list-style-type circle
+	list-style-type circle
 snippet list:dclz
-		list-style-type decimal-leading-zero
+	list-style-type decimal-leading-zero
 snippet list:dc
-		list-style-type decimal
+	list-style-type decimal
 snippet list:d
-		list-style-type disc
+	list-style-type disc
 snippet list:lr
-		list-style-type lower-roman
+	list-style-type lower-roman
 snippet list:n
-		list-style-type none
+	list-style-type none
 snippet list:s
-		list-style-type square
+	list-style-type square
 snippet list:ur
-		list-style-type upper-roman
+	list-style-type upper-roman
 snippet lis
-		list-style ${0}
+	list-style ${0}
 snippet lis:n
-		list-style none
+	list-style none
 snippet mb
-		margin-bottom ${0}
+	margin-bottom ${0}
 snippet mb:a
-		margin-bottom auto
+	margin-bottom auto
 snippet ml
-		margin-left ${0}
+	margin-left ${0}
 snippet ml:a
-		margin-left auto
+	margin-left auto
 snippet mr
-		margin-right ${0}
+	margin-right ${0}
 snippet mr:a
-		margin-right auto
+	margin-right auto
 snippet mt
-		margin-top ${0}
+	margin-top ${0}
 snippet mt:a
-		margin-top auto
+	margin-top auto
 snippet m
-		margin ${0}
+	margin ${0}
 snippet m:4
-		margin ${1:0} ${2:0} ${3:0} ${0:0}
+	margin ${1:0} ${2:0} ${3:0} ${0:0}
 snippet m:3
-		margin ${1:0} ${2:0} ${0:0}
+	margin ${1:0} ${2:0} ${0:0}
 snippet m:2
-		margin ${1:0} ${0:0}
+	margin ${1:0} ${0:0}
 snippet m:0
-		margin 0
+	margin 0
 snippet m:a
-		margin auto
+	margin auto
 snippet mah
-		max-height ${0}
+	max-height ${0}
 snippet mah:n
-		max-height none
+	max-height none
 snippet maw
-		max-width ${0}
+	max-width ${0}
 snippet maw:n
-		max-width none
+	max-width none
 snippet mih
-		min-height ${0}
+	min-height ${0}
 snippet miw
-		min-width ${0}
+	min-width ${0}
 snippet op
-		opacity ${0}
+	opacity ${0}
 snippet op:ie
-		filter progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
+	filter progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
 snippet op:ms
-		-ms-filter 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
+	-ms-filter 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
 snippet orp
-		orphans ${0}
+	orphans ${0}
 snippet o+
-		outline ${1:1px} ${2:solid} ${0}
+	outline ${1:1px} ${2:solid} ${0}
 snippet oc
-		outline-color ${0}
+	outline-color ${0}
 snippet oc:i
-		outline-color invert
+	outline-color invert
 snippet oo
-		outline-offset ${0}
+	outline-offset ${0}
 snippet os
-		outline-style ${0}
+	outline-style ${0}
 snippet ow
-		outline-width ${0}
+	outline-width ${0}
 snippet o
-		outline ${0}
+	outline ${0}
 snippet o:n
-		outline none
+	outline none
 snippet ovs
-		overflow-style ${0}
+	overflow-style ${0}
 snippet ovs:a
-		overflow-style auto
+	overflow-style auto
 snippet ovs:mq
-		overflow-style marquee
+	overflow-style marquee
 snippet ovs:mv
-		overflow-style move
+	overflow-style move
 snippet ovs:p
-		overflow-style panner
+	overflow-style panner
 snippet ovs:s
-		overflow-style scrollbar
+	overflow-style scrollbar
 snippet ovx
-		overflow-x ${0}
+	overflow-x ${0}
 snippet ovx:a
-		overflow-x auto
+	overflow-x auto
 snippet ovx:h
-		overflow-x hidden
+	overflow-x hidden
 snippet ovx:s
-		overflow-x scroll
+	overflow-x scroll
 snippet ovx:v
-		overflow-x visible
+	overflow-x visible
 snippet ovy
-		overflow-y ${0}
+	overflow-y ${0}
 snippet ovy:a
-		overflow-y auto
+	overflow-y auto
 snippet ovy:h
-		overflow-y hidden
+	overflow-y hidden
 snippet ovy:s
-		overflow-y scroll
+	overflow-y scroll
 snippet ovy:v
-		overflow-y visible
+	overflow-y visible
 snippet ov
-		overflow ${0}
+	overflow ${0}
 snippet ov:a
-		overflow auto
+	overflow auto
 snippet ov:h
-		overflow hidden
+	overflow hidden
 snippet ov:s
-		overflow scroll
+	overflow scroll
 snippet ov:v
-		overflow visible
+	overflow visible
 snippet pb
-		padding-bottom ${0}
+	padding-bottom ${0}
 snippet pl
-		padding-left ${0}
+	padding-left ${0}
 snippet pr
-		padding-right ${0}
+	padding-right ${0}
 snippet pt
-		padding-top ${0}
+	padding-top ${0}
 snippet p
-		padding ${0}
+	padding ${0}
 snippet p:4
-		padding ${1:0} ${2:0} ${3:0} ${0:0}
+	padding ${1:0} ${2:0} ${3:0} ${0:0}
 snippet p:3
-		padding ${1:0} ${2:0} ${0:0}
+	padding ${1:0} ${2:0} ${0:0}
 snippet p:2
-		padding ${1:0} ${0:0}
+	padding ${1:0} ${0:0}
 snippet p:0
-		padding 0
+	padding 0
 snippet pgba
-		page-break-after ${0}
+	page-break-after ${0}
 snippet pgba:aw
-		page-break-after always
+	page-break-after always
 snippet pgba:a
-		page-break-after auto
+	page-break-after auto
 snippet pgba:l
-		page-break-after left
+	page-break-after left
 snippet pgba:r
-		page-break-after right
+	page-break-after right
 snippet pgbb
-		page-break-before ${0}
+	page-break-before ${0}
 snippet pgbb:aw
-		page-break-before always
+	page-break-before always
 snippet pgbb:a
-		page-break-before auto
+	page-break-before auto
 snippet pgbb:l
-		page-break-before left
+	page-break-before left
 snippet pgbb:r
-		page-break-before right
+	page-break-before right
 snippet pgbi
-		page-break-inside ${0}
+	page-break-inside ${0}
 snippet pgbi:a
-		page-break-inside auto
+	page-break-inside auto
 snippet pgbi:av
-		page-break-inside avoid
+	page-break-inside avoid
 snippet pos
-		position ${0}
+	position ${0}
 snippet pos:a
-		position absolute
+	position absolute
 snippet pos:f
-		position fixed
+	position fixed
 snippet pos:r
-		position relative
+	position relative
 snippet pos:s
-		position static
+	position static
 snippet q
-		quotes ${0}
+	quotes ${0}
 snippet q:en
-		quotes '\201C' '\201D' '\2018' '\2019'
+	quotes '\201C' '\201D' '\2018' '\2019'
 snippet q:n
-		quotes none
+	quotes none
 snippet q:ru
-		quotes '\00AB' '\00BB' '\201E' '\201C'
+	quotes '\00AB' '\00BB' '\201E' '\201C'
 snippet rz
-		resize ${0}
+	resize ${0}
 snippet rz:b
-		resize both
+	resize both
 snippet rz:h
-		resize horizontal
+	resize horizontal
 snippet rz:n
-		resize none
+	resize none
 snippet rz:v
-		resize vertical
+	resize vertical
 snippet r
-		right ${0}
+	right ${0}
 snippet r:a
-		right auto
+	right auto
 snippet tbl
-		table-layout ${0}
+	table-layout ${0}
 snippet tbl:a
-		table-layout auto
+	table-layout auto
 snippet tbl:f
-		table-layout fixed
+	table-layout fixed
 snippet tal
-		text-align-last ${0}
+	text-align-last ${0}
 snippet tal:a
-		text-align-last auto
+	text-align-last auto
 snippet tal:c
-		text-align-last center
+	text-align-last center
 snippet tal:l
-		text-align-last left
+	text-align-last left
 snippet tal:r
-		text-align-last right
+	text-align-last right
 snippet ta
-		text-align ${0}
+	text-align ${0}
 snippet ta:c
-		text-align center
+	text-align center
 snippet ta:l
-		text-align left
+	text-align left
 snippet ta:r
-		text-align right
+	text-align right
 snippet td
-		text-decoration ${0}
+	text-decoration ${0}
 snippet td:l
-		text-decoration line-through
+	text-decoration line-through
 snippet td:n
-		text-decoration none
+	text-decoration none
 snippet td:o
-		text-decoration overline
+	text-decoration overline
 snippet td:u
-		text-decoration underline
+	text-decoration underline
 snippet te
-		text-emphasis ${0}
+	text-emphasis ${0}
 snippet te:ac
-		text-emphasis accent
+	text-emphasis accent
 snippet te:a
-		text-emphasis after
+	text-emphasis after
 snippet te:b
-		text-emphasis before
+	text-emphasis before
 snippet te:c
-		text-emphasis circle
+	text-emphasis circle
 snippet te:ds
-		text-emphasis disc
+	text-emphasis disc
 snippet te:dt
-		text-emphasis dot
+	text-emphasis dot
 snippet te:n
-		text-emphasis none
+	text-emphasis none
 snippet th
-		text-height ${0}
+	text-height ${0}
 snippet th:a
-		text-height auto
+	text-height auto
 snippet th:f
-		text-height font-size
+	text-height font-size
 snippet th:m
-		text-height max-size
+	text-height max-size
 snippet th:t
-		text-height text-size
+	text-height text-size
 snippet ti
-		text-indent ${0}
+	text-indent ${0}
 snippet ti:-
-		text-indent -9999px
+	text-indent -9999px
 snippet tj
-		text-justify ${0}
+	text-justify ${0}
 snippet tj:a
-		text-justify auto
+	text-justify auto
 snippet tj:d
-		text-justify distribute
+	text-justify distribute
 snippet tj:ic
-		text-justify inter-cluster
+	text-justify inter-cluster
 snippet tj:ii
-		text-justify inter-ideograph
+	text-justify inter-ideograph
 snippet tj:iw
-		text-justify inter-word
+	text-justify inter-word
 snippet tj:k
-		text-justify kashida
+	text-justify kashida
 snippet tj:t
-		text-justify tibetan
+	text-justify tibetan
 snippet to+
-		text-outline ${1:0} ${2:0} ${0}
+	text-outline ${1:0} ${2:0} ${0}
 snippet to
-		text-outline ${0}
+	text-outline ${0}
 snippet to:n
-		text-outline none
+	text-outline none
 snippet tr
-		text-replace ${0}
+	text-replace ${0}
 snippet tr:n
-		text-replace none
+	text-replace none
 snippet tsh+
-		text-shadow ${1:0} ${2:0} ${3:0} ${0}
+	text-shadow ${1:0} ${2:0} ${3:0} ${0}
 snippet tsh
-		text-shadow ${0}
+	text-shadow ${0}
 snippet tsh:n
-		text-shadow none
+	text-shadow none
 snippet tt
-		text-transform ${0}
+	text-transform ${0}
 snippet tt:c
-		text-transform capitalize
+	text-transform capitalize
 snippet tt:l
-		text-transform lowercase
+	text-transform lowercase
 snippet tt:n
-		text-transform none
+	text-transform none
 snippet tt:u
-		text-transform uppercase
+	text-transform uppercase
 snippet tw
-		text-wrap ${0}
+	text-wrap ${0}
 snippet tw:no
-		text-wrap none
+	text-wrap none
 snippet tw:n
-		text-wrap normal
+	text-wrap normal
 snippet tw:s
-		text-wrap suppress
+	text-wrap suppress
 snippet tw:u
-		text-wrap unrestricted
+	text-wrap unrestricted
 snippet t
-		top ${0}
+	top ${0}
 snippet t:a
-		top auto
+	top auto
 snippet va
-		vertical-align ${0}
+	vertical-align ${0}
 snippet va:bl
-		vertical-align baseline
+	vertical-align baseline
 snippet va:b
-		vertical-align bottom
+	vertical-align bottom
 snippet va:m
-		vertical-align middle
+	vertical-align middle
 snippet va:sub
-		vertical-align sub
+	vertical-align sub
 snippet va:sup
-		vertical-align super
+	vertical-align super
 snippet va:tb
-		vertical-align text-bottom
+	vertical-align text-bottom
 snippet va:tt
-		vertical-align text-top
+	vertical-align text-top
 snippet va:t
-		vertical-align top
+	vertical-align top
 snippet v
-		visibility ${0}
+	visibility ${0}
 snippet v:c
-		visibility collapse
+	visibility collapse
 snippet v:h
-		visibility hidden
+	visibility hidden
 snippet v:v
-		visibility visible
+	visibility visible
 snippet whsc
-		white-space-collapse ${0}
+	white-space-collapse ${0}
 snippet whsc:ba
-		white-space-collapse break-all
+	white-space-collapse break-all
 snippet whsc:bs
-		white-space-collapse break-strict
+	white-space-collapse break-strict
 snippet whsc:k
-		white-space-collapse keep-all
+	white-space-collapse keep-all
 snippet whsc:l
-		white-space-collapse loose
+	white-space-collapse loose
 snippet whsc:n
-		white-space-collapse normal
+	white-space-collapse normal
 snippet whs
-		white-space ${0}
+	white-space ${0}
 snippet whs:n
-		white-space normal
+	white-space normal
 snippet whs:nw
-		white-space nowrap
+	white-space nowrap
 snippet whs:pl
-		white-space pre-line
+	white-space pre-line
 snippet whs:pw
-		white-space pre-wrap
+	white-space pre-wrap
 snippet whs:p
-		white-space pre
+	white-space pre
 snippet wid
-		widows ${0}
+	widows ${0}
 snippet w
-		width ${0}
+	width ${0}
 snippet w:a
-		width auto
+	width auto
 snippet wob
-		word-break ${0}
+	word-break ${0}
 snippet wob:ba
-		word-break break-all
+	word-break break-all
 snippet wob:bs
-		word-break break-strict
+	word-break break-strict
 snippet wob:k
-		word-break keep-all
+	word-break keep-all
 snippet wob:l
-		word-break loose
+	word-break loose
 snippet wob:n
-		word-break normal
+	word-break normal
 snippet wos
-		word-spacing ${0}
+	word-spacing ${0}
 snippet wow
-		word-wrap ${0}
+	word-wrap ${0}
 snippet wow:no
-		word-wrap none
+	word-wrap none
 snippet wow:n
-		word-wrap normal
+	word-wrap normal
 snippet wow:s
-		word-wrap suppress
+	word-wrap suppress
 snippet wow:u
-		word-wrap unrestricted
+	word-wrap unrestricted
 snippet z
-		z-index ${0}
+	z-index ${0}
 snippet z:a
-		z-index auto
+	z-index auto
 snippet zoo
-		zoom 1
+	zoom 1
 snippet :h
-		:hover
+	:hover
 snippet :fc
-		:first-child
+	:first-child
 snippet :lc
-		:last-child
+	:last-child
 snippet :nc
-		:nth-child(${0})
+	:nth-child(${0})
 snippet :nlc
-		:nth-last-child(${0})
+	:nth-last-child(${0})
 snippet :oc
-		:only-child
+	:only-child
 snippet :a
-		:after
+	:after
 snippet :b
-		:before
+	:before
 snippet ::a
-		::after
+	::after
 snippet ::b
-		::before
+	::before
 snippet if
-		if ${0}
+	if ${0}
 snippet mix
-		${1}(${0})
+	${1}(${0})
 snippet for
-		for ${1:i} in ${0}
+	for ${1:i} in ${0}
 snippet keyf
-		@keyframes ${0}
+	@keyframes ${0}

From c4883b9f2dc05b26c8ae38b2518b1a2de10e3600 Mon Sep 17 00:00:00 2001
From: dengyaolong <dengyaolong@yeah.net>
Date: Tue, 25 Aug 2015 13:34:07 +0800
Subject: [PATCH 0704/1587] add  ce means console.err()

---
 snippets/javascript/javascript.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index c8807b840..b334a13cf 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -242,6 +242,9 @@ snippet cl
 # console.debug
 snippet cd
 	console.debug(${0});
+# console.err
+snippet ce
+	console.err(${0});
 # console.trace
 snippet ct
 	console.trace(${0:label});

From b773523c30df6352cdd3123cdea97b17268e1801 Mon Sep 17 00:00:00 2001
From: dengyaolong <dengyaolong@yeah.net>
Date: Tue, 25 Aug 2015 13:44:52 +0800
Subject: [PATCH 0705/1587] try-catch-finally and throw error

---
 snippets/javascript/javascript.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index b334a13cf..2a457e461 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -80,6 +80,18 @@ snippet try
 	} catch (${2:e}) {
 		${0:/* handle error */}
 	}
+# try finally
+snippet tryf
+	try {
+		${1}
+	} catch (${2:e}) {
+		${0:/* handle error */}
+	} finally {
+		${3:/* be executed regardless of the try / catch result*/}
+	}
+# throw Error
+snippet te
+	throw new Error('${1:error message}')
 # return
 snippet ret
 	return ${0:result};

From eaaac3ab358d5d836f3b3eacf4851125d41fe168 Mon Sep 17 00:00:00 2001
From: dengyaolong <dengyaolong@yeah.net>
Date: Tue, 25 Aug 2015 18:59:47 +0800
Subject: [PATCH 0706/1587] use terr instead of te to throw error

---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 2a457e461..11f3f76c7 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -90,7 +90,7 @@ snippet tryf
 		${3:/* be executed regardless of the try / catch result*/}
 	}
 # throw Error
-snippet te
+snippet terr
 	throw new Error('${1:error message}')
 # return
 snippet ret

From 5ea24e77996259f006767f72687ea5bd1595983f Mon Sep 17 00:00:00 2001
From: onemanstartup <onemanstartup@gmail.com>
Date: Thu, 27 Aug 2015 16:52:26 +0300
Subject: [PATCH 0707/1587] Remove offensive haskell snippets

Haskell snippets won't show up in autocomplete because of this.
https://github.com/Valloric/YouCompleteMe/issues/1214
---
 snippets/haskell.snippets | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 633c9aaf7..d5c42c717 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -57,20 +57,14 @@ snippet ap
 snippet do
 	do
 
-snippet λ
-	\\${1:x} -> ${0:expression}
 snippet \
 	\\${1:x} -> ${0:expression}
 snippet (\
 	(\\${1:x} -> ${0:expression})
 snippet <-
 	${1:a} <- ${0:m a}
-snippet ←
-	${1:a} <- ${0:m a}
 snippet ->
 	${1:m a} -> ${0:a}
-snippet →
-	${1:m a} -> ${0:a}
 snippet tup
 	(${1:a}, ${0:b})
 snippet tup2

From b8bd605a2f9c3115df4c517ebd771f4a45d8db9a Mon Sep 17 00:00:00 2001
From: Hans-Guenter <johann-guenter.simon@linde-le.com>
Date: Thu, 27 Aug 2015 19:52:01 +0200
Subject: [PATCH 0708/1587] Adjust for changed vim Filename function

---
 UltiSnips/pandoc.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/pandoc.snippets b/UltiSnips/pandoc.snippets
index ad165c564..ce858f0b0 100644
--- a/UltiSnips/pandoc.snippets
+++ b/UltiSnips/pandoc.snippets
@@ -4,7 +4,7 @@ extends markdown
 priority -49
 
 snippet title "Title Header" b
-% ${1:`!v Filename('', 'title')`}
+% ${1:`!v vim_snippets#Filename('$1', 'title')`}
 % ${2:`!v g:snips_author`}
 % ${3:`!v strftime("%d %B %Y")`}
 

From 6a11e1aa154552b873955ceaa25cf7c219aff805 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 28 Aug 2015 12:50:10 +0100
Subject: [PATCH 0709/1587] Remove redundant Ultisnips SCSS snippets

---
 UltiSnips/scss.snippets | 57 -----------------------------------------
 snippets/scss.snippets  |  2 +-
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 UltiSnips/scss.snippets

diff --git a/UltiSnips/scss.snippets b/UltiSnips/scss.snippets
deleted file mode 100644
index cab17c143..000000000
--- a/UltiSnips/scss.snippets
+++ /dev/null
@@ -1,57 +0,0 @@
-extends css
-
-priority -50
-
-snippet imp "@import '...';" b
-@import '${1:file}';
-endsnippet
-
-snippet inc "@include mixin(...);" b
-@include ${1:mixin}(${2});
-endsnippet
-
-snippet ext "@extend %placeholder;" b
-@extend %${1:%placeholder};
-endsnippet
-
-snippet mixin "@mixin (...) { ... }" b
-@mixin ${1:name}(${2}) {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet fun "@function (...) { ... }" b
-@function ${1:name}(${2}) {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet if "@if (...) { ... }" b
-@if ${1:condition} {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet else "@else { ... }" b
-@else ${1:condition} {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet for "@for loop" b
-@for ${1:$i} from ${2:1} through ${3:3} {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet each "@each loop" b
-@each ${1:$item} in ${2:item, item, item} {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet while "@while loop" b
-@while ${1:$i} ${2:>} ${3:0} {
-	${VISUAL}$0
-}
-endsnippet
diff --git a/snippets/scss.snippets b/snippets/scss.snippets
index 9a208cab7..babbdefc5 100644
--- a/snippets/scss.snippets
+++ b/snippets/scss.snippets
@@ -8,7 +8,7 @@ snippet mix
 	}
 snippet inc
 	@include ${1:mixin}(${2});
-snippet ex
+snippet ext
 	@extend ${0};
 snippet fun
 	@function ${1:name}(${2:args}) {

From b3bfe4df7d8af42581239d6ac4998acb359e31ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dzikie=20dro=C5=BCd=C5=BCe?= <daz@hackerspace.pl>
Date: Mon, 7 Sep 2015 17:28:59 +0200
Subject: [PATCH 0710/1587] pep-3110

---
 UltiSnips/python.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 3ee7d928e..a5ef2aa6a 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -578,14 +578,14 @@ endsnippet
 snippet try "Try / Except" b
 try:
 	${1:${VISUAL:pass}}
-except ${2:Exception}, ${3:e}:
+except ${2:Exception} as ${3:e}:
 	${4:raise $3}
 endsnippet
 
 snippet trye "Try / Except / Else" b
 try:
 	${1:${VISUAL:pass}}
-except ${2:Exception}, ${3:e}:
+except ${2:Exception} as ${3:e}:
 	${4:raise $3}
 else:
 	${5:pass}
@@ -594,7 +594,7 @@ endsnippet
 snippet tryf "Try / Except / Finally" b
 try:
 	${1:${VISUAL:pass}}
-except ${2:Exception}, ${3:e}:
+except ${2:Exception} as ${3:e}:
 	${4:raise $3}
 finally:
 	${5:pass}
@@ -603,7 +603,7 @@ endsnippet
 snippet tryef "Try / Except / Else / Finally" b
 try:
 	${1:${VISUAL:pass}}
-except${2: ${3:Exception}, ${4:e}}:
+except${2: ${3:Exception} as ${4:e}}:
 	${5:raise}
 else:
 	${6:pass}

From 42f55e26907bf0090e5f040ee1279e1123a6d575 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 9 Sep 2015 23:47:20 +0100
Subject: [PATCH 0711/1587] Remove GPL snippet from C

---
 snippets/c.snippets | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index aa7ce847f..42bad7d42 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -221,23 +221,3 @@ snippet getopt
 # This is kind of convenient
 snippet .
 	[${1}]
-# GPL
-snippet gpl
-	/*
-	 * This program is free software; you can redistribute it and/or modify
-	 * it under the terms of the GNU General Public License as published by
-	 * the Free Software Foundation; either version 2 of the License, or
-	 * (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, see <http://www.gnu.org/licenses/>.
-	 *
-	 * Copyright (C) ${1:Author}, `strftime("%Y")`
-	 */
-
-	${0}

From bf1a82cf1cb4293e0958658efc34903c87cdda65 Mon Sep 17 00:00:00 2001
From: frans <frans@squla.com>
Date: Thu, 10 Sep 2015 11:23:00 +0200
Subject: [PATCH 0712/1587] nosetests trace snippet

---
 snippets/python.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index faf144c34..0e1f62425 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -225,3 +225,5 @@ snippet kwargs
 	**kwargs${1:,}${0}
 snippet akw
 	*args, **kwargs${1:,}${0}
+snippet nosetrace
+	from nose.tools import set_trace; set_trace()

From c55d618d78d1991a376b10cd8151aaf913d79c8c Mon Sep 17 00:00:00 2001
From: frans <frans@squla.com>
Date: Thu, 10 Sep 2015 11:27:53 +0200
Subject: [PATCH 0713/1587] nosetests trace snippet

---
 snippets/python.snippets | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 0e1f62425..d8f010546 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -148,6 +148,9 @@ snippet ptpython
 # python console debugger (pudb)
 snippet pudb
 	import pudb; pudb.set_trace()
+# pdb in nosetests
+snippet nosetrace
+	from nose.tools import set_trace; set_trace()
 snippet pprint
 	import pprint; pprint.pprint(${1})
 snippet "
@@ -225,5 +228,3 @@ snippet kwargs
 	**kwargs${1:,}${0}
 snippet akw
 	*args, **kwargs${1:,}${0}
-snippet nosetrace
-	from nose.tools import set_trace; set_trace()

From bd213c19ce822f0b7899afcc93b3c91d15304d95 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 11 Sep 2015 08:57:03 +0100
Subject: [PATCH 0714/1587] C: Add return, dedupe ultisnips

---
 UltiSnips/c.snippets | 8 --------
 snippets/c.snippets  | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 5c4299c6d..defea9996 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -20,14 +20,6 @@ ${VISUAL}${0}
 #endif
 endsnippet
 
-snippet inc "#include local header (inc)"
-#include "${1:`!p snip.rv = snip.basename + '.h'`}"
-endsnippet
-
-snippet Inc "#include <> (Inc)"
-#include <${1:.h}>
-endsnippet
-
 snippet mark "#pragma mark (mark)"
 #if 0
 ${1:#pragma mark -
diff --git a/snippets/c.snippets b/snippets/c.snippets
index 42bad7d42..c1d95aa28 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -98,6 +98,8 @@ snippet case
 	case ${1:/* variable case */}:
 		${2}
 		${3:break;}
+snippet ret
+	return ${0};
 ##
 ## Loops
 # for

From cb9e293bcaf99657fe64287b189d3d374fd63314 Mon Sep 17 00:00:00 2001
From: Paco Esteban <paco@onna.be>
Date: Sun, 13 Sep 2015 13:56:51 +0200
Subject: [PATCH 0715/1587] perl6 snippets, first version

---
 snippets/perl6.snippets | 116 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 snippets/perl6.snippets

diff --git a/snippets/perl6.snippets b/snippets/perl6.snippets
new file mode 100644
index 000000000..cdae5c93a
--- /dev/null
+++ b/snippets/perl6.snippets
@@ -0,0 +1,116 @@
+# shebang
+snippet #!
+	#!/usr/bin/enb perl6
+
+# Hash Pointer
+snippet .
+	 =>
+# Function
+snippet sub
+	sub ${1:function_name}(${2:Str $var}) {
+		${3}
+	}
+snippet mul
+	multi ${1:function_name}(${2:Str $var}) {
+		${3}
+	}
+# Conditional
+snippet if
+	if ${1} {
+		${2}
+	}
+# Conditional if..else
+snippet ife
+	if ${1} {
+		${2}
+	}
+	else {
+		${3}
+	}
+snippet eif
+	elsif ${1) {
+		${2}
+	}
+# Conditional One-line
+snippet xif
+	${1:expression} if ${2:condition};
+# Unless conditional
+snippet unless
+	unless ${1} {
+		${2}
+	}
+# Unless conditional One-line
+snippet xunless
+	${1:expression} unless ${2:condition};
+# Ternary conditional
+snippet tc
+	${1:condition} ?? ${2:value-if-true} !! ${3:value-if-false};
+# given - when (perl6 switch)
+snippet switch
+	given ${1:$var} {
+	  when ${2:condition} {
+		  ${3:# code block ...}
+	  }
+	  ${4}
+	  default {
+		  ${5}
+	  }
+	}
+# 'loop' - C's for.
+snippet loop
+	loop (my ${1:$i} = 0; $$1 < ${2:count}; $$1++) {
+		${3}
+	}
+# for loop
+snippet for
+	for ${1:@array} -> ${2:$variable} {
+		${3}
+	}
+# While Loop
+snippet wh
+	while ${1} {
+		${2}
+	}
+# Repeat while and repean until
+snippet rp
+	repeat {
+		${1}
+	} ${2:while|until} ${3};
+# classes ..
+snippet cl
+	${1:my} class ${2:ClassName} ${3:is|does Parent|Role}{
+		${4}
+	}
+snippet has
+	has ${1:Type} ${2:$!identifier};
+snippet mth
+	method ${1:method_name}(${2:$attr}) {
+		${3}
+	}
+snippet pmth
+	method ${1:!}${2:method_name}(${3:$attr}) {
+		${4}
+	}
+snippet smth
+	submethod ${1:submethod_name}(${2:$attr}) {
+		${3}
+	}
+# Tests
+snippet test
+	use v6;
+	use Test;
+	${1:use lib 'lib';}
+
+	plan ${2:$num-tests};
+
+# IO
+snippet slurp
+	my ${1:$var} = "${2:filename}".IO.slurp;
+snippet rfile
+	for "${1:filename}".IO.lines -> $line {
+		${2}
+	}
+snippet open
+	my $fh = open "${1:filename}", ${2::r|:w|:a};
+	${3:# actions};
+	$fh.close;

From a9d2af7470900aa50d4357f5107105b177e5cc13 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 13 Sep 2015 20:28:51 +0100
Subject: [PATCH 0716/1587] C: Move enum to snipmate, remove while dupe

---
 UltiSnips/c.snippets | 10 ----------
 snippets/c.snippets  |  3 +++
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index defea9996..7dd7cb928 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -49,10 +49,6 @@ for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
 }
 endsnippet
 
-snippet enum "Enumeration"
-enum ${1:name} { $0 };
-endsnippet
-
 snippet once "Include header once only guard"
 #ifndef ${1:`!p
 if not snip.c:
@@ -73,12 +69,6 @@ snippet td "Typedef"
 typedef ${1:int} ${2:MyCustomType};
 endsnippet
 
-snippet wh "while loop"
-while(${1:/* condition */}) {
-	${VISUAL}${0}
-}
-endsnippet
-
 snippet do "do...while loop (do)"
 do {
 	${VISUAL}${0}
diff --git a/snippets/c.snippets b/snippets/c.snippets
index c1d95aa28..6a1cbaa7a 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -148,6 +148,9 @@ snippet tds
 	typedef struct ${2:_$1 }{
 		${3:/* data */}
 	} ${1:`vim_snippets#Filename('$1_t', 'name')`};
+
+snippet enum
+	enum ${1:name} { ${0} };
 # typedef enum
 snippet tde
 	typedef enum {

From 93c4b32b4d7c7abd742518bcf92ab93ae4b43d54 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 14 Sep 2015 23:59:36 +0100
Subject: [PATCH 0717/1587] C: Remove some dupes

---
 UltiSnips/c.snippets | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 7dd7cb928..3ee3fa40b 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -65,16 +65,6 @@ ${VISUAL}${0}
 #endif /* end of include guard: $1 */
 endsnippet
 
-snippet td "Typedef"
-typedef ${1:int} ${2:MyCustomType};
-endsnippet
-
-snippet do "do...while loop (do)"
-do {
-	${VISUAL}${0}
-} while(${1:/* condition */});
-endsnippet
-
 snippet fprintf "fprintf ..."
 fprintf(${1:stderr}, "${2:%s}\n"${2/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$3${2/([^%]|%%)*(%.)?.*/(?2:\);)/}
 endsnippet

From fd1fa30b8c389442683a1306e6474e0ea5466997 Mon Sep 17 00:00:00 2001
From: Alvin Chan <aschan@gmail.com>
Date: Mon, 21 Sep 2015 15:13:23 -0700
Subject: [PATCH 0718/1587] SCSS extends CSS snippets

---
 snippets/scss.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/scss.snippets b/snippets/scss.snippets
index babbdefc5..998a12005 100644
--- a/snippets/scss.snippets
+++ b/snippets/scss.snippets
@@ -1,3 +1,5 @@
+extends css
+
 snippet $
 	$${1:variable}: ${0:value};
 snippet imp

From 1d61b86ab7e925e50f5b340d65eafbb082081561 Mon Sep 17 00:00:00 2001
From: Erich Heine <sophacles@gmail.com>
Date: Wed, 23 Sep 2015 13:58:12 -0500
Subject: [PATCH 0719/1587] Enhance python `with` snippet for UltiSnips

* the `with` snippet in UltiSnips now contains a VISUAL element
* The `as` keyword portion of a with statement now uses python
  interpolation to determine presence
---
 UltiSnips/python.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index a5ef2aa6a..6dfa3c9e7 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -16,6 +16,12 @@ if __name__ == `!p snip.rv = get_quoting_style(snip)`__main__`!p snip.rv = get_q
 	${1:${VISUAL:main()}}
 endsnippet
 
+snippet with "with" b
+with ${1:expr}`!p snip.rv = " as " if t[2] else ""`${2:var}:
+	${3:${VISUAL:pass}}
+${0}
+endsnippet
+
 snippet for "for loop" b
 for ${1:item} in ${2:iterable}:
 	${3:${VISUAL:pass}}

From 6f56f05978361a37262ca804513e7962079e2ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BCl=20Torralba?= <raul.torralba@gmail.com>
Date: Mon, 28 Sep 2015 00:30:53 +0200
Subject: [PATCH 0720/1587] Added simple mvc framework snippets

---
 snippets/simplemvcf.snippets | 122 +++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 snippets/simplemvcf.snippets

diff --git a/snippets/simplemvcf.snippets b/snippets/simplemvcf.snippets
new file mode 100644
index 000000000..2ef6a6532
--- /dev/null
+++ b/snippets/simplemvcf.snippets
@@ -0,0 +1,122 @@
+snippet sm_controller
+	<?php
+		namespace Controllers;
+		use Core\View;
+		use Core\Controller;
+
+		class ${1:class_name} extends Controller
+		{
+			public function __construct()
+			{
+				parent::__construct();
+			}
+
+			public function index()
+			{
+				${2:}
+			}
+		}
+snippet sm_model
+	<?php 
+		namespace Models;
+	 
+		use Core\Model;
+	  
+		class ${1:class_name} extends Model 
+		{    
+			function __construct()
+			{
+				parent::__construct();
+			}  
+		}
+snippet sm_model_crud
+	<?php 
+		namespace Models;
+
+		use Core\Model;
+
+		class ${1:class_name} extends Model 
+		{    
+			private $${2:table};
+			function __construct()
+			{
+				parent::__construct();
+			}  
+			
+			public function getRow($where)
+			{
+				return $this->db->select('SELECT * FROM '.$table.' WHERE ${3:where}', $data);
+			}
+
+			public function getRows($where)
+			{
+				return $this->db->select('SELECT * FROM '.$table.');
+			}
+
+			public function insert($data)
+			{
+				$this->db->insert($table, $data);
+			}
+
+			public function update($data, $where)
+			{
+				$this->db->update($table ,$data, $where);
+			}
+
+			public function delete($where)
+			{
+				$this->db->delete($table, $where);
+			}
+		}
+snippet sm_render
+	View::render('${1:view}', $${2:array});
+snippet sm_render_template
+	View::renderTemplate('${1:part}', $${2:array});
+
+# database
+snippet sm_db_select
+	$this->db->select(${1:sql}, ${2:where});
+
+snippet sm_db_insert
+	$this->db->insert(${1:table}, ${2:data});
+
+snippet sm_db_update
+	$this->db->update(${1:table}, ${2:data}, ${3:where});
+
+snippet sm_db_delete
+	$this->db->delete(${1:table}, ${2:where});
+
+snippet sm_db_truncate
+	$this->db->delete(${1:table});
+
+#session
+snippet sm_session_set
+	Session::set(${1:key}, ${2:value});
+
+snippet sm_session_get
+	Session::get(${1:key});
+
+snippet sm_session_pull
+	Session::pull(${1:key});
+
+snippet sm_session_id
+	Session::id();
+
+snippet sm_session_destroy
+	Session::set(${1:key});
+	
+snippet sm_session_display
+	Session::display();
+
+#url
+snippet sm_url_redirect
+	Url:redirect('${1:path}');
+
+snippet sm_url_previous
+	Url:previous();
+
+snippet sm_url_templatepath
+	Url:templatePath();
+
+snippet sm_url_autolink
+	Url:autolink('${1:string}');

From e018ff16cf0047a05ba66016580a5d3b3418f42a Mon Sep 17 00:00:00 2001
From: Ralph-Wang <ralph_ld@aliyun.com>
Date: Wed, 30 Sep 2015 15:36:21 +0800
Subject: [PATCH 0721/1587] add style jedi

---
 UltiSnips/python.snippets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 6dfa3c9e7..af8106917 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -42,6 +42,7 @@ DOXYGEN = 0x2
 SPHINX  = 0x3
 GOOGLE  = 0x4
 NUMPY   = 0x5
+JEDI    = 0x6
 
 SINGLE_QUOTES = "'"
 DOUBLE_QUOTES = '"'
@@ -116,6 +117,7 @@ def get_style(snip):
 	elif  style == "sphinx": return SPHINX
 	elif  style == "google": return GOOGLE
 	elif  style == "numpy": return NUMPY
+	elif  style == "jedi": return JEDI
 	else: return NORMAL
 
 
@@ -128,6 +130,8 @@ def format_arg(arg, style):
 		return ":%s: TODO" % arg
 	elif style == GOOGLE:
 		return "%s (TODO): TODO" % arg
+	elif style == JEDI:
+		return ":type %s: TODO" % arg
 	elif style == NUMPY:
 		return "%s : TODO" % arg
 
@@ -135,7 +139,7 @@ def format_arg(arg, style):
 def format_return(style):
 	if style == DOXYGEN:
 		return "@return: TODO"
-	elif style in (NORMAL, SPHINX):
+	elif style in (NORMAL, SPHINX, JEDI):
 		return ":returns: TODO"
 	elif style == GOOGLE:
 		return "Returns: TODO"

From 691c99cc3ae13595c0bce73964de52981ecd86de Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 1 Oct 2015 21:21:45 +0100
Subject: [PATCH 0722/1587] Make IIFE airbnb style friendly

---
 UltiSnips/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 6c177bc1b..9480e8122 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -59,7 +59,7 @@ ${1:var }${2:function_name} = function $2(${3}) {
 endsnippet
 
 snippet iife "Immediately-Invoked Function Expression (iife)"
-(function (${1:argument}) {
+(function(${1:window}) {
 	${VISUAL}$0
 }(${2:$1}));
 endsnippet

From 513b297e1dc31c89cd7c1addb7613b41212e6719 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 3 Oct 2015 10:54:13 +0100
Subject: [PATCH 0723/1587] Supercollider: Add {} snippet

---
 snippets/supercollider.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/supercollider.snippets b/snippets/supercollider.snippets
index 39ab6a7d6..988f9e895 100644
--- a/snippets/supercollider.snippets
+++ b/snippets/supercollider.snippets
@@ -2,6 +2,10 @@ snippet b
 	(
 		${0}
 	)
+snippet {
+	{
+		${0}
+	}
 snippet if
 	if (${1}) {
 		${0}

From fca8299ee3d9ba5f2461b7a29154050f3908a9ed Mon Sep 17 00:00:00 2001
From: Julian Bennecker <jb@mainformat.de>
Date: Sat, 3 Oct 2015 22:34:50 +0200
Subject: [PATCH 0724/1587] Added php snippet: throw Exeption

---
 snippets/php.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index b200463a2..45a782122 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -601,4 +601,5 @@ snippet tc
 	{
 		${0:code}
 	}
-
+snippet te 
+	throw new ${1:Exception}("${2:Error Processing Request}");

From cf3f86667ed37098e60f1974e4c705b3a1627c51 Mon Sep 17 00:00:00 2001
From: Brian van Burken <brianvanburken@outlook.com>
Date: Wed, 7 Oct 2015 10:08:48 +0200
Subject: [PATCH 0725/1587] Added Elixir snippet: quote

---
 snippets/elixir.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 8ca37912b..155d7cd2e 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -123,3 +123,7 @@ snippet try try .. rescue .. end
 snippet pry
 	require IEx; IEx.pry
 	${0}
+snippet qu
+	quote do
+		${1}
+	end

From 2d64dabfd1a8939f7b28315b1d84e265da4f3ba5 Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Wed, 7 Oct 2015 16:23:00 +0200
Subject: [PATCH 0726/1587] Make _parse_comments use &commentstring before
 &comments.

Also refactor and move python code from all.snippets into python file.

Fixes #629.
---
 UltiSnips/all.snippets | 64 +------------------------------------
 pythonx/vimsnippets.py | 72 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 63 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index fb6138a10..385df484e 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -10,69 +10,7 @@ priority -60
 # NICE BOXES #
 ##############
 global !p
-import string, vim
-
-""" Maps a filetype to comment format used for boxes.
-Automatically filled during usage"""
-_commentDict = { }
-
-def _parse_comments(s):
-	""" Parses vim's comments option to extract comment format """
-	i = iter(s.split(","))
-
-	rv = []
-	try:
-		while True:
-			# get the flags and text of a comment part
-			flags, text = next(i).split(':', 1)
-
-			if len(flags) == 0:
-				rv.append((text, text, text, ""))
-			# parse 3-part comment, but ignore those with O flag
-			elif 's' in flags and 'O' not in flags:
-				ctriple = []
-				indent = ""
-
-				if flags[-1] in string.digits:
-					indent = " " * int(flags[-1])
-				ctriple.append(text)
-
-				flags,text = next(i).split(':', 1)
-				assert(flags[0] == 'm')
-				ctriple.append(text)
-
-				flags,text = next(i).split(':', 1)
-				assert(flags[0] == 'e')
-				ctriple.append(text)
-				ctriple.append(indent)
-
-				rv.append(ctriple)
-			elif 'b' in flags:
-				if len(text) == 1:
-					rv.insert(0, (text,text,text, ""))
-	except StopIteration:
-		return rv
-
-def _get_comment_format():
-	""" Returns a 4-element tuple representing the comment format for
-	the current file. """
-	return _parse_comments(vim.eval("&comments"))[0]
-
-
-def make_box(twidth, bwidth=None):
-	b, m, e, i = _get_comment_format()
-	bwidth_inner = bwidth - 3 - max(len(b), len(i + e)) if bwidth else twidth + 2
-	sline = b + m + bwidth_inner * m[0] + 2 * m[0]
-	nspaces = (bwidth_inner - twidth) // 2
-	mlines = i + m + " " + " " * nspaces
-	mlinee = " " + " "*(bwidth_inner - twidth - nspaces) + m
-	eline = i + m + bwidth_inner * m[0] + 2 * m[0] + e
-	return sline, mlines, mlinee, eline
-
-def foldmarker():
-	"Return a tuple of (open fold marker, close fold marker)"
-	return vim.eval("&foldmarker").split(",")
-
+from vimsnippets import foldmarker, make_box
 endglobal
 
 snippet box "A nice box with the current comment symbol" b
diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index b00edb150..c2e89d042 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -1,5 +1,7 @@
 """Helper methods used in UltiSnips snippets."""
 
+import string, vim
+
 def complete(tab, opts):
     """
     get options that start with tab
@@ -18,3 +20,73 @@ def complete(tab, opts):
     if not len(opts):
         msg = "{0}"
     return msg.format("|".join(opts))
+
+def _parse_comments(s):
+    """ Parses vim's comments option to extract comment format """
+    i = iter(s.split(","))
+
+    rv = []
+    try:
+        while True:
+            # get the flags and text of a comment part
+            flags, text = next(i).split(':', 1)
+
+            if len(flags) == 0:
+                rv.append((text, text, text, ""))
+            # parse 3-part comment, but ignore those with O flag
+            elif 's' in flags and 'O' not in flags:
+                ctriple = ["TRIPLE"]
+                indent = ""
+
+                if flags[-1] in string.digits:
+                    indent = " " * int(flags[-1])
+                ctriple.append(text)
+
+                flags, text = next(i).split(':', 1)
+                assert flags[0] == 'm'
+                ctriple.append(text)
+
+                flags, text = next(i).split(':', 1)
+                assert flags[0] == 'e'
+                ctriple.append(text)
+                ctriple.append(indent)
+
+                rv.append(ctriple)
+            elif 'b' in flags:
+                if len(text) == 1:
+                    rv.insert(0, ("SINGLE_CHAR", text, text, text, ""))
+    except StopIteration:
+        return rv
+
+def _get_comment_format():
+    """ Returns a 4-element tuple (first_line, middle_lines, end_line, indent)
+    representing the comment format for the current file.
+
+    It first looks at the 'commentstring', if that ends with %s, it uses that.
+    Otherwise it parses '&comments' and prefers single character comment
+    markers if there are any.
+    """
+    commentstring = vim.eval("&commentstring")
+    if commentstring.endswith("%s"):
+        c = commentstring[:-2]
+        return (c, c, c, "")
+    comments = _parse_comments(vim.eval("&comments"))
+    for c in comments:
+        if c[0] == "SINGLE_CHAR":
+            return c[1:]
+    return comments[0][1:]
+
+
+def make_box(twidth, bwidth=None):
+    b, m, e, i = _get_comment_format()
+    bwidth_inner = bwidth - 3 - max(len(b), len(i + e)) if bwidth else twidth + 2
+    sline = b + m + bwidth_inner * m[0] + 2 * m[0]
+    nspaces = (bwidth_inner - twidth) // 2
+    mlines = i + m + " " + " " * nspaces
+    mlinee = " " + " "*(bwidth_inner - twidth - nspaces) + m
+    eline = i + m + bwidth_inner * m[0] + 2 * m[0] + e
+    return sline, mlines, mlinee, eline
+
+def foldmarker():
+    "Return a tuple of (open fold marker, close fold marker)"
+    return vim.eval("&foldmarker").split(",")

From 7e51c1452a85f6766abe366e0ea4c84314761e56 Mon Sep 17 00:00:00 2001
From: sasidhar-d <sasidhar@webileapps.com>
Date: Fri, 9 Oct 2015 19:48:19 +0530
Subject: [PATCH 0727/1587] add jasmine beforeAll, afterAll, toBeUndefined
 snippets

---
 UltiSnips/javascript-jasmine.snippets | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/UltiSnips/javascript-jasmine.snippets b/UltiSnips/javascript-jasmine.snippets
index e3f3ad70f..b522b0cc5 100644
--- a/UltiSnips/javascript-jasmine.snippets
+++ b/UltiSnips/javascript-jasmine.snippets
@@ -28,6 +28,18 @@ afterEach(function() {
 });
 endsnippet
 
+snippet befa "before all (js)" b
+beforeAll(function() {
+	$0
+});
+endsnippet
+
+snippet afta "after all (js)" b
+afterAll(function() {
+	$0
+});
+endsnippet
+
 snippet any "any (js)" b
 jasmine.any($1)
 endsnippet
@@ -50,6 +62,14 @@ snippet ee "expect to equal (js)" b
 expect(${1:target}).toEqual(${2:value});
 endsnippet
 
+snippet el "expect to be less than (js)" b
+expect(${1:target}).toBeLessThan(${2:value});
+endsnippet
+
+snippet eg "expect to be greater than (js)" b
+expect(${1:target}).toBeGreaterThan(${2:value});
+endsnippet
+
 snippet eb "expect to be (js)" b
 expect(${1:target}).toBe(${2:value});
 endsnippet
@@ -74,6 +94,10 @@ snippet ed "expect to be defined (js)" b
 expect(${1:target}).toBeDefined();
 endsnippet
 
+snippet eud "expect to be defined (js)" b
+expect(${1:target}).toBeUndefined();
+endsnippet
+
 snippet en "expect to be null (js)" b
 expect(${1:target}).toBeNull();
 endsnippet
@@ -98,6 +122,14 @@ snippet note "expect not to equal (js)" b
 expect(${1:target}).not.toEqual(${2:value});
 endsnippet
 
+snippet notl "expect to not be less than (js)" b
+expect(${1:target}).not.toBeLessThan(${2:value});
+endsnippet
+
+snippet notg "expect to not be greater than (js)" b
+expect(${1:target})..not.toBeGreaterThan(${2:value});
+endsnippet
+
 snippet notm "expect not to match (js)" b
 expect(${1:target}).not.toMatch(${2:pattern});
 endsnippet

From 00a4269e970182d3d2126cfc6b99e40f51025c65 Mon Sep 17 00:00:00 2001
From: sasidhar-d <sasidhar@webileapps.com>
Date: Sat, 10 Oct 2015 04:38:33 +0530
Subject: [PATCH 0728/1587] modified returnValue, throwError,callFake with the
 modern version of functions

---
 UltiSnips/javascript-jasmine.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/javascript-jasmine.snippets b/UltiSnips/javascript-jasmine.snippets
index b522b0cc5..535eb3516 100644
--- a/UltiSnips/javascript-jasmine.snippets
+++ b/UltiSnips/javascript-jasmine.snippets
@@ -171,19 +171,19 @@ spyOn(${1:object}, '${2:method}')$0;
 endsnippet
 
 snippet sr "spy on and return (js)" b
-spyOn(${1:object}, '${2:method}').andReturn(${3:arguments});
+spyOn(${1:object}, '${2:method}').and.returnValue(${3:arguments});
 endsnippet
 
 snippet st "spy on and throw (js)" b
-spyOn(${1:object}, '${2:method}').andThrow(${3:exception});
+spyOn(${1:object}, '${2:method}').and.throwError(${3:exception});
 endsnippet
 
 snippet sct "spy on and call through (js)" b
-spyOn(${1:object}, '${2:method}').andCallThrough();
+spyOn(${1:object}, '${2:method}').and.callThrough();
 endsnippet
 
 snippet scf "spy on and call fake (js)" b
-spyOn(${1:object}, '${2:method}').andCallFake(${3:function});
+spyOn(${1:object}, '${2:method}').and.callFake(${3:function});
 endsnippet
 
 snippet esc "expect was called (js)" b

From ccbdbff0d5fff5a5a72cf074cb5561de975abf55 Mon Sep 17 00:00:00 2001
From: sasidhar-d <sasidhar@webileapps.com>
Date: Sat, 10 Oct 2015 06:02:25 +0530
Subject: [PATCH 0729/1587] jasmine: removed depricated methods wasCalled,
 wasCalledWith and their not counter parts

---
 UltiSnips/javascript-jasmine.snippets | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/UltiSnips/javascript-jasmine.snippets b/UltiSnips/javascript-jasmine.snippets
index 535eb3516..185c66512 100644
--- a/UltiSnips/javascript-jasmine.snippets
+++ b/UltiSnips/javascript-jasmine.snippets
@@ -186,22 +186,6 @@ snippet scf "spy on and call fake (js)" b
 spyOn(${1:object}, '${2:method}').and.callFake(${3:function});
 endsnippet
 
-snippet esc "expect was called (js)" b
-expect(${1:target}).wasCalled();
-endsnippet
-
-snippet escw "expect was called with (js)" b
-expect(${1:target}).wasCalledWith(${2:arguments});
-endsnippet
-
-snippet notsc "expect was not called (js)" b
-expect(${1:target}).wasNotCalled();
-endsnippet
-
-snippet noscw "expect was not called with (js)" b
-expect(${1:target}).wasNotCalledWith(${2:arguments});
-endsnippet
-
 snippet ethbc "expect to have been called (js)" b
 expect(${1:target}).toHaveBeenCalled();
 endsnippet

From bc1637bde4b5b82a2af24ea4acefd855cc14cd41 Mon Sep 17 00:00:00 2001
From: sasidhar-d <sasidhar@webileapps.com>
Date: Sat, 10 Oct 2015 16:19:56 +0530
Subject: [PATCH 0730/1587] jasmine,added new matcher anything, and partial
 matchers objectContaining,stringMatching and arrayContaining

---
 UltiSnips/javascript-jasmine.snippets | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/UltiSnips/javascript-jasmine.snippets b/UltiSnips/javascript-jasmine.snippets
index 185c66512..77aec7736 100644
--- a/UltiSnips/javascript-jasmine.snippets
+++ b/UltiSnips/javascript-jasmine.snippets
@@ -44,6 +44,24 @@ snippet any "any (js)" b
 jasmine.any($1)
 endsnippet
 
+snippet anyt "anything (js)" b
+jasmine.anything()
+endsnippet
+
+snippet objc "object containing (js)" b
+jasmine.objectContaining({
+	${VISUAL}$0
+});
+endsnippet
+
+snippet arrc "array containing (js)" b
+jasmine.arrayContaining([${1:value1}]);
+endsnippet
+
+snippet strm "string matching (js)" b
+jasmine.stringMatching("${1:matcher}")
+endsnippet
+
 snippet ru "runs (js)" b
 runs(function() {
 	$0

From 4f262c849e4d79c72e889454056f873d53b50e34 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 11 Oct 2015 11:40:40 +0100
Subject: [PATCH 0731/1587] Supercollider synthedef

---
 UltiSnips/supercollider.snippets | 5 +++++
 snippets/supercollider.snippets  | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/supercollider.snippets b/UltiSnips/supercollider.snippets
index d59ce4302..b8538aa91 100644
--- a/UltiSnips/supercollider.snippets
+++ b/UltiSnips/supercollider.snippets
@@ -3,3 +3,8 @@ for (${1:1}, ${2:10}) {${3: |i}|}
 	$0
 }
 endsnippet
+snippet sdef
+SynthDef(\\${1:synthName}, {${2: |${3:x}|}
+	${0}
+}).add;
+endsnippet
diff --git a/snippets/supercollider.snippets b/snippets/supercollider.snippets
index 988f9e895..afaefb69e 100644
--- a/snippets/supercollider.snippets
+++ b/snippets/supercollider.snippets
@@ -2,10 +2,6 @@ snippet b
 	(
 		${0}
 	)
-snippet {
-	{
-		${0}
-	}
 snippet if
 	if (${1}) {
 		${0}
@@ -20,3 +16,7 @@ snippet for
 	for (${1:1}, ${2:10}) { |i|
 		${0}
 	}
+snippet sdef
+	SynthDef(\\${1:synthName}, {${2}
+		${0}
+	}).add;

From ac7fc9b5691ce751c0a2d54219bbc0a3fe46d9e4 Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Sun, 11 Oct 2015 14:03:37 +0200
Subject: [PATCH 0732/1587] Fix fold* snippets.

---
 UltiSnips/all.snippets | 10 +++++-----
 pythonx/vimsnippets.py |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 385df484e..0e286e5a0 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -10,7 +10,7 @@ priority -60
 # NICE BOXES #
 ##############
 global !p
-from vimsnippets import foldmarker, make_box
+from vimsnippets import foldmarker, make_box, get_comment_format
 endglobal
 
 snippet box "A nice box with the current comment symbol" b
@@ -40,17 +40,17 @@ $0
 endsnippet
 
 snippet fold "Insert a vim fold marker" b
-`!p snip.rv = _get_comment_format()[0]` ${1:Fold description} `!p snip.rv = foldmarker()[0]`${2:1} `!p snip.rv = _get_comment_format()[2]`
+`!p snip.rv = get_comment_format()[0]` ${1:Fold description} `!p snip.rv = foldmarker()[0]`${2:1} `!p snip.rv = get_comment_format()[2]`
 endsnippet
 
 snippet foldc "Insert a vim fold close marker" b
-`!p snip.rv = _get_comment_format()[0]` ${2:1}`!p snip.rv = foldmarker()[1]` `!p snip.rv = _get_comment_format()[2]`
+`!p snip.rv = get_comment_format()[0]` ${2:1}`!p snip.rv = foldmarker()[1]` `!p snip.rv = get_comment_format()[2]`
 endsnippet
 
 snippet foldp "Insert a vim fold marker pair" b
-`!p snip.rv = _get_comment_format()[0]` ${1:Fold description} `!p snip.rv = foldmarker()[0]` `!p snip.rv = _get_comment_format()[2]`
+`!p snip.rv = get_comment_format()[0]` ${1:Fold description} `!p snip.rv = foldmarker()[0]` `!p snip.rv = get_comment_format()[2]`
 ${2:${VISUAL:Content}}
-`!p snip.rv = _get_comment_format()[0]` `!p snip.rv = foldmarker()[1]` $1 `!p snip.rv = _get_comment_format()[2]`
+`!p snip.rv = get_comment_format()[0]` `!p snip.rv = foldmarker()[1]` $1 `!p snip.rv = get_comment_format()[2]`
 endsnippet
 
 ##########################
diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index c2e89d042..d20022956 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -58,7 +58,7 @@ def _parse_comments(s):
     except StopIteration:
         return rv
 
-def _get_comment_format():
+def get_comment_format():
     """ Returns a 4-element tuple (first_line, middle_lines, end_line, indent)
     representing the comment format for the current file.
 
@@ -78,7 +78,7 @@ def _get_comment_format():
 
 
 def make_box(twidth, bwidth=None):
-    b, m, e, i = _get_comment_format()
+    b, m, e, i = get_comment_format()
     bwidth_inner = bwidth - 3 - max(len(b), len(i + e)) if bwidth else twidth + 2
     sline = b + m + bwidth_inner * m[0] + 2 * m[0]
     nspaces = (bwidth_inner - twidth) // 2

From 9f21ea89459aec37553f6cfe0203c50529747912 Mon Sep 17 00:00:00 2001
From: ricardogcolombo <ricardogcolombo@gmail.com>
Date: Mon, 12 Oct 2015 11:11:49 -0300
Subject: [PATCH 0733/1587] rename openui5 snippet file

---
 .../{javascript_openui5.snippets => javascript-openui5.snippets}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename UltiSnips/{javascript_openui5.snippets => javascript-openui5.snippets} (100%)

diff --git a/UltiSnips/javascript_openui5.snippets b/UltiSnips/javascript-openui5.snippets
similarity index 100%
rename from UltiSnips/javascript_openui5.snippets
rename to UltiSnips/javascript-openui5.snippets

From f5c77ac013bad032c2dfe605a38ac620a4cd7d8a Mon Sep 17 00:00:00 2001
From: Indra Susila <dota2.qipoy@gmail.com>
Date: Mon, 19 Oct 2015 23:50:42 +0700
Subject: [PATCH 0734/1587] proposes to return to the convention ruby

---
 snippets/eruby.snippets | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index 00696963c..adad8cb06 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -22,23 +22,23 @@ snippet for
 		${0}
 	<% end %>
 snippet rp
-	<%= render :partial => '${0:item}' %>
+	<%= render partial: '${0:item}' %>
 snippet rpl
-	<%= render :partial => '${1:item}', :locals => { :${2:name} => '${3:value}'${0} } %>
+	<%= render partial: '${1:item}', locals: { :${2:name} => '${3:value}'${0} } %>
 snippet rps
-	<%= render :partial => '${1:item}', :status => ${0:500} %>
+	<%= render partial: '${1:item}', status: ${0:500} %>
 snippet rpc
-	<%= render :partial => '${1:item}', :collection => ${0:items} %>
+	<%= render partial: '${1:item}', collection: ${0:items} %>
 snippet lia
-	<%= link_to '${1:link text...}', :action => '${0:index}' %>
+	<%= link_to '${1:link text...}', action: '${0:index}' %>
 snippet liai
-	<%= link_to '${1:link text...}', :action => '${2:edit}', :id => ${0:@item} %>
+	<%= link_to '${1:link text...}', action: '${2:edit}', id: ${0:@item} %>
 snippet lic
-	<%= link_to '${1:link text...}', :controller => '${0:items}' %>
+	<%= link_to '${1:link text...}', controller: '${0:items}' %>
 snippet lica
-	<%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${0:index}' %>
+	<%= link_to '${1:link text...}', controller: '${2:items}', action: '${0:index}' %>
 snippet licai
-	<%= link_to '${1:link text...}', :controller => '${2:items}', :action => '${3:edit}', :id => ${0:@item} %>
+	<%= link_to '${1:link text...}', controller: '${2:items}', action: '${3:edit}', id: ${0:@item} %>
 snippet yield
 	<%= yield ${1::content_symbol} %>
 snippet conf
@@ -110,11 +110,11 @@ snippet ofcfs
 snippet ofs
 	<%= options_for_select ${1:collection}, ${2:value_method} %>
 snippet rf
-	<%= render :file => "${1:file}"${0} %>
+	<%= render file: "${1:file}"${0} %>
 snippet rt
-	<%= render :template => "${1:file}"${0} %>
+	<%= render template: "${1:file}"${0} %>
 snippet slt
-	<%= stylesheet_link_tag ${1::all}, :cache => ${0:true} %>
+	<%= stylesheet_link_tag ${1::all}, cache: ${0:true} %>
 snippet sslt
 	<%= stylesheet_link_tag "${0}" %>
 snippet if

From d4e625087e6d5835a6dde91201f439bc6e37382c Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 21 Oct 2015 19:03:52 +0100
Subject: [PATCH 0735/1587] Ruby: Remove cla collision

---
 snippets/ruby.snippets | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 6b9d85d7c..e9509a294 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -1,12 +1,7 @@
-# encoding for Ruby 1.9
 snippet enc
 	# encoding: utf-8
-
-# #!/usr/bin/env ruby
 snippet #!
 	#!/usr/bin/env ruby
-	# encoding: utf-8
-
 # New Block
 snippet =b
 	=begin rdoc
@@ -29,15 +24,12 @@ snippet beg
 		${0}
 	rescue ${1:Exception} => ${2:e}
 	end
-
 snippet req require
 	require '${1}'
 snippet reqr
 	require_relative '${1}'
 snippet #
 	# =>
-snippet end
-	__END__
 snippet case
 	case ${1:object}
 	when ${2:condition}
@@ -115,7 +107,7 @@ snippet cla class .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		${0}
 	end
-snippet cla class .. initialize .. end
+snippet clai class .. initialize .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		def initialize(${2:args})
 			${0}

From beb77e60435d8e6177b32b9aa269ce2611a08f96 Mon Sep 17 00:00:00 2001
From: Iuri Fernandes <iurifq@gmail.com>
Date: Sun, 25 Oct 2015 22:33:04 +0100
Subject: [PATCH 0736/1587] Improve Elixir defmo snippet with name based on
 filename

---
 snippets/elixir.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 155d7cd2e..d89ff0335 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -70,7 +70,7 @@ snippet defma
 		${0}
 	end
 snippet defmo
-	defmodule ${1:module_name} do
+	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		${0}
 	end
 snippet defp

From 0472d63cf47b596127d7dbd208498d51d0a943df Mon Sep 17 00:00:00 2001
From: mangege <mr.mangege@gmail.com>
Date: Thu, 29 Oct 2015 14:36:18 +0800
Subject: [PATCH 0737/1587] add i and w option to eruby

---
 UltiSnips/eruby.snippets | 62 ++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index b626cc4a9..eaf7ab100 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -27,11 +27,11 @@ def textmate_var(var, snip):
 endglobal
 
 
-snippet % "<% ${0} %>"
+snippet % "<% ${0} %>" i
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`${0}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
 endsnippet
 
-snippet = "<%= ${0} %>"
+snippet = "<%= ${0} %>" i
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${0}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
@@ -43,59 +43,59 @@ snippet fi "<%= Fixtures.identify(:symbol) %>"
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`Fixtures.identify(:${1:name})`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`$0
 endsnippet
 
-snippet ft "form_tag"
+snippet ft "form_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => '${5:update}'}${6:, {:${8:class} => '${9:form}'\}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
-snippet ffs "form_for submit 2"
+snippet ffs "form_for submit 2" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${1:f}.submit '${2:Submit}'${3:, :disable_with => '${4:$2ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f_fields_for (nff)"
+snippet f. "f_fields_for (nff)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`f.fields_for :${1:attribute} do |${2:f}|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
 	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
-snippet f. "f.checkbox"
+snippet f. "f.checkbox" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.check_box :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.file_field"
+snippet f. "f.file_field" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.file_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.hidden_field"
+snippet f. "f.hidden_field" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.hidden_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.label"
+snippet f. "f.label" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.label :${1:attribute}${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.password_field"
+snippet f. "f.password_field" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.password_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.radio_button"
+snippet f. "f.radio_button" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_button :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.submit"
+snippet f. "f.submit" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.submit "${1:Submit}"${2:, :disable_with => '${3:$1ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.text_area"
+snippet f. "f.text_area" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_area :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet f. "f.text_field"
+snippet f. "f.text_field" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet ffe "form_for with errors"
+snippet ffe "form_for with errors" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`error_messages_for :${1:model}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`form_for @${2:$1} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
@@ -103,17 +103,17 @@ snippet ffe "form_for with errors"
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
-snippet ff "form_for"
+snippet ff "form_for" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`form_for @${1:model} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
-snippet ist "image_submit_tag"
+snippet ist "image_submit_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_submit_tag("${1:agree.png}"${2:${3:, :id => "${4:${1/^(\w+)(\.\w*)?$/$1/}}"}${5:, :name => "${6:${1/^(\w+)(\.\w*)?$/$1/}}"}${7:, :class => "${8:${1/^(\w+)(\.\w*)?$/$1/}-button}"}${9:, :disabled => ${10:false}}})`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet it "image_tag"
+snippet it "image_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_tag "$1${2:.png}"${3:${4:, :title => "${5:title}"}${6:, :class => "${7:class}"}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
@@ -121,47 +121,47 @@ snippet layout "layout"
 layout "${1:template_name}"${2:${3:, :only => ${4:[:${5:action}, :${6:action}]}}${7:, :except => ${8:[:${9:action}, :${10:action}]}}}
 endsnippet
 
-snippet jit "javascript_include_tag"
+snippet jit "javascript_include_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`javascript_include_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lia "link_to (action)"
+snippet lia "link_to (action)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet liai "link_to (action, id)"
+snippet liai "link_to (action, id)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:edit}", :id => ${3:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lic "link_to (controller)"
+snippet lic "link_to (controller)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lica "link_to (controller, action)"
+snippet lica "link_to (controller, action)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet licai "link_to (controller, action, id)"
+snippet licai "link_to (controller, action, id)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:edit}", :id => ${4:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet linpp "link_to (nested path plural)"
+snippet linpp "link_to (nested path plural)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${10:parent}_${11:child}_path(${12:@}${13:${10}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet linp "link_to (nested path)"
+snippet linp "link_to (nested path)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lipp "link_to (path plural)"
+snippet lipp "link_to (path plural)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${4:model}s_path}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lip "link_to (path)"
+snippet lip "link_to (path)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:model}_path(${13:@}${14:${12}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet lim "link_to model"
+snippet lim "link_to model" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:model}.${2:name}, ${3:${4:$1}_path(${14:$1})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
@@ -213,11 +213,11 @@ snippet rps "render (partial,status) (rps)"
 render :partial => "${1:item}", :status => ${2:500}
 endsnippet
 
-snippet slt "stylesheet_link_tag"
+snippet slt "stylesheet_link_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`stylesheet_link_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
-snippet st "submit_tag"
+snippet st "submit_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`submit_tag "${1:Save changes}"${2:, :id => "${3:submit}"}${4:, :name => "${5:$3}"}${6:, :class => "${7:form_$3}"}${8:, :disabled => ${9:false}}${10:, :disable_with => "${11:Please wait...}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 

From 131034997b03c5615a2969d7a13373770b08037b Mon Sep 17 00:00:00 2001
From: mangege <mr.mangege@gmail.com>
Date: Thu, 29 Oct 2015 14:47:07 +0800
Subject: [PATCH 0738/1587] fix form tag

---
 UltiSnips/eruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index eaf7ab100..21e9ca093 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -44,7 +44,7 @@ snippet fi "<%= Fixtures.identify(:symbol) %>"
 endsnippet
 
 snippet ft "form_tag" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => '${5:update}'}${6:, {:${8:class} => '${9:form}'\}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => '${2:update}'}${3:, ${4:${5:class} => '${6:form}'\}}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet

From e12c3e63c771059e756a9e6bd555332adc95c90a Mon Sep 17 00:00:00 2001
From: mangege <mr.mangege@gmail.com>
Date: Thu, 29 Oct 2015 15:03:45 +0800
Subject: [PATCH 0739/1587] add link_to

---
 UltiSnips/eruby.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index 21e9ca093..fe38c2fcc 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -125,6 +125,10 @@ snippet jit "javascript_include_tag" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`javascript_include_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
+snippet lt "link_to (name, dest)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", ${2:dest}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
 snippet lia "link_to (action)" w
 `!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet

From 1c08287613c75265055811c3fe2b2649b7484363 Mon Sep 17 00:00:00 2001
From: Nate Mara <natemara@gmail.com>
Date: Wed, 4 Nov 2015 16:35:52 +0100
Subject: [PATCH 0740/1587] Add comment ending ifndef block to ifndef c snippet

---
 UltiSnips/c.snippets | 2 +-
 snippets/c.snippets  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 3ee3fa40b..56f34e5e0 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -11,7 +11,7 @@ endsnippet
 snippet ifndef "#ifndef ... #define ... #endif"
 #ifndef ${1/([A-Za-z0-9_]+).*/$1/}
 #define ${1:SYMBOL} ${2:value}
-#endif
+#endif /* ifndef $1 */
 endsnippet
 
 snippet #if "#if #endif" b
diff --git a/snippets/c.snippets b/snippets/c.snippets
index 6a1cbaa7a..f4745c25b 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -25,7 +25,7 @@ snippet Inc
 snippet ndef
 	#ifndef $1
 	#define ${1:SYMBOL} ${2:value}
-	#endif
+	#endif /* ifndef $1 */
 # define
 snippet def
 	#define

From 5b1a9d4f602ccf38ce204c8f5312eed631a0e259 Mon Sep 17 00:00:00 2001
From: Martin Heuschober <epsilonhalbe@gmail.com>
Date: Fri, 6 Nov 2015 13:44:07 +0100
Subject: [PATCH 0741/1587] Included Option pragma

- included OPTION_GHC pragma
- and removed unnecessary tab in module where clause
---
 snippets/haskell.snippets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index d5c42c717..7f3c78547 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -2,6 +2,8 @@ snippet lang
 	{-# LANGUAGE ${0:OverloadedStrings} #-}
 snippet haddock
 	{-# OPTIONS_HADDOCK ${0:hide} #-}
+snippet ghc
+	{-# OPTIONS_GHC ${0:-fno-warn-unused-imports} #-}
 snippet inline
 	{-# INLINE ${0:name} #-}
 snippet info
@@ -40,7 +42,7 @@ snippet class
 		${0}
 snippet module
 	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (
-	)	where
+	) where
 	`expand('%') =~ 'Main' ? "\n\nmain = do\n  print \"hello world\"" : ""`
 
 snippet const

From cfb046a734c3e0e8573185955405db77f7ac5d7f Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Sat, 7 Nov 2015 13:30:52 +0100
Subject: [PATCH 0742/1587] htmldjango extends html.

---
 snippets/htmldjango.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/snippets/htmldjango.snippets b/snippets/htmldjango.snippets
index be087cec5..7d14ca833 100644
--- a/snippets/htmldjango.snippets
+++ b/snippets/htmldjango.snippets
@@ -1,5 +1,7 @@
 # Generic tags
 
+extends html
+
 snippet %
 	{% ${1} %}
 snippet %%
@@ -138,4 +140,3 @@ snippet urlizetrunc
 	urlizetrunc:${0}
 snippet wordwrap
 	wordwrap:${0}
-

From d88a8c34b4c9fab961af22c72d24d637ef3da9f2 Mon Sep 17 00:00:00 2001
From: Tomasz Wisniewski <tomasz.wisniewski@youview.com>
Date: Mon, 9 Nov 2015 15:35:08 +0000
Subject: [PATCH 0743/1587] Add cpp specific include snippet

The standard inclusion template has been changed from "stdio.h" to
iostream. In case of C++, the user most likely will work with STL
containers/headers which by default don't require the ".h" extension.
---
 snippets/cpp.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 632f76f92..6185ed903 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -1,5 +1,11 @@
 extends c
 
+##
+## Preprocessor
+# #include <...>
+snippet inc
+	#include <${1:iostream}>
+##
 ## STL Collections
 # std::array
 snippet array

From 4b26cb7df63ba21e3c0b9c369d9107d9c5511379 Mon Sep 17 00:00:00 2001
From: Tomasz Wisniewski <tomasz.wisniewski@youview.com>
Date: Mon, 9 Nov 2015 15:39:38 +0000
Subject: [PATCH 0744/1587] Add boost include snippet

Boost headers have a ".hpp" extension and are contained within the boost
directory. This commit adds a "binc" snippet - a dedicated snippet to
include boost headers.
---
 snippets/cpp.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 6185ed903..ca9fbe3c6 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -5,6 +5,8 @@ extends c
 # #include <...>
 snippet inc
 	#include <${1:iostream}>
+snippet binc
+	#include <boost/${1:shared_ptr}.hpp>
 ##
 ## STL Collections
 # std::array

From 6cfc49ab13101b58cf4532569b5e5df7bb234fb2 Mon Sep 17 00:00:00 2001
From: Kevin Lui <kevinywlui@gmail.com>
Date: Mon, 9 Nov 2015 16:09:24 -0800
Subject: [PATCH 0745/1587] added more enum environments, changed default text
 in lim to n\to\infty, added set bracket as snippet

---
 snippets/tex.snippets | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 0727cb451..9c18178e6 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -76,6 +76,14 @@ snippet enum enumerate environment
 	\begin{enumerate}
 		\item ${0}
 	\end{enumerate}
+snippet enuma enumerate environment
+	\begin{enumerate}[(a)]
+		\item ${0}
+	\end{enumerate}
+snippet enumi enumerate environment
+	\begin{enumerate}[(i)]
+		\item ${0}
+	\end{enumerate}
 # Itemize
 snippet itemize itemize environment
 	\begin{itemize}
@@ -249,7 +257,7 @@ snippet frac \frac{}{}
 snippet sum \sum^{}_{}
 	\sum^{${1:n}}_{${2:i=1}} ${0}
 snippet lim \lim_{}
-	\lim_{${1:x \to +\infty}} ${0}
+	\lim_{${1:n \to \infty}} ${0}
 snippet frame frame environment
 	\begin{frame}[${1:t}]{${2:title}}
 		${0}
@@ -275,6 +283,8 @@ snippet col2 two-column environment
 			${0}
 		\end{column}
 	\end{columns}
+snippet \{ \{ \}
+	\{ ${0} \}
 #delimiter
 snippet lr( left( right) 
 	\left( ${0} \right)
@@ -286,7 +296,6 @@ snippet lr[ left[ right]
 	\left[ ${0} \right]
 snippet lra langle rangle 
 	\langle ${0} \rangle
-
 # Code listings
 snippet lst
 	\begin{listing}[language=${1:language}]

From dd4180f237e0cd6e6f31d8f24c7dce558226de32 Mon Sep 17 00:00:00 2001
From: Kevin Lui <kevinywlui@gmail.com>
Date: Mon, 9 Nov 2015 16:09:24 -0800
Subject: [PATCH 0746/1587] tex snippets

---
 snippets/tex.snippets | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 0727cb451..db81f17dc 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -76,6 +76,14 @@ snippet enum enumerate environment
 	\begin{enumerate}
 		\item ${0}
 	\end{enumerate}
+snippet enuma enumerate environment
+	\begin{enumerate}[(a)]
+		\item ${0}
+	\end{enumerate}
+snippet enumi enumerate environment
+	\begin{enumerate}[(i)]
+		\item ${0}
+	\end{enumerate}
 # Itemize
 snippet itemize itemize environment
 	\begin{itemize}
@@ -249,7 +257,7 @@ snippet frac \frac{}{}
 snippet sum \sum^{}_{}
 	\sum^{${1:n}}_{${2:i=1}} ${0}
 snippet lim \lim_{}
-	\lim_{${1:x \to +\infty}} ${0}
+	\lim_{${1:n \to \infty}} ${0}
 snippet frame frame environment
 	\begin{frame}[${1:t}]{${2:title}}
 		${0}
@@ -275,6 +283,8 @@ snippet col2 two-column environment
 			${0}
 		\end{column}
 	\end{columns}
+snippet \{ \{ \}
+	\\{ ${0} \\}
 #delimiter
 snippet lr( left( right) 
 	\left( ${0} \right)
@@ -286,7 +296,6 @@ snippet lr[ left[ right]
 	\left[ ${0} \right]
 snippet lra langle rangle 
 	\langle ${0} \rangle
-
 # Code listings
 snippet lst
 	\begin{listing}[language=${1:language}]

From 9f29885c8804cd41f3b8e3d93e10740187e55842 Mon Sep 17 00:00:00 2001
From: Michael Rutter <humean@users.noreply.github.com>
Date: Fri, 20 Nov 2015 11:50:26 +0000
Subject: [PATCH 0747/1587] Fix overall svg canvas height/width attribute

Typically the appended svg on line 18-20 needs to have a width/height that includes the margins. An example can be found here: http://bl.ocks.org/mbostock/3883245.
---
 snippets/javascript/javascript.d3.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/javascript/javascript.d3.snippets b/snippets/javascript/javascript.d3.snippets
index a3f7fa7a5..f5be91890 100644
--- a/snippets/javascript/javascript.d3.snippets
+++ b/snippets/javascript/javascript.d3.snippets
@@ -16,8 +16,8 @@ snippet marginconvention
 	var ${8:height} = ${9:500} - $1.top - $1.bottom;
 	
 	var ${10:svg} = d3.select("${11}").append("svg")
-	  .attr("width", $6)
-	  .attr("height", $8)
+	  .attr("width", $6 + $1.left + $1.right)
+	  .attr("height", $8 + $1.top + $1.bottom)
 	    .append("g")
 	  .attr("transform", "translate(" + $1.left + "," + $1.top + ")")
 snippet nest

From 45ef7b642514cb609de241132e302767ec7ee26a Mon Sep 17 00:00:00 2001
From: yvhn <yvhn.yvhn@gmail.com>
Date: Sat, 21 Nov 2015 15:18:02 +0200
Subject: [PATCH 0748/1587] Add "ipy" snippet to embed IPython shell into the
 code

---
 UltiSnips/python.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index af8106917..9372bdcf6 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -630,6 +630,10 @@ snippet pdb "Set PDB breakpoint" b
 import pdb; pdb.set_trace()
 endsnippet
 
+snippet ipy "Embed IPython shell" b
+import IPython; IPython.embed()
+endsnippet
+
 snippet ipdb "Set IPDB breakpoint" b
 import ipdb; ipdb.set_trace()
 endsnippet

From 11ad17eac94b1b3fcfd9afd6dde474eb51e5f23a Mon Sep 17 00:00:00 2001
From: ChickenNuggers <charlesh2016@usd402.com>
Date: Thu, 26 Nov 2015 11:39:05 -0600
Subject: [PATCH 0749/1587] lua snippet // loops, blocks, and pcall

---
 UltiSnips/lua.snippets | 59 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/UltiSnips/lua.snippets b/UltiSnips/lua.snippets
index bc59c60cc..b6d0c1a34 100644
--- a/UltiSnips/lua.snippets
+++ b/UltiSnips/lua.snippets
@@ -32,6 +32,65 @@ for ${1:i}=${2:first},${3:last}${4/^..*/(?0:,:)/}${4:step} do
 end
 endsnippet
 
+snippet do "do block"
+do
+	$0
+end
+endsnippet
+
+snippet repeat "repeat loop" b
+repeat
+	$1
+until $0
+endsnippet
+
+snippet while "while loop" b
+while $1 do
+	$0
+end
+endsnippet
+
+snippet if "if statement" b
+if $1 then
+	$0
+end
+endsnippet
+
+snippet ife "if/else statement" b
+if $1 then
+	$2
+else
+	$0
+end
+endsnippet
+
+snippet eif "if/elseif statement" b
+if $1 then
+	$2
+elseif $3 then
+	$0
+end
+endsnippet
+
+snippet eife "if/elseif/else statement" b
+if $1 then
+	$2
+elseif $3 then
+	$4
+else
+	$0
+end
+endsnippet
+
+snippet pcall "pcall statement" b
+local ok, err = pcall(${1:your_function})
+if not ok then
+	handler(${2:ok, err})
+${3:else
+	success(${4:ok, err})
+}end
+endsnippet
+
 snippet local "local x = 1"
 local ${1:x} = ${0:1}
 endsnippet

From b5ab96b6a59877107e32b8c0e1fc4b8178bbc1ce Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 28 Nov 2015 00:50:02 +0000
Subject: [PATCH 0750/1587] Reorganise Haskell snippets

---
 UltiSnips/haskell.snippets | 68 --------------------------------------
 snippets/haskell.snippets  | 15 ++++++---
 2 files changed, 10 insertions(+), 73 deletions(-)
 delete mode 100644 UltiSnips/haskell.snippets

diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets
deleted file mode 100644
index 419edb4b7..000000000
--- a/UltiSnips/haskell.snippets
+++ /dev/null
@@ -1,68 +0,0 @@
-priority -50
-
-snippet if "if ... then ... else ..."
-if ${1:condition}
-	then ${2:expression}
-	else ${3:expression}
-endsnippet
-
-snippet case "case ... of ..."
-case ${1:expression} of
-	${2:pattern} -> ${3:expression}
-	${4:pattern} -> ${5:expression}
-endsnippet
-
-snippet :: "Type signature"
-${1:name} :: ${2:Type} -> ${3:Type}
-endsnippet
-
-snippet => "Type constraint"
-(${1:Class} ${2:a}) => $2
-endsnippet
-
-snippet def "Function definition"
-${1:name} :: ${2:Type} -> ${3:Type}
-endsnippet
-
-snippet def[] "Function definition for list patterns"
-${1:name} :: [${2:Type}] -> ${3:Type}
-$1 [] = ${4:undefined}
-$1 ${5:(x:xs)} = ${6:undefined}
-endsnippet
-
-snippet = "Function clause"
-${1:name} ${2:pattern} = ${3:undefined}
-endsnippet
-
-snippet 2= "Function clause"
-${1:name} ${2:pattern} = ${3:undefined}
-$1 ${4:pattern} = ${5:undefined}
-endsnippet
-
-snippet 3= "Function clause"
-${1:name} ${2:pattern} = ${3:undefined}
-$1 ${4:pattern} = ${5:undefined}
-$1 ${6:pattern} = ${7:undefined}
-endsnippet
-
-snippet | "Guard"
-| ${1:predicate} = ${2:undefined}
-endsnippet
-
-snippet \ "Lambda expression"
-\\${1:pattern} -> ${2:expression}
-endsnippet
-
-snippet [|] "List comprehension"
-[${3:foo }$1 | ${1:x} <- ${2:xs} ]
-endsnippet
-
-snippet let "let ... in ..."
-let ${1:name} = ${2:expression}
-in ${3:expression}
-endsnippet
-
-snippet wh "where x = expression"
-where
-	${1:name} = ${2:expression}
-endsnippet
diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 7f3c78547..09bbc2bd3 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -8,7 +8,7 @@ snippet inline
 	{-# INLINE ${0:name} #-}
 snippet info
 	-- |
-	-- Module      :  ${1:Module.Namespace}
+	-- Module      :  ${1:`substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')`}
 	-- Copyright   :  ${2:Author} ${3:2011-2012}
 	-- License     :  ${4:BSD3}
 	--
@@ -43,8 +43,11 @@ snippet class
 snippet module
 	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (
 	) where
-	`expand('%') =~ 'Main' ? "\n\nmain = do\n  print \"hello world\"" : ""`
+	`expand('%') =~ 'a' ? "\nmain :: IO ()\nmain = undefined" : ""`
 
+snippet main
+	main :: IO ()
+	main = ${0:undefined}
 snippet const
 	${1:name} :: ${2:a}
 	$1 = ${0:undefined}
@@ -54,11 +57,13 @@ snippet fn
 snippet fn2
 	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a}
 	$1 ${5} = ${0:undefined}
+snippet fn3
+	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
+	$1 ${6} = ${0:undefined}
+snippet => "Type constraint"
+	(${1:Class} ${2:a}) => $2
 snippet ap
 	${1:map} ${2:fn} ${0:list}
-snippet do
-	do
-
 snippet \
 	\\${1:x} -> ${0:expression}
 snippet (\

From 449146007474e9d474a7b0cbf6508da9bad548b4 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 28 Nov 2015 22:16:16 +0000
Subject: [PATCH 0751/1587] Haskell: Add hspec snippets

---
 snippets/haskell.snippets | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 09bbc2bd3..5cf094c3b 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -91,3 +91,23 @@ snippet let
 snippet where
 	where
 		${1:fn} = ${0:undefined}
+snippet spec
+	import Test.Hspec
+	import Test.QuickCheck
+
+	main :: IO ()
+	main = hspec spec
+
+	spec :: Spec
+	spec =
+		describe "${1}" $ do
+			$0
+snippet desc
+	describe "${1}" $ do
+		$0
+snippet it
+	it "${1}" $
+		$0
+snippet itp
+	it "${1}" $ property $
+		$0

From fa69fcdc0b4c6d712e1c36250f482116d1fcfbf8 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 28 Nov 2015 22:56:04 +0000
Subject: [PATCH 0752/1587] Haskell: Correct module Main expansion

---
 snippets/haskell.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 5cf094c3b..4d4019979 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -43,7 +43,7 @@ snippet class
 snippet module
 	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (
 	) where
-	`expand('%') =~ 'a' ? "\nmain :: IO ()\nmain = undefined" : ""`
+	`expand('%') =~ 'Main' ? "\nmain :: IO ()\nmain = undefined" : ""`
 
 snippet main
 	main :: IO ()

From 4d35e3b31f2fcfc81bc26b2e0ec8c72b4f1f4e5f Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 28 Nov 2015 22:58:14 +0000
Subject: [PATCH 0753/1587] Haskell: Add module statement to spec

---
 snippets/haskell.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 4d4019979..02a23000e 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -92,6 +92,8 @@ snippet where
 	where
 		${1:fn} = ${0:undefined}
 snippet spec
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (main spec) where
+
 	import Test.Hspec
 	import Test.QuickCheck
 

From a6d9f6a098d7d942a76d033bbb01ec5b16913463 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 28 Nov 2015 23:12:08 +0000
Subject: [PATCH 0754/1587] Haskell: Fix typo

---
 snippets/haskell.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 02a23000e..e4957e4ce 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -92,7 +92,7 @@ snippet where
 	where
 		${1:fn} = ${0:undefined}
 snippet spec
-	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (main spec) where
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (main, spec) where
 
 	import Test.Hspec
 	import Test.QuickCheck

From ac285bbb29b355202714a94de293f1846ee9ed53 Mon Sep 17 00:00:00 2001
From: Derek Morey <dman6505@gmail.com>
Date: Tue, 1 Dec 2015 00:03:58 -0500
Subject: [PATCH 0755/1587] XML snippets file added

---
 snippets/xml.snippets | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 snippets/xml.snippets

diff --git a/snippets/xml.snippets b/snippets/xml.snippets
new file mode 100644
index 000000000..c994529b8
--- /dev/null
+++ b/snippets/xml.snippets
@@ -0,0 +1,14 @@
+# xml declaration
+snippet xml
+	<?xml version="1.0" encoding="UTF-8"?>
+
+# tag
+snippet t
+	<${1:}>
+		${2}
+	</$1>
+
+# inline tag
+snippet ti
+	<${1:}>${2}</$1>
+

From f15d9faa31be42f4f5900918ec6826acb2c3e2a1 Mon Sep 17 00:00:00 2001
From: Derek Morey <dman6505@gmail.com>
Date: Wed, 2 Dec 2015 11:39:04 -0500
Subject: [PATCH 0756/1587] removed empty lines between snippets

---
 snippets/xml.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/snippets/xml.snippets b/snippets/xml.snippets
index c994529b8..0ab346ba2 100644
--- a/snippets/xml.snippets
+++ b/snippets/xml.snippets
@@ -1,13 +1,11 @@
 # xml declaration
 snippet xml
 	<?xml version="1.0" encoding="UTF-8"?>
-
 # tag
 snippet t
 	<${1:}>
 		${2}
 	</$1>
-
 # inline tag
 snippet ti
 	<${1:}>${2}</$1>

From 5886db69278b56667d83c9e937afd6308af3a7ff Mon Sep 17 00:00:00 2001
From: Mattia Tezzele <zool.bib@gmail.com>
Date: Sun, 6 Dec 2015 14:39:46 +0100
Subject: [PATCH 0757/1587] Get rid of closing slashes in every void element

---
 snippets/html.snippets | 126 ++++++++++++++++++++---------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 89438b414..f41f983ed 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -159,18 +159,18 @@ snippet address
 		${0}
 	</address>
 snippet area
-	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}" />
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}">
 snippet area+
-	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}" />
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}">
 	area+
 snippet area:c
-	<area shape="circle" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="circle" coords="${1}" href="${2}" alt="${0}">
 snippet area:d
-	<area shape="default" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="default" coords="${1}" href="${2}" alt="${0}">
 snippet area:p
-	<area shape="poly" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="poly" coords="${1}" href="${2}" alt="${0}">
 snippet area:r
-	<area shape="rect" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="rect" coords="${1}" href="${2}" alt="${0}">
 snippet article
 	<article>
 		${0}
@@ -200,7 +200,7 @@ snippet audio
 snippet b
 	<b>${0}</b>
 snippet base
-	<base href="${1}" target="${0}" />
+	<base href="${1}" target="${0}">
 snippet bdi
 	<bdi>${0}</bdo>
 snippet bdo
@@ -218,7 +218,7 @@ snippet body
 		${0}
 	</body>
 snippet br
-	<br />
+	<br>
 snippet button
 	<button type="${1:submit}">${0}</button>
 snippet button.
@@ -240,9 +240,9 @@ snippet cite
 snippet code
 	<code>${0}</code>
 snippet col
-	<col />
+	<col>
 snippet col+
-	<col />
+	<col>
 	col+
 snippet colgroup
 	<colgroup>
@@ -254,11 +254,11 @@ snippet colgroup+
 		col+${0}
 	</colgroup>
 snippet command
-	<command type="command" label="${1}" icon="${0}" />
+	<command type="command" label="${1}" icon="${0}">
 snippet command:c
-	<command type="checkbox" label="${1}" icon="${0}" />
+	<command type="checkbox" label="${1}" icon="${0}">
 snippet command:r
-	<command type="radio" radiogroup="${1}" label="${2}" icon="${0}" />
+	<command type="radio" radiogroup="${1}" label="${2}" icon="${0}">
 snippet datagrid
 	<datagrid>
 		${0}
@@ -330,7 +330,7 @@ snippet dt+
 snippet em
 	<em>${0}</em>
 snippet embed
-	<embed src="${1}" type="${0}" />
+	<embed src="${1}" type="${0}">
 snippet fieldset
 	<fieldset>
 		${0}
@@ -423,7 +423,7 @@ snippet h6#
 	<h6 id="${1}">${0}</h6>
 snippet head
 	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+		<meta http-equiv="content-type" content="text/html; charset=utf-8">
 
 		<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 		${0}
@@ -449,7 +449,7 @@ snippet hgroup.
 		${0}
 	</hgroup>
 snippet hr
-	<hr />
+	<hr>
 snippet html
 	<html>
 	${0}
@@ -493,59 +493,59 @@ snippet iframe.
 snippet iframe#
 	<iframe id="${1}" src="${2}" frameborder="0"></iframe>
 snippet img
-	<img src="${1}" alt="${2}" />
+	<img src="${1}" alt="${2}">
 snippet img.
-	<img class="${1}" src="${2}" alt="${3}" />
+	<img class="${1}" src="${2}" alt="${3}">
 snippet img#
-	<img id="${1}" src="${2}" alt="${3}" />
+	<img id="${1}" src="${2}" alt="${3}">
 snippet input
-	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}" />
+	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}">
 snippet input.
-	<input class="${1}" type="${2:text/submit/hidden/button/image}" name="${3}" id="${4:$3}" value="${5}" />
+	<input class="${1}" type="${2:text/submit/hidden/button/image}" name="${3}" id="${4:$3}" value="${5}">
 snippet input:text
-	<input type="text" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="text" name="${1}" id="${2:$1}" value="${3}">
 snippet input:submit
-	<input type="submit" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="submit" name="${1}" id="${2:$1}" value="${3}">
 snippet input:hidden
-	<input type="hidden" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="hidden" name="${1}" id="${2:$1}" value="${3}">
 snippet input:button
-	<input type="button" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="button" name="${1}" id="${2:$1}" value="${3}">
 snippet input:image
-	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}" />
+	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}">
 snippet input:checkbox
-	<input type="checkbox" name="${1}" id="${2:$1}" />
+	<input type="checkbox" name="${1}" id="${2:$1}">
 snippet input:radio
-	<input type="radio" name="${1}" id="${2:$1}" />
+	<input type="radio" name="${1}" id="${2:$1}">
 snippet input:color
-	<input type="color" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="color" name="${1}" id="${2:$1}" value="${3}">
 snippet input:date
-	<input type="date" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="date" name="${1}" id="${2:$1}" value="${3}">
 snippet input:datetime
-	<input type="datetime" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="datetime" name="${1}" id="${2:$1}" value="${3}">
 snippet input:datetime-local
-	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}">
 snippet input:email
-	<input type="email" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="email" name="${1}" id="${2:$1}" value="${3}">
 snippet input:file
-	<input type="file" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="file" name="${1}" id="${2:$1}" value="${3}">
 snippet input:month
-	<input type="month" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="month" name="${1}" id="${2:$1}" value="${3}">
 snippet input:number
-	<input type="number" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="number" name="${1}" id="${2:$1}" value="${3}">
 snippet input:password
-	<input type="password" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="password" name="${1}" id="${2:$1}" value="${3}">
 snippet input:range
-	<input type="range" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="range" name="${1}" id="${2:$1}" value="${3}">
 snippet input:reset
-	<input type="reset" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="reset" name="${1}" id="${2:$1}" value="${3}">
 snippet input:search
-	<input type="search" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="search" name="${1}" id="${2:$1}" value="${3}">
 snippet input:time
-	<input type="time" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="time" name="${1}" id="${2:$1}" value="${3}">
 snippet input:url
-	<input type="url" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="url" name="${1}" id="${2:$1}" value="${3}">
 snippet input:week
-	<input type="week" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="week" name="${1}" id="${2:$1}" value="${3}">
 snippet ins
 	<ins>${0}</ins>
 snippet kbd
@@ -579,19 +579,19 @@ snippet lia+
 	<li><a href="${2:#}">${1}</a></li>
 	lia+
 snippet link
-	<link rel="${1}" href="${2}" title="${3}" type="${4}" />
+	<link rel="${1}" href="${2}" title="${3}" type="${4}">
 snippet link:atom
-	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml" />
+	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml">
 snippet link:s
-	<link rel="stylesheet" href="${1:style.css}" />
+	<link rel="stylesheet" href="${1:style.css}">
 snippet link:css
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
 snippet link:favicon
-	<link rel="shortcut icon" href="${1:favicon.ico}" type="image/x-icon" />
+	<link rel="shortcut icon" href="${1:favicon.ico}" type="image/x-icon">
 snippet link:rss
-	<link rel="alternate" href="${1:rss.xml}" title="RSS" type="application/atom+xml" />
+	<link rel="alternate" href="${1:rss.xml}" title="RSS" type="application/atom+xml">
 snippet link:touch
-	<link rel="apple-touch-icon" href="${1:favicon.png}" />
+	<link rel="apple-touch-icon" href="${1:favicon.png}">
 snippet main
 	<main role="main">
 		${0}
@@ -610,7 +610,7 @@ snippet map#
 	</map>
 snippet map+
 	<map name="${1}">
-		<area shape="${2}" coords="${3}" href="${4}" alt="${5}" />${6}
+		<area shape="${2}" coords="${3}" href="${4}" alt="${5}">${6}
 	</map>
 snippet mark
 	<mark>${0}</mark>
@@ -627,17 +627,17 @@ snippet menu:t
 		${0}
 	</menu>
 snippet meta
-	<meta http-equiv="${1}" content="${2}" />
+	<meta http-equiv="${1}" content="${2}">
 snippet meta:s
-	<meta ${0} />
+	<meta ${0}>
 snippet meta:d
-	<meta name="description" content="${0}" />
+	<meta name="description" content="${0}">
 snippet meta:compat
-	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}" />
+	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}">
 snippet meta:refresh
-	<meta http-equiv="refresh" content="text/html;charset=UTF-8" />
+	<meta http-equiv="refresh" content="text/html;charset=UTF-8">
 snippet meta:utf
-	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+	<meta http-equiv="content-type" content="text/html;charset=UTF-8">
 snippet meter
 	<meter>${0}</meter>
 snippet nav
@@ -665,13 +665,13 @@ snippet movie
 	<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
 	codebase="http://www.apple.com/qtactivex/qtplugin.cab">
 		<param name="src" value="$1" />
-		<param name="controller" value="$4" />
-		<param name="autoplay" value="$5" />
+		<param name="controller" value="$4">
+		<param name="autoplay" value="$5">
 		<embed src="${1:movie.mov}"
 			width="${2:320}" height="${3:240}"
 			controller="${4:true}" autoplay="${5:true}"
 			scale="tofit" cache="true"
-			pluginspage="http://www.apple.com/quicktime/download/" />
+			pluginspage="http://www.apple.com/quicktime/download/">
 	</object>
 snippet ol
 	<ol>
@@ -711,7 +711,7 @@ snippet p.
 snippet p#
 	<p id="${1}">${0}</p>
 snippet param
-	<param name="${1}" value="${2}" />
+	<param name="${1}" value="${2}">
 snippet pre
 	<pre>
 		${0}
@@ -774,7 +774,7 @@ snippet select+
 snippet small
 	<small>${0}</small>
 snippet source
-	<source src="${1}" type="${2}" media="${0}" />
+	<source src="${1}" type="${2}" media="${0}">
 snippet span
 	<span>${0}</span>
 snippet span.
@@ -876,4 +876,4 @@ snippet var
 snippet video
 	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>
 snippet wbr
-	<wbr />
+	<wbr>

From e7ea5a46e95eaae6eac8134c1fe7bfd87e31932a Mon Sep 17 00:00:00 2001
From: Brian van Burken <brianvanburken@outlook.com>
Date: Mon, 7 Dec 2015 08:56:47 +0100
Subject: [PATCH 0758/1587] Added ECMAScript 6 snippet.

---
 snippets/javascript/javascript.es6.snippets | 34 +++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 snippets/javascript/javascript.es6.snippets

diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
new file mode 100644
index 000000000..dbceccf4f
--- /dev/null
+++ b/snippets/javascript/javascript.es6.snippets
@@ -0,0 +1,34 @@
+snippet const
+	const ${0} = ${1};
+
+snippet let
+	let ${0} = ${1};
+
+snippet im
+	import ${0} from '${1}';
+
+snippet inter
+	interface ${0} {
+		${1}
+	}
+
+snippet cls
+	class ${0} {
+		${1}
+	}
+
+snippet clex
+	class ${0} extends ${1} {
+		${2}
+	}
+
+snippet =>
+	(${0}) => {
+		${1}
+	}
+
+snippet sym
+	const ${0} = Symbol('${1}');
+
+snippet ed
+	export default ${0}

From 8ceb0a0bf2763bcbbe0a07e1664e4d0f24c7cbad Mon Sep 17 00:00:00 2001
From: Brian van Burken <brianvanburken@outlook.com>
Date: Mon, 7 Dec 2015 15:48:54 +0100
Subject: [PATCH 0759/1587] Removed blank lines.

---
 snippets/javascript/javascript.es6.snippets | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
index dbceccf4f..092c84e66 100644
--- a/snippets/javascript/javascript.es6.snippets
+++ b/snippets/javascript/javascript.es6.snippets
@@ -1,34 +1,26 @@
 snippet const
 	const ${0} = ${1};
-
 snippet let
 	let ${0} = ${1};
-
 snippet im
 	import ${0} from '${1}';
-
 snippet inter
 	interface ${0} {
 		${1}
 	}
-
 snippet cls
 	class ${0} {
 		${1}
 	}
-
 snippet clex
 	class ${0} extends ${1} {
 		${2}
 	}
-
 snippet =>
 	(${0}) => {
 		${1}
 	}
-
 snippet sym
 	const ${0} = Symbol('${1}');
-
 snippet ed
 	export default ${0}

From 30d0e22a23c011bf05fbeaa5f4bb99dd4a44342e Mon Sep 17 00:00:00 2001
From: Brian van Burken <brianvanburken@outlook.com>
Date: Mon, 7 Dec 2015 15:49:31 +0100
Subject: [PATCH 0760/1587] Changed trigger for class definition to commonly
 used cla.

---
 snippets/javascript/javascript.es6.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
index 092c84e66..775afef50 100644
--- a/snippets/javascript/javascript.es6.snippets
+++ b/snippets/javascript/javascript.es6.snippets
@@ -8,11 +8,11 @@ snippet inter
 	interface ${0} {
 		${1}
 	}
-snippet cls
+snippet cla
 	class ${0} {
 		${1}
 	}
-snippet clex
+snippet clax
 	class ${0} extends ${1} {
 		${2}
 	}

From 2af0128a20dc5b8785ce65abd546b3e55debb483 Mon Sep 17 00:00:00 2001
From: Brian van Burken <brianvanburken@outlook.com>
Date: Mon, 7 Dec 2015 15:50:02 +0100
Subject: [PATCH 0761/1587] Removed interface snippet from ES6.

---
 snippets/javascript/javascript.es6.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
index 775afef50..0d9e8c3ca 100644
--- a/snippets/javascript/javascript.es6.snippets
+++ b/snippets/javascript/javascript.es6.snippets
@@ -4,10 +4,6 @@ snippet let
 	let ${0} = ${1};
 snippet im
 	import ${0} from '${1}';
-snippet inter
-	interface ${0} {
-		${1}
-	}
 snippet cla
 	class ${0} {
 		${1}

From 0f4a7b3d5f341dcc0301aa5ebd18a60653a18825 Mon Sep 17 00:00:00 2001
From: Martin Atukunda <matlads@yahoo.co.uk>
Date: Tue, 8 Dec 2015 04:30:35 +0300
Subject: [PATCH 0762/1587] Update perl6.snippets shebang

Change the shebang snippet to correctly use env ( not enb )
---
 snippets/perl6.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/perl6.snippets b/snippets/perl6.snippets
index cdae5c93a..21ddf5bd0 100644
--- a/snippets/perl6.snippets
+++ b/snippets/perl6.snippets
@@ -1,6 +1,6 @@
 # shebang
 snippet #!
-	#!/usr/bin/enb perl6
+	#!/usr/bin/env perl6
 
 # Hash Pointer
 snippet .

From fc9195c9ce1455a661b1369dd8badf9582c4b5e7 Mon Sep 17 00:00:00 2001
From: Luiz Gonzaga dos Santos Filho <lfilho@gmail.com>
Date: Sat, 12 Dec 2015 16:31:10 -0200
Subject: [PATCH 0763/1587] Add simpler arrow function snippet

Not only `af` is 1 less keystroke, and the keys are very close (home row of the keyboard). `=` + `shift` + `.` (`=>`) are too far away from each other and takes too long to type :)
---
 snippets/javascript/javascript.es6.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
index 0d9e8c3ca..e1873c5e2 100644
--- a/snippets/javascript/javascript.es6.snippets
+++ b/snippets/javascript/javascript.es6.snippets
@@ -16,6 +16,10 @@ snippet =>
 	(${0}) => {
 		${1}
 	}
+snippet af
+	(${0}) => {
+		${1}
+	}
 snippet sym
 	const ${0} = Symbol('${1}');
 snippet ed

From 9863f7cf39acb65043a3e087f40ce04222216cc2 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 15 Dec 2015 22:21:45 +0000
Subject: [PATCH 0764/1587] Elixir @moduledoc false snippet

---
 snippets/elixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index d89ff0335..bd621760e 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -95,6 +95,8 @@ snippet mdoc
 	@moduledoc """
 	${0}
 	"""
+snippet mdocf
+	@moduledoc false
 snippet rec
 	receive do
 		${1} ->

From 63bd097393e1c49528d0be3d798f7248b5497ccd Mon Sep 17 00:00:00 2001
From: Yannick Brehon <yannickb@google.com>
Date: Wed, 16 Dec 2015 15:36:00 -0500
Subject: [PATCH 0765/1587] Fixed spacing issue with box and bbox.

When commentstring had a trailing space, such as '# %s', the rendered
box was incorrect.
---
 pythonx/vimsnippets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index d20022956..6a446a2a7 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -78,7 +78,7 @@ def get_comment_format():
 
 
 def make_box(twidth, bwidth=None):
-    b, m, e, i = get_comment_format()
+    b, m, e, i = (s.strip() for s in get_comment_format())
     bwidth_inner = bwidth - 3 - max(len(b), len(i + e)) if bwidth else twidth + 2
     sline = b + m + bwidth_inner * m[0] + 2 * m[0]
     nspaces = (bwidth_inner - twidth) // 2

From b563fa7a10c4a8f7344a4a55ace51e3cd7288ffd Mon Sep 17 00:00:00 2001
From: Paolo Cretaro <lorddarthfener@gmail.com>
Date: Tue, 29 Dec 2015 15:48:20 +0100
Subject: [PATCH 0766/1587] Add verilog snippets and refactor systemverilog
 removing duplicates

---
 snippets/systemverilog.snippets | 60 ++-----------------------------
 snippets/verilog.snippets       | 63 +++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 57 deletions(-)
 create mode 100644 snippets/verilog.snippets

diff --git a/snippets/systemverilog.snippets b/snippets/systemverilog.snippets
index 86d664f61..70a9d2d37 100644
--- a/snippets/systemverilog.snippets
+++ b/snippets/systemverilog.snippets
@@ -1,37 +1,6 @@
-# if statement
-snippet if
-	if (${1}) begin
-		${0}
-	end
-# If/else statements
-snippet ife
-	if (${1}) begin
-		${2}
-	end
-	else begin
-		${1}
-	end
-# Else if statement
-snippet eif
-	else if (${1}) begin
-		${0}
-	end
-#Else statement
-snippet el
-	else begin
-		${0}
-	end
-# While statement
-snippet wh
-	while (${1}) begin
-		${0}
-	end
-# Repeat Loop
-snippet rep
-	repeat (${1}) begin
-		${0}
-	end
-# Foreach Loopo
+extends verilog
+
+# Foreach Loop
 snippet fe
 	foreach (${1}) begin
 		${0}
@@ -41,24 +10,6 @@ snippet dowh
 	do begin
 		${0}
 	end while (${1});
-# Case statement
-snippet case
-	case (${1})
-		{$2}: begin
-			${0}
-		end
-		default: begin
-		end
-	endcase
-# CaseZ statement
-snippet casez
-casez (${1})
-		{$2}: begin
-			${0}
-		end
-		default: begin
-		end
-	endcase
 # Combinational always block
 snippet alc
 	always_comb begin ${1:: statement_label}
@@ -74,11 +25,6 @@ snippet all
 	always_latch begin ${1:: statement_label}
 		${0}
 	end $1
-# Module block
-snippet mod
-	module ${1:module_name} (${2});
-		${0}
-	endmodule : $1
 # Class
 snippet cl
 	class ${1:class_name};
diff --git a/snippets/verilog.snippets b/snippets/verilog.snippets
new file mode 100644
index 000000000..5cd80f39b
--- /dev/null
+++ b/snippets/verilog.snippets
@@ -0,0 +1,63 @@
+# if statement
+snippet if
+	if (${1}) begin
+		${0}
+	end
+# If/else statements
+snippet ife
+	if (${1}) begin
+		${2}
+	end
+	else begin
+		${1}
+	end
+# Else if statement
+snippet eif
+	else if (${1}) begin
+		${0}
+	end
+#Else statement
+snippet el
+	else begin
+		${0}
+	end
+# While statement
+snippet wh
+	while (${1}) begin
+		${0}
+	end
+# Repeat Loop
+snippet rep
+	repeat (${1}) begin
+		${0}
+	end
+# Case statement
+snippet case
+	case (${1:/* variable */})
+		${2:/* value */}: begin
+			${3}
+		end
+		default: begin
+			${4}
+		end
+	endcase
+# CaseZ statement
+snippet casez
+	casez (${1:/* variable */})
+		${2:/* value */}: begin
+			${3}
+		end
+		default: begin
+			${4}
+		end
+	endcase
+# Always block
+snippet al
+	always @(${1:/* sensitive list */}) begin
+		${0}
+	end
+# Module block
+snippet mod
+	module ${1:module_name} (${2});
+		${0}
+	endmodule

From 3e5de2f0697a091ff7815b6cd3cd629575bd2dac Mon Sep 17 00:00:00 2001
From: Oleg Voronkovich <oleg-voronkovich@yandex.ru>
Date: Wed, 30 Dec 2015 15:44:28 +0300
Subject: [PATCH 0767/1587] Add a link to a repository with PHP snippets

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4522ccee2..9d6b08f9d 100644
--- a/README.md
+++ b/README.md
@@ -169,6 +169,7 @@ so that all users can benefit from them.  People can list their snippet reposito
 * https://github.com/sudar/vim-arduino-snippets (snippets for Arduino files)
 * https://github.com/zedr/zope-snipmate-bundle.git (snippets for Python, TAL and ZCML)
 * https://github.com/bonsaiben/bootstrap-snippets (snippets for Twitter Bootstrap markup, in HTML and Haml)
+* https://github.com/sniphpets (advanced snippets for PHP, Symfony 2/3, Doctrine and etc.)
 
 Installation using VAM: https://github.com/MarcWeber/vim-addon-manager
 

From 2d67ff5c12af319821158eed1c9e7a1643bb7975 Mon Sep 17 00:00:00 2001
From: Pawel Jankowski <jjpikoov@gmail.com>
Date: Wed, 30 Dec 2015 20:10:59 +0100
Subject: [PATCH 0768/1587] Added Jinja2 snippets (copy of htmldjango.snippets)
     Should be helpful for those who use for example this plugin:    
 https://github.com/Glench/Vim-Jinja2-Syntax

---
 snippets/jinja.snippets | 142 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 snippets/jinja.snippets

diff --git a/snippets/jinja.snippets b/snippets/jinja.snippets
new file mode 100644
index 000000000..7d14ca833
--- /dev/null
+++ b/snippets/jinja.snippets
@@ -0,0 +1,142 @@
+# Generic tags
+
+extends html
+
+snippet %
+	{% ${1} %}
+snippet %%
+	{% ${1:tag_name} %}
+	${0}
+	{% end$1 %}
+snippet {
+	{{ ${1} }}
+# Template Tags
+
+snippet autoescape
+	{% autoescape ${1:off} %}
+		${0}
+	{% endautoescape %}
+snippet block
+	{% block ${1} %}
+		${0}
+	{% endblock %}
+snippet #
+	{# ${0:comment} #}
+snippet comment
+	{% comment %}
+		${0}
+	{% endcomment %}
+snippet cycle
+	{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
+snippet debug
+	{% debug %}
+snippet extends
+	{% extends "${0:base.html}" %}
+snippet filter
+	{% filter ${1} %}
+		${0}
+	{% endfilter %}
+snippet firstof
+	{% firstof ${1} %}
+snippet for
+	{% for ${1} in ${2} %}
+		${0}
+	{% endfor %}
+snippet empty
+	{% empty %}
+	${0}
+snippet if
+	{% if ${1} %}
+		${0}
+	{% endif %}
+snippet el
+	{% else %}
+		${1}
+snippet eif
+	{% elif ${1} %}
+		${0}
+snippet ifchanged
+	{% ifchanged %}${1}{% endifchanged %}
+snippet ifequal
+	{% ifequal ${1} ${2} %}
+		${0}
+	{% endifequal %}
+snippet ifnotequal
+	{% ifnotequal ${1} ${2} %}
+		${0}
+	{% endifnotequal %}
+snippet include
+	{% include "${0}" %}
+snippet load
+	{% load ${0} %}
+snippet now
+	{% now "${0:jS F Y H:i}" %}
+snippet regroup
+	{% regroup ${1} by ${2} as ${0} %}
+snippet spaceless
+	{% spaceless %}${0}{% endspaceless %}
+snippet ssi
+	{% ssi ${0} %}
+snippet trans
+	{% trans "${0:string}" %}
+snippet url
+	{% url ${1} as ${0} %}
+snippet widthratio
+	{% widthratio ${1:this_value} ${2:max_value} ${0:100} %}
+snippet with
+	{% with ${1} as ${2} %}
+		${0}
+	{% endwith %}
+
+# Template Filters
+
+# Note: Since SnipMate can't determine which template filter you are
+# expanding without the "|" character, these do not add the "|"
+# character.  These save a few keystrokes still.
+
+# Note: Template tags that take no arguments are not implemented.
+
+snippet add
+	add:"${0}"
+snippet center
+	center:"${0}"
+snippet cut
+	cut:"${0}"
+snippet date
+	date:"${0}"
+snippet default
+	default:"${0}"
+snippet defaultifnone
+	default_if_none:"${0}"
+snippet dictsort
+	dictsort:"${0}"
+snippet dictsortrev
+	dictsortreversed:"${0}"
+snippet divisibleby
+	divisibleby:"${0}"
+snippet floatformat
+	floatformat:"${0}"
+snippet getdigit
+	get_digit:"${0}"
+snippet join
+	join:"${0}"
+snippet lengthis
+	length_is:"${0}"
+snippet pluralize
+	pluralize:"${0}"
+snippet removetags
+	removetags:"${0}"
+snippet slice
+	slice:"${0}"
+snippet stringformat
+	stringformat:"${0}"
+snippet time
+	time:"${0}"
+snippet truncatewords
+	truncatewords:${0}
+snippet truncatewordshtml
+	truncatewords_html:${0}
+snippet urlizetrunc
+	urlizetrunc:${0}
+snippet wordwrap
+	wordwrap:${0}

From 1e6761c107ed6038fcfb2724bec30d6d79228a6e Mon Sep 17 00:00:00 2001
From: Pawel Jankowski <jjpikoov@gmail.com>
Date: Wed, 30 Dec 2015 23:01:50 +0100
Subject: [PATCH 0769/1587] Deleted htmldjango.snippets (from now
 jinja.snippets)

---
 snippets/htmldjango.snippets | 142 -----------------------------------
 1 file changed, 142 deletions(-)
 delete mode 100644 snippets/htmldjango.snippets

diff --git a/snippets/htmldjango.snippets b/snippets/htmldjango.snippets
deleted file mode 100644
index 7d14ca833..000000000
--- a/snippets/htmldjango.snippets
+++ /dev/null
@@ -1,142 +0,0 @@
-# Generic tags
-
-extends html
-
-snippet %
-	{% ${1} %}
-snippet %%
-	{% ${1:tag_name} %}
-	${0}
-	{% end$1 %}
-snippet {
-	{{ ${1} }}
-# Template Tags
-
-snippet autoescape
-	{% autoescape ${1:off} %}
-		${0}
-	{% endautoescape %}
-snippet block
-	{% block ${1} %}
-		${0}
-	{% endblock %}
-snippet #
-	{# ${0:comment} #}
-snippet comment
-	{% comment %}
-		${0}
-	{% endcomment %}
-snippet cycle
-	{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
-snippet debug
-	{% debug %}
-snippet extends
-	{% extends "${0:base.html}" %}
-snippet filter
-	{% filter ${1} %}
-		${0}
-	{% endfilter %}
-snippet firstof
-	{% firstof ${1} %}
-snippet for
-	{% for ${1} in ${2} %}
-		${0}
-	{% endfor %}
-snippet empty
-	{% empty %}
-	${0}
-snippet if
-	{% if ${1} %}
-		${0}
-	{% endif %}
-snippet el
-	{% else %}
-		${1}
-snippet eif
-	{% elif ${1} %}
-		${0}
-snippet ifchanged
-	{% ifchanged %}${1}{% endifchanged %}
-snippet ifequal
-	{% ifequal ${1} ${2} %}
-		${0}
-	{% endifequal %}
-snippet ifnotequal
-	{% ifnotequal ${1} ${2} %}
-		${0}
-	{% endifnotequal %}
-snippet include
-	{% include "${0}" %}
-snippet load
-	{% load ${0} %}
-snippet now
-	{% now "${0:jS F Y H:i}" %}
-snippet regroup
-	{% regroup ${1} by ${2} as ${0} %}
-snippet spaceless
-	{% spaceless %}${0}{% endspaceless %}
-snippet ssi
-	{% ssi ${0} %}
-snippet trans
-	{% trans "${0:string}" %}
-snippet url
-	{% url ${1} as ${0} %}
-snippet widthratio
-	{% widthratio ${1:this_value} ${2:max_value} ${0:100} %}
-snippet with
-	{% with ${1} as ${2} %}
-		${0}
-	{% endwith %}
-
-# Template Filters
-
-# Note: Since SnipMate can't determine which template filter you are
-# expanding without the "|" character, these do not add the "|"
-# character.  These save a few keystrokes still.
-
-# Note: Template tags that take no arguments are not implemented.
-
-snippet add
-	add:"${0}"
-snippet center
-	center:"${0}"
-snippet cut
-	cut:"${0}"
-snippet date
-	date:"${0}"
-snippet default
-	default:"${0}"
-snippet defaultifnone
-	default_if_none:"${0}"
-snippet dictsort
-	dictsort:"${0}"
-snippet dictsortrev
-	dictsortreversed:"${0}"
-snippet divisibleby
-	divisibleby:"${0}"
-snippet floatformat
-	floatformat:"${0}"
-snippet getdigit
-	get_digit:"${0}"
-snippet join
-	join:"${0}"
-snippet lengthis
-	length_is:"${0}"
-snippet pluralize
-	pluralize:"${0}"
-snippet removetags
-	removetags:"${0}"
-snippet slice
-	slice:"${0}"
-snippet stringformat
-	stringformat:"${0}"
-snippet time
-	time:"${0}"
-snippet truncatewords
-	truncatewords:${0}
-snippet truncatewordshtml
-	truncatewords_html:${0}
-snippet urlizetrunc
-	urlizetrunc:${0}
-snippet wordwrap
-	wordwrap:${0}

From 40bcbf8a34a53d54e34fae9e4122ce25b7225144 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 4 Jan 2016 10:58:36 +0000
Subject: [PATCH 0770/1587] Revert "Deleted htmldjango.snippets (from now
 jinja.snippets)"

This reverts commit 1e6761c107ed6038fcfb2724bec30d6d79228a6e.
---
 snippets/htmldjango.snippets | 142 +++++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 snippets/htmldjango.snippets

diff --git a/snippets/htmldjango.snippets b/snippets/htmldjango.snippets
new file mode 100644
index 000000000..7d14ca833
--- /dev/null
+++ b/snippets/htmldjango.snippets
@@ -0,0 +1,142 @@
+# Generic tags
+
+extends html
+
+snippet %
+	{% ${1} %}
+snippet %%
+	{% ${1:tag_name} %}
+	${0}
+	{% end$1 %}
+snippet {
+	{{ ${1} }}
+# Template Tags
+
+snippet autoescape
+	{% autoescape ${1:off} %}
+		${0}
+	{% endautoescape %}
+snippet block
+	{% block ${1} %}
+		${0}
+	{% endblock %}
+snippet #
+	{# ${0:comment} #}
+snippet comment
+	{% comment %}
+		${0}
+	{% endcomment %}
+snippet cycle
+	{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
+snippet debug
+	{% debug %}
+snippet extends
+	{% extends "${0:base.html}" %}
+snippet filter
+	{% filter ${1} %}
+		${0}
+	{% endfilter %}
+snippet firstof
+	{% firstof ${1} %}
+snippet for
+	{% for ${1} in ${2} %}
+		${0}
+	{% endfor %}
+snippet empty
+	{% empty %}
+	${0}
+snippet if
+	{% if ${1} %}
+		${0}
+	{% endif %}
+snippet el
+	{% else %}
+		${1}
+snippet eif
+	{% elif ${1} %}
+		${0}
+snippet ifchanged
+	{% ifchanged %}${1}{% endifchanged %}
+snippet ifequal
+	{% ifequal ${1} ${2} %}
+		${0}
+	{% endifequal %}
+snippet ifnotequal
+	{% ifnotequal ${1} ${2} %}
+		${0}
+	{% endifnotequal %}
+snippet include
+	{% include "${0}" %}
+snippet load
+	{% load ${0} %}
+snippet now
+	{% now "${0:jS F Y H:i}" %}
+snippet regroup
+	{% regroup ${1} by ${2} as ${0} %}
+snippet spaceless
+	{% spaceless %}${0}{% endspaceless %}
+snippet ssi
+	{% ssi ${0} %}
+snippet trans
+	{% trans "${0:string}" %}
+snippet url
+	{% url ${1} as ${0} %}
+snippet widthratio
+	{% widthratio ${1:this_value} ${2:max_value} ${0:100} %}
+snippet with
+	{% with ${1} as ${2} %}
+		${0}
+	{% endwith %}
+
+# Template Filters
+
+# Note: Since SnipMate can't determine which template filter you are
+# expanding without the "|" character, these do not add the "|"
+# character.  These save a few keystrokes still.
+
+# Note: Template tags that take no arguments are not implemented.
+
+snippet add
+	add:"${0}"
+snippet center
+	center:"${0}"
+snippet cut
+	cut:"${0}"
+snippet date
+	date:"${0}"
+snippet default
+	default:"${0}"
+snippet defaultifnone
+	default_if_none:"${0}"
+snippet dictsort
+	dictsort:"${0}"
+snippet dictsortrev
+	dictsortreversed:"${0}"
+snippet divisibleby
+	divisibleby:"${0}"
+snippet floatformat
+	floatformat:"${0}"
+snippet getdigit
+	get_digit:"${0}"
+snippet join
+	join:"${0}"
+snippet lengthis
+	length_is:"${0}"
+snippet pluralize
+	pluralize:"${0}"
+snippet removetags
+	removetags:"${0}"
+snippet slice
+	slice:"${0}"
+snippet stringformat
+	stringformat:"${0}"
+snippet time
+	time:"${0}"
+snippet truncatewords
+	truncatewords:${0}
+snippet truncatewordshtml
+	truncatewords_html:${0}
+snippet urlizetrunc
+	urlizetrunc:${0}
+snippet wordwrap
+	wordwrap:${0}

From 3da0ec5de60a33ade8d45f2dfbc6b6309b800d6a Mon Sep 17 00:00:00 2001
From: phcerdan <pablo.hernandez.cerdan@outlook.com>
Date: Mon, 4 Jan 2016 23:16:39 +1300
Subject: [PATCH 0771/1587] Convert cmake.snippets to lower case. As
 recommended in cmake.

Add snippets: ExternalProject (url and git), project, cmake_min.
Rename snippet "cmake" to "cmake_init"
---
 snippets/cmake.snippets | 83 +++++++++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 29 deletions(-)

diff --git a/snippets/cmake.snippets b/snippets/cmake.snippets
index ef2256a40..3a0b920ea 100644
--- a/snippets/cmake.snippets
+++ b/snippets/cmake.snippets
@@ -1,58 +1,83 @@
-snippet cmake
-	CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-	PROJECT(${1:ProjectName})
+snippet init
+	cmake_minimum_required(version ${1:2.8.2})
+	project(${2:ProjectName})
 
-	FIND_PACKAGE(${2:LIBRARY})
+	find_package(${3:library})
 
-	INCLUDE_DIRECTORIES(
-		${$2_INCLUDE_DIR}
-	)
+	include_directories(${$3_INCLUDE_DIRS})
 
-	ADD_SUBDIRECTORY(${0:src})
+	add_subdirectory(${0:src})
 
-	ADD_EXECUTABLE($1)
+	add_executable($2)
 
-	TARGET_LINK_LIBRARIES($1
-		${$2_LIBRARIES}
-	)
+	target_link_libraries($2 ${$3_LIBRARIES})
+
+snippet proj
+	project(${0:Name})
+
+snippet min
+	cmake_minimum_required(version ${0:2.8.2})
 
 snippet include
-	INCLUDE_DIRECTORIES(
-		${${0:INCLUDE_DIR}}
-	)
+	include_directories(${${0:include_dir}})
 
 snippet find
-	FIND_PACKAGE(${0:LIBRARY})
+	find_package(${1:library} ${0:REQUIRED})
 
 snippet glob
-	FILE(GLOB ${1:SRCS} *.${0:cpp})
+	file(glob ${1:srcs} *.${0:cpp})
 
 snippet subdir
-	ADD_SUBDIRECTORY(${0:src})
+	add_subdirectory(${0:src})
 
 snippet lib
-	ADD_LIBRARY(${1:lib} ${2:STATIC}
-		${${0:SRCS}}
-	)
+	add_library(${1:lib} ${${0:srcs}})
 
 snippet link
-	TARGET_LINK_LIBRARIES(${1:bin}
-		${0:somelib}
-	)
+	target_link_libraries(${1:bin} ${0:somelib})
 
 snippet bin
-	ADD_EXECUTABLE(${1:bin})
+	add_executable(${1:bin})
 
 snippet set
-	SET(${1:var} ${0:val})
+	set(${1:var} ${0:val})
 
 snippet dep
-	ADD_DEPENDENCIES(${1:target}
+	add_dependencies(${1:target}
 		${0:dep}
 	)
 
+snippet Ext_url
+	include(ExternalProject)
+	ExternalProject_Add(${1:googletest}
+	  URL ${2:http://googletest.googlecode.com/files/gtest-1.7.0.zip}
+	  URL_HASH SHA1=${3:f85f6d2481e2c6c4a18539e391aa4ea8ab0394af}
+	  SOURCE_DIR "${4:${CMAKE_BINARY_DIR}/gtest-src}"
+	  BINARY_DIR "${0:${CMAKE_BINARY_DIR}/gtest-build}"
+	  CONFIGURE_COMMAND ""
+	  BUILD_COMMAND     ""
+	  INSTALL_COMMAND   ""
+	  TEST_COMMAND      ""
+	)
+
+snippet Ext_git
+	include(ExternalProject)
+	ExternalProject_Add(${1:googletest}
+	  GIT_REPOSITORY    ${2:https://github.com/google/googletest.git}
+	  GIT_TAG           ${3:master}
+	  SOURCE_DIR        "${4:${CMAKE_BINARY_DIR}/googletest-src}"
+	  BINARY_DIR        "${0:${CMAKE_BINARY_DIR}/googletest-build}"
+	  CONFIGURE_COMMAND ""
+	  BUILD_COMMAND     ""
+	  INSTALL_COMMAND   ""
+	  TEST_COMMAND      ""
+	)
+
 snippet props
-	SET_TARGET_PROPERTIES(${1:target}
-		${2:PROPERTIES} ${3:COMPILE_FLAGS}
+	set_target_properties(${1:target}
+		${2:properties} ${3:compile_flags}
 		${0:"-O3 -Wall -pedantic"}
 	)
+
+snippet test
+	add_test(${1:ATestName} ${0:testCommand --options})

From 08a94d1ce3eaab68581b88fc749ab26d9d179ebb Mon Sep 17 00:00:00 2001
From: Fuad Saud <fuadsaud@users.noreply.github.com>
Date: Tue, 5 Jan 2016 22:04:00 -0200
Subject: [PATCH 0772/1587] Remove duplicate ruby block snippets

---
 UltiSnips/ruby.snippets | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index b8a00922d..b7124f83b 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -266,18 +266,6 @@ snippet "(\S+)\.Index" ".index do |item| ... end" r
 end
 endsnippet
 
-snippet do "do |<key>| ... end" i
-do |${1:args}|
-	$0
-end
-endsnippet
-
-snippet Do "do ... end" i
-do
-	$0
-end
-endsnippet
-
 snippet until "until <expression> ... end"
 until ${1:expression}
 	$0

From 5409f062e98a322329a185af2e30ba482231a7a1 Mon Sep 17 00:00:00 2001
From: dengyaolong <dengyaolong@meituan.com>
Date: Fri, 8 Jan 2016 14:27:27 +0800
Subject: [PATCH 0773/1587] modify console.err

---
 snippets/javascript/javascript.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 11f3f76c7..0d054f4e6 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -254,9 +254,9 @@ snippet cl
 # console.debug
 snippet cd
 	console.debug(${0});
-# console.err
+# console.error
 snippet ce
-	console.err(${0});
+	console.error(${0});
 # console.trace
 snippet ct
 	console.trace(${0:label});

From edd6a3ed5d43c4e6600469cf978e50f64b21df7e Mon Sep 17 00:00:00 2001
From: Li Xin <lixin18@meituan.com>
Date: Fri, 8 Jan 2016 18:12:22 +0800
Subject: [PATCH 0774/1587] Args start at ${0}

---
 snippets/javascript/javascript.es6.snippets | 26 +++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
index e1873c5e2..df059a150 100644
--- a/snippets/javascript/javascript.es6.snippets
+++ b/snippets/javascript/javascript.es6.snippets
@@ -1,26 +1,28 @@
 snippet const
-	const ${0} = ${1};
+	const ${1} = ${0};
 snippet let
-	let ${0} = ${1};
+	let ${1} = ${0};
 snippet im
-	import ${0} from '${1}';
+	import ${1} from '${0}';
 snippet cla
-	class ${0} {
-		${1}
+	class ${1} {
+		${0}
 	}
 snippet clax
-	class ${0} extends ${1} {
-		${2}
+	class ${1} extends ${2} {
+		${0}
 	}
 snippet =>
-	(${0}) => {
-		${1}
+	(${1}) => {
+		${0}
 	}
 snippet af
-	(${0}) => {
-		${1}
+	(${1}) => {
+		${0}
 	}
 snippet sym
-	const ${0} = Symbol('${1}');
+	const ${1} = Symbol('${0}');
 snippet ed
 	export default ${0}
+snippet ${
+	${${1}}${0}

From a30d36b8834674f408ab824e88af8e81a62bc8c8 Mon Sep 17 00:00:00 2001
From: Pompeu <itacir@hotmail.com>
Date: Sun, 10 Jan 2016 01:21:56 -0200
Subject: [PATCH 0775/1587] node require(re) snippet now can use new types of
 variables not only var by defult, can change in $1

---
 snippets/javascript/javascript.node.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.node.snippets b/snippets/javascript/javascript.node.snippets
index 1da78d098..2b5aefb40 100644
--- a/snippets/javascript/javascript.node.snippets
+++ b/snippets/javascript/javascript.node.snippets
@@ -5,7 +5,7 @@ snippet ex
 	module.exports = ${1};
 # require
 snippet re
-	var ${1} = require('${2:module_name}');
+	${1:var} ${2} = require('${3:module_name}');
 # EventEmitter
 snippet on
 	on('${1:event_name}', function(${2:stream}) {

From d1453cdd76a69e8eaacb6ec3737b1a83e3a681a5 Mon Sep 17 00:00:00 2001
From: Jan Mollowitz <jan.mollowitz@lesara.de>
Date: Mon, 11 Jan 2016 15:23:33 +0100
Subject: [PATCH 0776/1587] PHP: trigger php 'array' snippet only for beginning
 of line.

---
 snippets/php.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 45a782122..9306b81bb 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -325,7 +325,7 @@ snippet foreachkil
 		${0:<!-- html... -->}
 	<?php endforeach; ?>
 # $... = array (...)
-snippet array
+snippet array b
 	$${1:arrayName} = array('${2}' => ${3});
 snippet try
 	try {

From 1a33ecc5eed45296d96b18df540a69becd0a5439 Mon Sep 17 00:00:00 2001
From: Jan Mollowitz <jan.mollowitz@lesara.de>
Date: Mon, 11 Jan 2016 15:28:15 +0100
Subject: [PATCH 0777/1587] PHP: added a few more language method snippets.

---
 snippets/php.snippets | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 45a782122..d45b766ee 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -603,3 +603,35 @@ snippet tc
 	}
 snippet te 
 	throw new ${1:Exception}("${2:Error Processing Request}");
+
+snippet fpc "file_put_contents" b
+file_put_contents(${1:file}, ${2:content}${3:, FILE_APPEND});$0
+endsnippet
+
+snippet sr "str_replace"
+str_replace(${1:search}, ${2:replace}, ${3:subject})$0
+endsnippet
+
+snippet ia "in_array"
+in_array(${1:needle}, ${2:haystack})$0
+endsnippet
+
+snippet is "isset"
+isset(${1:var})$0
+endsnippet
+
+snippet isa "isset array"
+isset($${1:array}[${2:key}])$0
+endsnippet
+
+snippet in "is_null"
+is_null($${1:var})$0
+endsnippet
+
+snippet fe "file_exists"
+file_exists(${1:file})$0
+endsnippet
+
+snippet id "is_dir"
+is_dir(${1:path})$0
+endsnippet

From ba38c83495b448bc3b46241b5249003c55142621 Mon Sep 17 00:00:00 2001
From: Matthew Barry <komputerwiz.matt@gmail.com>
Date: Mon, 11 Jan 2016 10:29:54 -0600
Subject: [PATCH 0778/1587] Use snipMate syntax

mixed UltiSnips and snipMate syntax was causing parse errors.
---
 snippets/php.snippets | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index d45b766ee..27e2844a7 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -605,33 +605,25 @@ snippet te
 	throw new ${1:Exception}("${2:Error Processing Request}");
 
 snippet fpc "file_put_contents" b
-file_put_contents(${1:file}, ${2:content}${3:, FILE_APPEND});$0
-endsnippet
+	file_put_contents(${1:file}, ${2:content}${3:, FILE_APPEND});$0
 
 snippet sr "str_replace"
-str_replace(${1:search}, ${2:replace}, ${3:subject})$0
-endsnippet
+	str_replace(${1:search}, ${2:replace}, ${3:subject})$0
 
 snippet ia "in_array"
-in_array(${1:needle}, ${2:haystack})$0
-endsnippet
+	in_array(${1:needle}, ${2:haystack})$0
 
 snippet is "isset"
-isset(${1:var})$0
-endsnippet
+	isset(${1:var})$0
 
 snippet isa "isset array"
-isset($${1:array}[${2:key}])$0
-endsnippet
+	isset($${1:array}[${2:key}])$0
 
 snippet in "is_null"
-is_null($${1:var})$0
-endsnippet
+	is_null($${1:var})$0
 
 snippet fe "file_exists"
-file_exists(${1:file})$0
-endsnippet
+	file_exists(${1:file})$0
 
 snippet id "is_dir"
-is_dir(${1:path})$0
-endsnippet
+	is_dir(${1:path})$0

From e71fdd142c294296507bcff47707b44875c1b99e Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 15 Jan 2016 10:47:25 +0000
Subject: [PATCH 0779/1587] Add to slim snippets

---
 snippets/slim.snippets | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/snippets/slim.snippets b/snippets/slim.snippets
index 8eeb4a535..885ca8d7f 100644
--- a/snippets/slim.snippets
+++ b/snippets/slim.snippets
@@ -1,3 +1,16 @@
+snippet pry
+	- binding.pry
+snippet renp
+	= render partial: '${0}'
+# Forms
+# =====
+snippet fieldset
+	fieldset
+		legend ${1}
+snippet css
+	link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}"
+snippet script
+	script src="${1:script.js}" type="text/javascript"
 # Some useful Unicode entities
 # ============================
 # Non-Breaking Space
@@ -48,17 +61,3 @@ snippet backspace
 # ⎋
 snippet esc
 	&#x238B;
-
-# Forms
-# =====
-snippet fieldset
-	fieldset
-		legend ${1}
-
-# Assets
-# ======
-snippet css
-	link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}"
-
-snippet script
-	script src="${1:script.js}" type="text/javascript"

From 4f434d6510a1d02e0165a18aa3fbe578779bef4f Mon Sep 17 00:00:00 2001
From: Kevin Koltz <kevin.koltz@gmail.com>
Date: Sat, 16 Jan 2016 14:19:37 -0600
Subject: [PATCH 0780/1587] Remove extra whitespace

Prevents adding empty lines while using snipMate.vim
---
 snippets/eelixir.snippets | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index fd76d1697..bb6c5d4a9 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -1,37 +1,29 @@
 snippet %
 	<% ${0} %>
-
 snippet =
 	<%= ${0} %>
-
 snippet end
 	<% end %>
-
 snippet for
 	<%= for ${1:item} <- ${2:items} ${3:@conn} do %>
 		${0}
 	<% end %>
-
 snippet if
 	<%= if ${1} do %>
 		${0}
 	<% end %>
-
 snippet ife
 	<%= if ${1} do %>
 		${2}
 	<%= else %>
 		${0}
 	<% end %>
-
 snippet ft
 	<%= form_tag(${1:"/users"}, method: ${2::post}) %>
 		${0}
 	</form>
-
 snippet lin
 	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete} %>
-
 snippet ff
 	<%= form_for @changeset, ${1:"/users"}, fn f -> %>
 			${0}

From e8b7ebb913517b04652968098ce7db9a246d9013 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 29 Jan 2016 17:08:06 +0100
Subject: [PATCH 0781/1587] python: fix multiple commands on a single line; add
 bpdb

Otherwise style checkers will usually complain about it, and e.g.
'flake8' cannot be made to ignore it with '# noqa' at the end.

I also adds the "bpdb" snippet, and only defines them in the snipmate
format, not UltiSnips'.
Therefore "ipy" is only available as "iem" now.
Ref: https://github.com/honza/vim-snippets/pull/675#issuecomment-176840647
---
 UltiSnips/python.snippets | 16 ----------------
 snippets/python.snippets  | 28 ++++++++++++++++++++--------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 9372bdcf6..22693b621 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -626,22 +626,6 @@ endsnippet
 # Assertions & Tests #
 #####################
 
-snippet pdb "Set PDB breakpoint" b
-import pdb; pdb.set_trace()
-endsnippet
-
-snippet ipy "Embed IPython shell" b
-import IPython; IPython.embed()
-endsnippet
-
-snippet ipdb "Set IPDB breakpoint" b
-import ipdb; ipdb.set_trace()
-endsnippet
-
-snippet pudb "Set PUDB breakpoint" b
-import pudb; pudb.set_trace()
-endsnippet
-
 snippet ae "Assert equal" b
 self.assertEqual(${1:${VISUAL:first}},${2:second})
 endsnippet
diff --git a/snippets/python.snippets b/snippets/python.snippets
index d8f010546..0f68acbd4 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -128,31 +128,43 @@ snippet _
 	__${1:init}__
 # python debugger (pdb)
 snippet pdb
-	import pdb; pdb.set_trace()
+	import pdb
+	pdb.set_trace()
+# bpython debugger (bpdb)
+snippet bpdb
+	import bpdb
+	bpdb.set_trace()
 # ipython debugger (ipdb)
 snippet ipdb
-	import ipdb; ipdb.set_trace()
+	import ipdb
+	ipdb.set_trace()
 # embed ipython itself
 snippet iem
-	import IPython; IPython.embed()
+	import IPython
+	IPython.embed()
 # ipython debugger (pdbbb)
 snippet pdbbb
-	import pdbpp; pdbpp.set_trace()
+	import pdbpp
+	pdbpp.set_trace()
 # remote python debugger (rpdb)
 snippet rpdb
-	import rpdb; rpdb.set_trace()
+	import rpdb
+	rpdb.set_trace()
 # ptpython
 snippet ptpython
 	from ptpython.repl import embed
 	embed(globals(), locals(), vi_mode=${1:False}, history_filename=${2:None})
 # python console debugger (pudb)
 snippet pudb
-	import pudb; pudb.set_trace()
+	import pudb
+	pudb.set_trace()
 # pdb in nosetests
 snippet nosetrace
-	from nose.tools import set_trace; set_trace()
+	from nose.tools import set_trace
+	set_trace()
 snippet pprint
-	import pprint; pprint.pprint(${1})
+	import pprint
+	pprint.pprint(${1})
 snippet "
 	"""${0:doc}
 	"""

From 31b2fe023a6c820dad8135037824c77ac78e9e90 Mon Sep 17 00:00:00 2001
From: Andy Waite <andyw8@users.noreply.github.com>
Date: Sun, 7 Feb 2016 14:54:19 +0000
Subject: [PATCH 0782/1587] Change Rails snippet triggers

At present, `cla` maps to both Create Controller Class and Create
Functional Test class.

Using `cla` for creating a controller seems overly-general, since we may
want triggers for other types of classes, e.g. models. So I propose
changing this to `clac`.

And to remove ambiguity, I propose using `clact` for the controller test.
---
 UltiSnips/rails.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index 5c5217958..b3f6c6b26 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -15,7 +15,7 @@ t.boolean :${1:title}
 $0
 endsnippet
 
-snippet cla "Create controller class"
+snippet clac "Create controller class"
 class ${1:Model}Controller < ApplicationController
 	before_filter :find_${2:model}
 
@@ -48,7 +48,7 @@ t.float :${1:title}
 $0
 endsnippet
 
-snippet cla "Create functional test class"
+snippet clact "Create functional test class"
 require 'test_helper'
 
 class ${1:Model}ControllerTest < ActionController::TestCase

From 16e922e7fe8e55f06fdeb0f6de18147900b23089 Mon Sep 17 00:00:00 2001
From: Andy Waite <andyw8@users.noreply.github.com>
Date: Sun, 7 Feb 2016 20:28:55 +0000
Subject: [PATCH 0783/1587] Use `update` rather than `update_attributes

`update_attributes` is deprecated:
https://github.com/rails/rails/pull/6739
---
 UltiSnips/rails.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index b3f6c6b26..9e20ebf93 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -133,7 +133,7 @@ class ${1:Model}sController < ApplicationController
 	# PUT /${1/./\l$0/}s/1.xml
 	def update
 		respond_to do |wants|
-			if @${1/./\l$0/}.update_attributes(params[:${1/./\l$0/}])
+			if @${1/./\l$0/}.update(params[:${1/./\l$0/}])
 				flash[:notice] = '${1:Model} was successfully updated.'
 				wants.html { redirect_to(@${1/./\l$0/}) }
 				wants.xml  { head :ok }

From e97e0d097cc8bfd543b07156fe220ad70024ebd7 Mon Sep 17 00:00:00 2001
From: Andy Waite <andyw8@users.noreply.github.com>
Date: Sun, 7 Feb 2016 20:31:05 +0000
Subject: [PATCH 0784/1587] Remove `respond_with` snippet

This is no longer part of Rails, it's now handled by the responders gem.
http://weblog.rubyonrails.org/2014/8/20/Rails-4-2-beta1/
---
 UltiSnips/rails.snippets | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index 9e20ebf93..d08739fa9 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -601,12 +601,6 @@ respond_to do |wants|
 end
 endsnippet
 
-snippet resw "respond_with"
-respond_with(${1:@${2:model}})${3: do |format|
-	format.${4:html} { $0 \}
-end}
-endsnippet
-
 # FIXME
 snippet returning "returning do |variable| ... end"
 returning ${1:variable} do${2/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1: |)/}${2:v}${2/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1:|)/}

From 62e94f5b06e76fac02cb81e7cd0cdac42ac1f49b Mon Sep 17 00:00:00 2001
From: Andy Waite <andyw8@users.noreply.github.com>
Date: Sun, 7 Feb 2016 20:32:22 +0000
Subject: [PATCH 0785/1587] Remove snippet for deprecated `find(:all)`

This was removed in Rails 4.
http://blog.remarkablelabs.com/2012/12/what-s-new-in-active-record-rails-4-countdown-to-2013
---
 UltiSnips/rails.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index d08739fa9..e7b2757b2 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -793,10 +793,6 @@ snippet xput "xhr put"
 xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { $4 }$0
 endsnippet
 
-snippet finl "find(:last)"
-find(:last${1:, :conditions => ['${2:${3:field} = ?}', ${5:true}]})
-endsnippet
-
 snippet sweeper "Create sweeper class"
 class ${1:Model}Sweeper < ActionController::Caching::Sweeper
 	observe ${1:Model}

From db5f46439f4bbff39905f7774996779ade38a462 Mon Sep 17 00:00:00 2001
From: Georgios Samaras <georgios.samaras@rwth-aachen.de>
Date: Fri, 12 Feb 2016 22:00:40 +0100
Subject: [PATCH 0786/1587] Fixed `let`/`letm` snippet for Rust files. When
 expanding the `let` pattern, one would end up with something like "let I:
 I${4:type} = I;" (I representing the cursor jump marks), so the nested jump
 marks are inserted literally. I fixed that unwanted behaviour by replacing
 the `let` and `letm` patterns by `let` (for immutable variable bindings with
 type inference), `lett` (for immutable variable bindings with explicit type
 annotation), `letm` (for mutable variable bindings with type inference) and
 `lettm` (for mutable variable bindings with explicit type annotation).

---
 snippets/rust.snippets | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index eeab689c4..bd0aafa75 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -31,10 +31,14 @@ snippet main "Main function"
 	pub fn main() {
 		${0}
 	}
-snippet let "let variable declaration"
-	let ${1:name}${2:: ${3:type}} = ${4};
-snippet letm "let mut variable declaration"
-	let mut ${1:name}${2:: ${3:type}} = ${4};
+snippet let "let variable declaration with type inference"
+	let ${1}  = ${2};
+snippet lett "let variable declaration with explicit type annotation"
+	let ${1}: ${2}  = ${2};
+snippet letm "let mut variable declaration with type inference"
+	let ${1}  = ${2};
+snippet lettm "let mut variable declaration with explicit type annotation"
+	let ${1}: ${2}  = ${2};
 snippet pln "println!"
 	println!("${1}");
 snippet pln, "println! with format param"

From 1ac7329ff6a9dce315ba1c3754675b36bbdf3b28 Mon Sep 17 00:00:00 2001
From: Georgios Samaras <georgios.samaras@rwth-aachen.de>
Date: Fri, 12 Feb 2016 22:09:12 +0100
Subject: [PATCH 0787/1587] Fixed typo in rust fix

---
 snippets/rust.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index bd0aafa75..3bc6904e8 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -34,11 +34,11 @@ snippet main "Main function"
 snippet let "let variable declaration with type inference"
 	let ${1}  = ${2};
 snippet lett "let variable declaration with explicit type annotation"
-	let ${1}: ${2}  = ${2};
+	let ${1}: ${2}  = ${3};
 snippet letm "let mut variable declaration with type inference"
 	let ${1}  = ${2};
 snippet lettm "let mut variable declaration with explicit type annotation"
-	let ${1}: ${2}  = ${2};
+	let ${1}: ${2}  = ${3};
 snippet pln "println!"
 	println!("${1}");
 snippet pln, "println! with format param"

From 0f25922960f2bd0f539d689734140e992f6bb066 Mon Sep 17 00:00:00 2001
From: Ricardo Jesus <rj.bcjesus@gmail.com>
Date: Sat, 13 Feb 2016 21:43:50 +0000
Subject: [PATCH 0788/1587] Missed 'art'

Minor error but two '#' were missing on an header.
---
 UltiSnips/python.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 22693b621..654538d02 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -622,9 +622,9 @@ finally:
 endsnippet
 
 
-#####################
+######################
 # Assertions & Tests #
-#####################
+######################
 
 snippet ae "Assert equal" b
 self.assertEqual(${1:${VISUAL:first}},${2:second})

From e895e604319ea6873e3dc3abd999e4d3179f15d8 Mon Sep 17 00:00:00 2001
From: Georgios Samaras <georgios.samaras@rwth-aachen.de>
Date: Mon, 15 Feb 2016 12:26:33 +0100
Subject: [PATCH 0789/1587] added missing  modifier

---
 snippets/rust.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 3bc6904e8..9bf896f6b 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -36,9 +36,9 @@ snippet let "let variable declaration with type inference"
 snippet lett "let variable declaration with explicit type annotation"
 	let ${1}: ${2}  = ${3};
 snippet letm "let mut variable declaration with type inference"
-	let ${1}  = ${2};
+	let mut ${1}  = ${2};
 snippet lettm "let mut variable declaration with explicit type annotation"
-	let ${1}: ${2}  = ${3};
+	let mut ${1}: ${2}  = ${3};
 snippet pln "println!"
 	println!("${1}");
 snippet pln, "println! with format param"

From 4719006735b4f45ea71d23cb83f531701822b19e Mon Sep 17 00:00:00 2001
From: Andreas Steinel <A.Steinel@gmail.com>
Date: Fri, 19 Feb 2016 14:52:13 +0100
Subject: [PATCH 0790/1587] Infer migration class name

This small change infers the class name automatically
---
 snippets/rails.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index 6018621de..e83422227 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -348,7 +348,7 @@ snippet mct
 		${0}
 	end
 snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
-	class ${1:class_name} < ActiveRecord::Migration
+	class `substitute( substitute(vim_snippets#Filename(), '^\d\+_', '',''), '\(_\|^\)\(.\)', '\u\2', 'g')` < ActiveRecord::Migration
 		def up
 			${0}
 		end
@@ -357,7 +357,7 @@ snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. en
 		end
 	end
 snippet migration class .. < ActiveRecord::Migration .. def change .. end
-	class ${1:class_name} < ActiveRecord::Migration
+	class `substitute( substitute(vim_snippets#Filename(), '^\d\+_', '',''), '\(_\|^\)\(.\)', '\u\2', 'g')` < ActiveRecord::Migration
 		def change
 			${0}
 		end

From eb11eb41ecc1b4d100b886fbad7814019978220e Mon Sep 17 00:00:00 2001
From: daa84 <andrey.dubravin@gmail.com>
Date: Thu, 3 Mar 2016 12:06:54 +0300
Subject: [PATCH 0791/1587] fix macro snippet for rust

() replaced with {}
---
 UltiSnips/rust.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index b377fa971..d2223a495 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -51,11 +51,11 @@ format!("${1}"${2/..*/, /}${2});
 endsnippet
 
 snippet macro "macro_rules!" b
-macro_rules! ${1:name} (
+macro_rules! ${1:name} {
 	(${2:matcher}) => (
 		${3}
 	)
-)
+}
 endsnippet
 
 snippet mod "A module" b

From 83d331ffb6320a0e1027a611ff58aca20c1b8522 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 3 Mar 2016 11:56:37 +0000
Subject: [PATCH 0792/1587] Reduce duplication in Go

---
 UltiSnips/go.snippets | 35 -----------------------------------
 snippets/go.snippets  | 36 ++++++------------------------------
 2 files changed, 6 insertions(+), 65 deletions(-)

diff --git a/UltiSnips/go.snippets b/UltiSnips/go.snippets
index 780ee29b6..b6891ff0e 100644
--- a/UltiSnips/go.snippets
+++ b/UltiSnips/go.snippets
@@ -45,25 +45,6 @@ type ${1:Interface} interface {
 }
 endsnippet
 
-# statements
-snippet for "For loop" b
-for ${1:condition}${1/(.+)/ /}{
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet fori "Integer for loop" b
-for ${1:i} := 0; $1 < ${2:N}; $1++ {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet forr "For range loop" b
-for ${2:name} := range ${1:collection} {
-	${0:${VISUAL}}
-}
-endsnippet
-
 snippet if "If statement" b
 if ${1:condition}${1/(.+)/ /}{
 	${0:${VISUAL}}
@@ -76,22 +57,6 @@ case${0}
 }
 endsnippet
 
-snippet select "Select statement" b
-select {
-case${0}
-}
-endsnippet
-
-snippet case "Case clause" b
-case ${1:condition}:
-	${0:${VISUAL}}
-endsnippet
-
-snippet default "Default clause" b
-default:
-	${0:${VISUAL}}
-endsnippet
-
 # functions
 snippet /^main/ "Main function" r
 func main() {
diff --git a/snippets/go.snippets b/snippets/go.snippets
index af76e7249..293f71b37 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -53,26 +53,6 @@ snippet dfr
 			${0}
 		}
 	}()
-# gpl
-snippet gpl
-	/*
-	 * This program is free software; you can redistribute it and/or modify
-	 * it under the terms of the GNU General Public License as published by
-	 * the Free Software Foundation; either version 2 of the License, or
-	 * (at your option) any later version.
-	 *
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 *
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, see <http://www.gnu.org/licenses/>.
-	 *
-	 * Copyright (C) ${1:Author}, `strftime("%Y")`
-	 */
-
-	${0}
 # int
 snippet i
 	int
@@ -129,17 +109,15 @@ snippet ie
 	}
 	${0}
 # for loop
-snippet fo
+snippet for
 	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
-		${4}
+		${0}
 	}
-	${0}
 # for range loop
-snippet fr
-	for ${1:k}, ${2:v} := range ${3} {
-		${4}
+snippet forr
+	for ${1:e} := range ${2:collection} {
+		${0}
 	}
-	${0}
 # function simple
 snippet fun
 	func ${1:funcName}(${2}) ${3:error} {
@@ -196,8 +174,6 @@ snippet sl
 	select {
 	case ${1:v1} := <-${2:chan1}
 		${3}
-	case ${4:v2} := <-${5:chan2}
-		${6}
 	default:
 		${0}
 	}
@@ -228,7 +204,7 @@ snippet t
 # goroutine named function
 snippet g
 	go ${1:funcName}(${0})
-# goroutine anonymous function 
+# goroutine anonymous function
 snippet ga
 	go func(${1} ${2:type}) {
 		${3:/* code */}

From e20b77d55429e8a0a653749375c0a6b016870106 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 3 Mar 2016 12:02:43 +0000
Subject: [PATCH 0793/1587] Go: Endless for loop

---
 snippets/go.snippets | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 293f71b37..a3f4b494d 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -108,8 +108,13 @@ snippet ie
 		${3}
 	}
 	${0}
-# for loop
+# for int loop
 snippet for
+	for ${1}{
+		${0}
+	}
+# for int loop
+snippet fori
 	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
 		${0}
 	}

From 6b455624e8cef3f3803993e8e5a5b82adac9aa2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionic=C4=83=20Biz=C4=83u?= <bizauionica@gmail.com>
Date: Fri, 4 Mar 2016 12:54:59 +0200
Subject: [PATCH 0794/1587] Use autocmd to load the snippets.

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9d6b08f9d..4e9100634 100644
--- a/README.md
+++ b/README.md
@@ -73,8 +73,12 @@ Additional snippets can be added to the current buffer with the
 `:UltiSnipsAddFiletypes` command followed by the snippet name without the
 "snippets" ending. For example, to add the JavaScript Jasmine snippets, run:
 `:UltiSnipsAddFiletypes javascript-jasmine`. To have this snippet loaded
-everytime a JavaScript file is opened or created you can add the command to your
-`.vim/ftplugin/javascript.vim` file.
+everytime a JavaScript file is opened or created you can add this command to your
+`.vimrc` file:
+
+```vim
+autocmd FileType js UltiSnipsAddFiletypes javascript-jasmine
+```
 
 For more see the UltiSnips docs (`:help UltiSnips`).
 

From 6f5ea6e6d49a1eb8b162cc5348ee6e6b00446bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionic=C4=83=20Biz=C4=83u?= <bizauionica@gmail.com>
Date: Fri, 4 Mar 2016 16:04:19 +0200
Subject: [PATCH 0795/1587] Keep the other solution too.

---
 README.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 4e9100634..d4e83c335 100644
--- a/README.md
+++ b/README.md
@@ -73,12 +73,10 @@ Additional snippets can be added to the current buffer with the
 `:UltiSnipsAddFiletypes` command followed by the snippet name without the
 "snippets" ending. For example, to add the JavaScript Jasmine snippets, run:
 `:UltiSnipsAddFiletypes javascript-jasmine`. To have this snippet loaded
-everytime a JavaScript file is opened or created you can add this command to your
-`.vimrc` file:
+everytime a JavaScript file is opened or created you can add the command to your
+ -`.vim/ftplugin/javascript.vim` file. Another way is to add
+ `autocmd FileType js UltiSnipsAddFiletypes javascript-jasmine` in your `.vimrc`.
 
-```vim
-autocmd FileType js UltiSnipsAddFiletypes javascript-jasmine
-```
 
 For more see the UltiSnips docs (`:help UltiSnips`).
 

From aff4e7841b1949c219f7747c09d38b3502cd20a7 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 6 Mar 2016 16:01:51 +0000
Subject: [PATCH 0796/1587] Go ife

---
 snippets/go.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index a3f4b494d..b3acac1ad 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -74,6 +74,12 @@ snippet if
 	if ${1:/* condition */} {
 		${2}
 	}
+snippet ife
+	if ${1:/* condition */} {
+		${2}
+	} else {
+		${0}
+	}
 # else snippet
 snippet el
 	else {

From 647e5c38110328fdbe310622a1e6187777c42ff5 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz <lcruzc@linkux-it.com>
Date: Mon, 7 Mar 2016 22:37:02 -0400
Subject: [PATCH 0797/1587] Fix DecimalField on models

---
 UltiSnips/django.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index eabd80f74..1b10afa15 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -185,7 +185,7 @@ ${1:FIELDNAME} = models.DateTimeField($2)
 endsnippet
 
 snippet mdecimal "DecimalField" b
-${1:FIELDNAME} = models.DateTimeField($2)
+${1:FIELDNAME} = models.DecimalField($2)
 endsnippet
 
 snippet memail "EmailField" b

From 287de632d983111c25d724283e584b19b1c02287 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cruz <lcruzc@linkux-it.com>
Date: Mon, 7 Mar 2016 22:39:27 -0400
Subject: [PATCH 0798/1587] Add Default values on DecimaField

---
 UltiSnips/django.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 1b10afa15..0ba6c9d59 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -185,7 +185,7 @@ ${1:FIELDNAME} = models.DateTimeField($2)
 endsnippet
 
 snippet mdecimal "DecimalField" b
-${1:FIELDNAME} = models.DecimalField($2)
+${1:FIELDNAME} = models.DecimalField(max_digits=${2:10}, decimal_places=${3:2})
 endsnippet
 
 snippet memail "EmailField" b

From 99d6cbfa0f9d66fdca997115cd3fc42cd5e73fbd Mon Sep 17 00:00:00 2001
From: ToruIwashita <toru.iwashita@crowdworks.co.jp>
Date: Wed, 9 Mar 2016 10:41:49 +0900
Subject: [PATCH 0799/1587] Add aggregate_failures snippet for rspec

---
 snippets/ruby.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index e9509a294..a6340e46d 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -723,3 +723,7 @@ snippet iiexp
 	it { is_expected.to ${0} }
 snippet iiexpn
 	it { is_expected.not_to ${0} }
+snippet agg
+	aggregate_failures '${1:message}' do
+		${0}
+	end

From 9f952870834e4deb62893a44ed3c0cff395f7c4f Mon Sep 17 00:00:00 2001
From: Vzaa <Vzaa@users.noreply.github.com>
Date: Wed, 9 Mar 2016 13:34:44 +0200
Subject: [PATCH 0800/1587] Rust: remove semicolons from constructor returns

---
 UltiSnips/rust.snippets | 2 +-
 snippets/rust.snippets  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index d2223a495..40e760557 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -88,7 +88,7 @@ pub struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
 
 impl $1 {
 	pub fn new(${2}) -> $1 {
-		$1 { ${3} };
+		$1 { ${3} }
 	}
 }
 endsnippet
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 9bf896f6b..20532f735 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -25,7 +25,7 @@ snippet bench "Bench function" b
 	}
 snippet new "Constructor function"
 	pub fn new(${2}) -> ${1:Name} {
-		$1 { ${3} };
+		$1 { ${3} }
 	}
 snippet main "Main function"
 	pub fn main() {
@@ -143,7 +143,7 @@ snippet stn "Struct with new constructor"
 
 	impl $1 {
 		pub fn new(${2}) -> $1 {
-			$1 { ${3} };
+			$1 { ${3} }
 		}
 	}
 snippet type "Type alias"

From edc4eedf9abb20b982238a0d55876b1d1f168cb3 Mon Sep 17 00:00:00 2001
From: Sam Shepherd <sam@shepbox.com>
Date: Thu, 10 Mar 2016 10:09:21 -0600
Subject: [PATCH 0801/1587] Added Anonymous Function (javascript) for
 UltiSnips. Supports $VISUAL.

---
 UltiSnips/javascript.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 9480e8122..4537baea6 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -58,6 +58,12 @@ ${1:var }${2:function_name} = function $2(${3}) {
 };
 endsnippet
 
+snippet af "Anonymous Function" i
+function($1) {
+	${VISUAL}$0
+}
+endsnippet
+
 snippet iife "Immediately-Invoked Function Expression (iife)"
 (function(${1:window}) {
 	${VISUAL}$0

From 7bedb44b559ae8183eb44c2b7b87006368056f86 Mon Sep 17 00:00:00 2001
From: oddlydrawn <oddlydrawndev@gmail.com>
Date: Thu, 10 Mar 2016 18:46:11 -0700
Subject: [PATCH 0802/1587] Adds numbers to word in getArgs, Removes whitespace
 after braces

---
 UltiSnips/java.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index e8eb77ccf..bdd1dd6b2 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -21,7 +21,7 @@ def nl(snip):
 		snip.rv += " "
 def getArgs(group):
 	import re
-	word = re.compile('[a-zA-Z><.]+ \w+')
+	word = re.compile('[a-zA-Z0-9><.]+ \w+')
 	return [i.split(" ") for i in word.findall(group) ]
 
 def camel(word):
@@ -109,7 +109,7 @@ for i in args:
 	snip.rv += "\n\tprivate " + i[0] + " " + i[1]+ ";"
 if len(args) > 0:
 	snip.rv += "\n"`
-	public `!p snip.rv = snip.basename or "unknown"`($1) { `!p
+	public `!p snip.rv = snip.basename or "unknown"`($1) {`!p
 args = getArgs(t[1])
 for i in args:
 	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1] + ";"
@@ -123,8 +123,8 @@ for i in args:
 	snip.rv += "\n\tpublic void set" + camel(i[1]) + "(" + i[0] + " " + i[1] + ") {\n" + "\
 	\tthis." + i[1] + " = " + i[1] + ";\n\t}\n"
 
-	snip.rv += "\n\tpublic " + i[0] + " get" + camel(i[1]) + "() {\
-	\n\t\treturn " + i[1] + ";\n\t}\n"
+	snip.rv += "\n\tpublic " + i[0] + " get" + camel(i[1]) + "() {\n\
+	\t\treturn " + i[1] + ";\n\t}\n"
 `
 }
 endsnippet
@@ -138,7 +138,7 @@ for i in args:
 	snip.rv += "\n\tprivate " + i[0] + " " + i[1]+ ";"
 if len(args) > 0:
 	snip.rv += "\n"`
-	public `!p snip.rv = snip.basename or "unknown"`($1) { `!p
+	public `!p snip.rv = snip.basename or "unknown"`($1) {`!p
 args = getArgs(t[1])
 for i in args:
 	snip.rv += "\n\t\tthis.%s = %s;" % (i[1], i[1])
@@ -266,7 +266,7 @@ for i in args:
 	snip.rv += "\n\tprivate " + i[0] + " " + i[1]+ ";"
 if len(args) > 0:
 	snip.rv += "\n"`
-public `!p snip.rv = snip.basename or "unknown"`($1) { `!p
+public `!p snip.rv = snip.basename or "unknown"`($1) {`!p
 args = getArgs(t[1])
 for i in args:
 	snip.rv += "\n\t\tthis.%s = %s;" % (i[1], i[1])

From 3d4994b64bd3a0c5ac80a2be111690f6d795aed0 Mon Sep 17 00:00:00 2001
From: oddlydrawn <oddlydrawndev@gmail.com>
Date: Fri, 11 Mar 2016 13:31:09 -0700
Subject: [PATCH 0803/1587] Removes clc getter tab, Removes white space in md,
 Adds blank line w/o indent in gs

---
 UltiSnips/java.snippets | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index bdd1dd6b2..54d026dfb 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -124,7 +124,7 @@ for i in args:
 	\tthis." + i[1] + " = " + i[1] + ";\n\t}\n"
 
 	snip.rv += "\n\tpublic " + i[0] + " get" + camel(i[1]) + "() {\n\
-	\t\treturn " + i[1] + ";\n\t}\n"
+	\treturn " + i[1] + ";\n\t}\n"
 `
 }
 endsnippet
@@ -326,11 +326,11 @@ snippet md "Method With javadoc" b
  * ${7:Short Description}`!p
 for i in getArgs(t[4]):
 	snip.rv += "\n\t * @param " + i[1] + " usage..."`
- * `!p
+ *`!p
 if "throws" in t[5]:
 	snip.rv = "\n\t * @throws " + t[6]
 else:
-	snip.rv = ""` `!p
+	snip.rv = ""``!p
 if not "void" in t[2]:
 	snip.rv = "\n\t * @return object"
 else:
@@ -356,8 +356,7 @@ endsnippet
 snippet /se?tge?t|ge?tse?t|gs/ "setter and getter" br
 public void set${1:Name}(${2:String} `!p snip.rv = mixedCase(t[1])`) {
 	this.`!p snip.rv = mixedCase(t[1])` = `!p snip.rv = mixedCase(t[1])`;
-}
-
+}`!p snip.rv += "\n"`
 public $2 get$1() {
 	return `!p snip.rv = mixedCase(t[1])`;
 }

From f878039dd6c3ddab6f938011192eefad85f1123f Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 13 Mar 2016 18:12:25 +0000
Subject: [PATCH 0804/1587] Elixir: Add exunit case snippet

---
 snippets/elixir.snippets | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index bd621760e..17cebbbb2 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -87,10 +87,6 @@ snippet doc
 	"""
 snippet fn
 	fn ${1:args} -> ${0} end
-snippet fun
-	function do
-		${0}
-	end
 snippet mdoc
 	@moduledoc """
 	${0}
@@ -114,6 +110,12 @@ snippet test
 	end
 snippet testa
 	test "${1:test_name}", %{${2:arg: arg}} do
+		${0}
+	end
+snippet exunit
+	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
+		use ExUnit.Case
+
 		${0}
 	end
 snippet try try .. rescue .. end

From 979b9cd49de901afb06bab561614e401166a25fb Mon Sep 17 00:00:00 2001
From: Florian Sattler <vuld3r@gmail.com>
Date: Tue, 15 Mar 2016 10:38:49 +0100
Subject: [PATCH 0805/1587] Changed ifndef snippet to #ifndef This makes it
 consistent with the other C macro snippets

---
 UltiSnips/c.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 56f34e5e0..c98946493 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -8,7 +8,7 @@ snippet def "#define ..."
 #define ${1}
 endsnippet
 
-snippet ifndef "#ifndef ... #define ... #endif"
+snippet #ifndef "#ifndef ... #define ... #endif"
 #ifndef ${1/([A-Za-z0-9_]+).*/$1/}
 #define ${1:SYMBOL} ${2:value}
 #endif /* ifndef $1 */

From 65211115a003d5efbd75b4adfe84d93f49b6c9cf Mon Sep 17 00:00:00 2001
From: toogley <toogley@mailbox.org>
Date: Sun, 20 Mar 2016 20:15:27 +0100
Subject: [PATCH 0806/1587] make default settings for bash more reliable

see http://redsymbol.net/articles/unofficial-bash-strict-mode/ for explanation
why this might be useful.
---
 UltiSnips/sh.snippets | 4 ++++
 snippets/sh.snippets  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 9cc45779e..33e5d0092 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -33,6 +33,10 @@ snippet !env "#!/usr/bin/env (!env)"
 `!p snip.rv = '#!/usr/bin/env ' + getShell() + "\n\n" `
 endsnippet
 
+snippet sbash "safe bash options"
+`!p snip.rv = '#!/usr/bin/env bash' +  "\nset -euo pipefail\nIFS=$'\n\t'" + "\n\n" `
+endsnippet
+
 snippet temp "Tempfile"
 ${1:TMPFILE}="$(mktemp -t ${2:`!p
 snip.rv = re.sub(r'[^a-zA-Z]', '_', snip.fn) or "untitled"
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 4d2c62b8b..e470a2ab8 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -5,6 +5,11 @@ snippet #!
 snippet bash
 	#!/usr/bin/env bash
 
+snippet sbash
+	#!/usr/bin/env bash
+	set -euo pipefail
+	IFS=$'\n\t'
+
 snippet if
 	if [[ ${1:condition} ]]; then
 		${0:#statements}

From 5590616c4a664ef10fbd00d1cd84dce7533323eb Mon Sep 17 00:00:00 2001
From: toogley <toogley@mailbox.org>
Date: Mon, 21 Mar 2016 17:06:09 +0100
Subject: [PATCH 0807/1587] fix 'sbash' snippet interpreting newline and tab
 character

This pullrequest: https://github.com/honza/vim-snippets/pull/704 introduced a
new bug of the 'sbash' snippet of Ultisnips. Python interpreted the \n and \t in
IFS=$'\n\t' and executed them instead of assigning it to the variable IFS.
---
 UltiSnips/sh.snippets | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 33e5d0092..701818451 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -34,7 +34,10 @@ snippet !env "#!/usr/bin/env (!env)"
 endsnippet
 
 snippet sbash "safe bash options"
-`!p snip.rv = '#!/usr/bin/env bash' +  "\nset -euo pipefail\nIFS=$'\n\t'" + "\n\n" `
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+`!p snip.rv ='\n\n' `
 endsnippet
 
 snippet temp "Tempfile"

From 47f262c64c6fe96fb210e788f3e191cd32933f18 Mon Sep 17 00:00:00 2001
From: Laurent Georget <laurent.georget@supelec.fr>
Date: Wed, 6 Apr 2016 22:26:59 +0200
Subject: [PATCH 0808/1587] r: Close the Else-If snippet

---
 UltiSnips/r.snippets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index 10c818c01..02c4c259d 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -59,6 +59,7 @@ snippet eif "Else-If statement"
 else if (${1}) {
 	${0}
 }
+endsnippet
 
 snippet el "Else statement"
 else {

From c133679866955d64762c1fc2befbdd296b569ea1 Mon Sep 17 00:00:00 2001
From: Laurent Georget <laurent.georget@supelec.fr>
Date: Sat, 2 Apr 2016 11:15:17 +0200
Subject: [PATCH 0809/1587] C++: Add a snippet to generate an entire .h
 skeleton

---
 UltiSnips/cpp.snippets | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index c2cb3d033..f7c2bd830 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -54,4 +54,20 @@ snippet tp "template <typename ..> (template)"
 template <typename ${1:_InputIter}>
 endsnippet
 
+snippet cla "An entire .h generator" b
+#ifndef ${2:`!v substitute(vim_snippets#Filename('$1_H','ClassName'),'.*','\U&\E','')`}
+#define $2
+
+class ${1:`!v substitute(substitute(vim_snippets#Filename('$1','ClassName'),'^.','\u&',''), '_\(\w\)', '\u\1', 'g')`}
+{
+private:
+	${3}
+
+public:
+	$1();
+	virtual ~$1();
+};
+
+#endif /* $2 */
+endsnippet
 # vim:ft=snippets:

From b7ea3ba6902b52a19903f52a1b2125b5f861e271 Mon Sep 17 00:00:00 2001
From: Gueunet Charles <charles.gueunet+git@gmail.com>
Date: Tue, 12 Apr 2016 22:12:21 +0200
Subject: [PATCH 0810/1587] Add snippet for casting in CPP

---
 snippets/cpp.snippets | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index ca9fbe3c6..1539d5f97 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -106,6 +106,19 @@ snippet cout
 snippet cin
 	std::cin >> ${1};
 ##
+## Casts
+# static
+snippet sca
+	static_cast<${1:unsigned}>(${2:expr})${3}
+# dynamic
+snippet dca
+	dynamic_cast<${1:unsigned}>(${2:expr})${3}
+# reinterpret
+snippet rca
+	reinterpret_cast<${1:unsigned}>(${2:expr})${3}
+# const
+snippet cca
+	const_cast<${1:unsigned}>(${2:expr})${3}
 ## Iteration
 # for i
 snippet fori

From 3532786cd03228131672ac1005cc541df109aa9a Mon Sep 17 00:00:00 2001
From: protream <protream@gmail.com>
Date: Sat, 16 Apr 2016 23:47:45 +0800
Subject: [PATCH 0811/1587] Python: add a snippet to generate pocoo style
 module doc string

---
 UltiSnips/python.snippets | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 654538d02..9dc53a54f 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -245,6 +245,9 @@ def write_function_docstring(t, snip):
 	snip.rv += '\n' + snip.mkline('', indent='')
 	snip += triple_quotes(snip)
 
+def get_dir_and_file_name(snip):
+	return os.getcwd().split('/')[-1] + '.' + snip.basename
+
 endglobal
 
 ########################################
@@ -687,4 +690,18 @@ ${1:${VISUAL:doc}}
 `!p snip.rv = triple_quotes(snip)`
 endsnippet
 
+snippet pmdoc "pocoo style module doc sting" b
+# -*- coding: utf-8 -*-
+"""
+	`!p snip.rv = get_dir_and_file_name(snip)`
+	`!p snip.rv = '~' * len(get_dir_and_file_name(snip))`
+
+	${1:YOURDOCSTRING}
+
+	:copyright: (c) `date +Y%` by ${2:YOURNAME}.
+	:license: ${3:YOURLICENSE}, see LICENSE for more details.
+"""
+$0
+endsnippet
+
 # vim:ft=snippets:

From 65bea4930f85feaf835377c81633258773314149 Mon Sep 17 00:00:00 2001
From: Nan Zheng <protream@gmail.com>
Date: Sat, 16 Apr 2016 23:58:56 +0800
Subject: [PATCH 0812/1587] Fix a spell error

---
 UltiSnips/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 9dc53a54f..f02e37814 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -690,7 +690,7 @@ ${1:${VISUAL:doc}}
 `!p snip.rv = triple_quotes(snip)`
 endsnippet
 
-snippet pmdoc "pocoo style module doc sting" b
+snippet pmdoc "pocoo style module doc string" b
 # -*- coding: utf-8 -*-
 """
 	`!p snip.rv = get_dir_and_file_name(snip)`

From 42c2b7847078f8e920f30084f46cf2ff60f3e173 Mon Sep 17 00:00:00 2001
From: protream <protream@gmail.com>
Date: Tue, 19 Apr 2016 17:30:04 +0800
Subject: [PATCH 0813/1587] snippet `pmdoc`: fix year generate error and make
 variables more readable

---
 UltiSnips/python.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 9dc53a54f..2fb775a84 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -690,16 +690,16 @@ ${1:${VISUAL:doc}}
 `!p snip.rv = triple_quotes(snip)`
 endsnippet
 
-snippet pmdoc "pocoo style module doc sting" b
+snippet pmdoc "pocoo style module doc string" b
 # -*- coding: utf-8 -*-
 """
 	`!p snip.rv = get_dir_and_file_name(snip)`
 	`!p snip.rv = '~' * len(get_dir_and_file_name(snip))`
 
-	${1:YOURDOCSTRING}
+	${1:DESCRIPTION}
 
-	:copyright: (c) `date +Y%` by ${2:YOURNAME}.
-	:license: ${3:YOURLICENSE}, see LICENSE for more details.
+	:copyright: (c) `date +%Y` by ${2:YOUR_NAME}.
+	:license: ${3:LICENSE_NAME}, see LICENSE for more details.
 """
 $0
 endsnippet

From 79c137c550c62cc1aa3788525e23a36ff9c39112 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 21 Apr 2016 23:30:55 +0100
Subject: [PATCH 0814/1587] Erlang -ifdef macro

---
 snippets/erlang.snippets | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index 18f1c6de5..ca92651bd 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -24,6 +24,10 @@ snippet incl
 # behavior directive
 snippet beh
 	-behaviour(${1:behaviour}).
+snippet ifd
+	-ifdef(${1:TEST}).
+	${0}
+	-endif.
 # if expression
 snippet if
 	if
@@ -483,21 +487,21 @@ snippet testsuite
 	-module(${0:`vim_snippets#Filename('', 'my')`}).
 
 	-include_lib("common_test/include/ct.hrl").
-	
+
 	%% Test server callbacks
 	-export([suite/0, all/0, groups/0,
 		 init_per_suite/1, end_per_suite/1,
 		 init_per_group/2, end_per_group/2,
 		 init_per_testcase/2, end_per_testcase/2]).
-	
+
 	%% Test cases
 	-export([
 		]).
-	
+
 	%%--------------------------------------------------------------------
 	%% COMMON TEST CALLBACK FUNCTIONS
 	%%--------------------------------------------------------------------
-	
+
 	%%--------------------------------------------------------------------
 	%% Function: suite() -> Info
 	%%
@@ -512,7 +516,7 @@ snippet testsuite
 	%%--------------------------------------------------------------------
 	suite() ->
 	    [{timetrap,{minutes,10}}].
-	
+
 	%%--------------------------------------------------------------------
 	%% Function: init_per_suite(Config0) ->
 	%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
@@ -529,7 +533,7 @@ snippet testsuite
 	%%--------------------------------------------------------------------
 	init_per_suite(Config) ->
 	    Config.
-	
+
 	%%--------------------------------------------------------------------
 	%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
 	%%
@@ -540,7 +544,7 @@ snippet testsuite
 	%%--------------------------------------------------------------------
 	end_per_suite(_Config) ->
 	    ok.
-	
+
 	%%--------------------------------------------------------------------
 	%% Function: init_per_group(GroupName, Config0) ->
 	%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
@@ -556,7 +560,7 @@ snippet testsuite
 	%%--------------------------------------------------------------------
 	init_per_group(_GroupName, Config) ->
 	    Config.
-	
+
 	%%--------------------------------------------------------------------
 	%% Function: end_per_group(GroupName, Config0) ->
 	%%               void() | {save_config,Config1}
@@ -570,7 +574,7 @@ snippet testsuite
 	%%--------------------------------------------------------------------
 	end_per_group(_GroupName, _Config) ->
 	    ok.
-	
+
 	%%--------------------------------------------------------------------
 	%% Function: init_per_testcase(TestCase, Config0) ->
 	%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
@@ -589,7 +593,7 @@ snippet testsuite
 	%%--------------------------------------------------------------------
 	init_per_testcase(_TestCase, Config) ->
 	    Config.
-	
+
 	%%--------------------------------------------------------------------
 	%% Function: end_per_testcase(TestCase, Config0) ->
 	%%               void() | {save_config,Config1} | {fail,Reason}
@@ -605,7 +609,7 @@ snippet testsuite
 	%%--------------------------------------------------------------------
 	end_per_testcase(_TestCase, _Config) ->
 	    ok.
-	
+
 	%%--------------------------------------------------------------------
 	%% Function: groups() -> [Group]
 	%%
@@ -629,7 +633,7 @@ snippet testsuite
 	%%--------------------------------------------------------------------
 	groups() ->
 	    [].
-	
+
 	%%--------------------------------------------------------------------
 	%% Function: all() -> GroupsAndTestCases | {skip,Reason}
 	%%
@@ -644,14 +648,14 @@ snippet testsuite
 	%% Description: Returns the list of groups and test cases that
 	%%              are to be executed.
 	%%--------------------------------------------------------------------
-	all() -> 
+	all() ->
 	    [].
-	
-	
+
+
 	%%--------------------------------------------------------------------
 	%% TEST CASES
 	%%--------------------------------------------------------------------
-	
+
 	%%--------------------------------------------------------------------
 	%% Function: TestCase(Config0) ->
 	%%               ok | exit() | {skip,Reason} | {comment,Comment} |

From 517dc9f8b54e0b7eb3eb7fff7ec2c5eced4b82b1 Mon Sep 17 00:00:00 2001
From: protream <protream@gmail.com>
Date: Tue, 26 Apr 2016 17:26:46 +0800
Subject: [PATCH 0815/1587] snippet `pmdoc`: improve compatibility

---
 UltiSnips/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 2fb775a84..fa3ff8b98 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -246,7 +246,7 @@ def write_function_docstring(t, snip):
 	snip += triple_quotes(snip)
 
 def get_dir_and_file_name(snip):
-	return os.getcwd().split('/')[-1] + '.' + snip.basename
+	return os.getcwd().split(os.sep)[-1] + '.' + snip.basename
 
 endglobal
 

From a5edd3369eb9bbe9a65f76363eaf5e79f26d4149 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Fri, 29 Apr 2016 17:32:57 +0100
Subject: [PATCH 0816/1587] Use relative path when determining `namespace` for
 PHP snippet

---
 UltiSnips/php.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 66abe5cfa..fc7d1d34d 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -268,8 +268,8 @@ endsnippet
 
 snippet ns "namespace declaration" b
 namespace ${1:`!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `};
@@ -279,8 +279,8 @@ snippet class "Class declaration template" b
 <?php
 
 namespace ${1:`!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `};
@@ -298,8 +298,8 @@ snippet interface "Interface declaration template" b
 <?php
 
 namespace ${1:`!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `};

From 05b7e5c4e2654cedb254eae5784d7efb5a4efdef Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Sat, 30 Apr 2016 11:28:18 +0100
Subject: [PATCH 0817/1587] Updated PHPUnit, Symfony and Laravel class snippets
 to be consistent with existing PHP snippets' namespace and adding `<?php`

Changed PHPUnit and Symfony snippet's namespace and author to be consistent with other PHP snippets

class

blah
---
 UltiSnips/php-laravel.snippets  | 14 +++++++
 UltiSnips/php-phpunit.snippets  |  8 ++--
 UltiSnips/php-symfony2.snippets | 66 ++++++++++++++++++++-------------
 3 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/UltiSnips/php-laravel.snippets b/UltiSnips/php-laravel.snippets
index 3ad26c632..7367a1471 100644
--- a/UltiSnips/php-laravel.snippets
+++ b/UltiSnips/php-laravel.snippets
@@ -36,6 +36,8 @@ endsnippet
 
 #service service provider
 snippet l_ssp "Laravel service provider for service" b
+<?php
+
 /*!
  * \namespace   $1
  * \class       $2
@@ -62,6 +64,8 @@ endsnippet
 
 #repository service provider
 snippet l_rsp "Laravel service provider for repository" b
+<?php
+
 /*!
  * \namespace   $2
  * \class       $3
@@ -100,6 +104,8 @@ endsnippet
 
 #model
 snippet l_md "Laravel simple model" b
+<?php
+
 /*!
  * \namespace   $1
  * \class       $2
@@ -123,6 +129,8 @@ endsnippet
 
 #abstract repository
 snippet l_ar "Laravel abstract Repository" b
+<?php
+
 /*!
  * \namespace   $1
  * \class       $2
@@ -189,6 +197,8 @@ endsnippet
 
 #repository
 snippet l_r "Laravel Repository" b
+<?php
+
 /*!
  * \namespace   $1
  * \class       $3
@@ -207,6 +217,8 @@ endsnippet
 
 #service
 snippet l_s "Laravel Service" b
+<?php
+
 /*!
  * \namespace   $1
  * \class       $2
@@ -233,6 +245,8 @@ endsnippet
 
 #facade
 snippet l_f "Laravel Facade" b
+<?php
+
 /*!
  * \namespace   $1
  * \class       $2
diff --git a/UltiSnips/php-phpunit.snippets b/UltiSnips/php-phpunit.snippets
index e928bb1e7..9120406bd 100644
--- a/UltiSnips/php-phpunit.snippets
+++ b/UltiSnips/php-phpunit.snippets
@@ -3,15 +3,17 @@
 priority -50
 
 snippet test "phpunit test class" b
+<?php
+
 namespace `!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `;
 
 /**
- * @author `whoami`
+ * @author `!v g:snips_author`
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
diff --git a/UltiSnips/php-symfony2.snippets b/UltiSnips/php-symfony2.snippets
index 520e366b9..5b7417b25 100644
--- a/UltiSnips/php-symfony2.snippets
+++ b/UltiSnips/php-symfony2.snippets
@@ -4,15 +4,17 @@
 priority -50
 
 snippet classn "Basic class with namespace snippet" b
+<?php
+
 namespace `!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `;
 
 /**
- * ${1:@author `whoami`}
+ * ${1:@author `!v g:snips_author`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -26,9 +28,11 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet contr "Symfony2 controller" b
+<?php
+
 namespace `!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `;
@@ -40,7 +44,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * ${1:@author `whoami`}
+ * ${1:@author `!v g:snips_author`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -72,13 +76,15 @@ public function ${1}Action(${2})
 	${6}
 	return [];
 }`!p
-abspath = os.path.abspath(path)`
+relpath = os.path.relpath(path)`
 endsnippet
 
 snippet comm "Symfony2 command" b
+<?php
+
 namespace `!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `;
@@ -90,7 +96,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * ${3:@author `whoami`}
+ * ${3:@author `!v g:snips_author`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -113,9 +119,11 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet subs "Symfony2 subscriber" b
+<?php
+
 namespace `!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `;
@@ -123,7 +131,7 @@ if m:
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * ${1:@author `whoami`}
+ * ${1:@author `!v g:snips_author`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -144,9 +152,11 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet transf "Symfony2 form data transformer" b
+<?php
+
 namespace `!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `;
@@ -155,7 +165,7 @@ use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
 /**
- * ${3:@author `whoami`}
+ * ${3:@author `!v g:snips_author`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -178,9 +188,11 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet ent "Symfony2 doctrine entity" b
+<?php
+
 namespace `!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `;
@@ -188,7 +200,7 @@ if m:
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * ${3:@author `whoami`}
+ * ${3:@author `!v g:snips_author`}
  *
  * @ORM\Entity()
  * @ORM\Table(name="`!p
@@ -215,9 +227,11 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet form "Symfony2 form type" b
+<?php
+
 namespace `!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `;
@@ -227,7 +241,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * ${2:@author `whoami`}
+ * ${2:@author `!v g:snips_author`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
@@ -259,9 +273,11 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet ev "Symfony2 event" b
+<?php
+
 namespace `!p
-abspath = os.path.abspath(path)
-m = re.search(r'[A-Z].+(?=/)', abspath)
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
 if m:
 	snip.rv = m.group().replace('/', '\\')
 `;
@@ -269,7 +285,7 @@ if m:
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * ${2:@author `whoami`}
+ * ${2:@author `!v g:snips_author`}
  */
 class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()

From 9bee55407f7cfec05f8d3be7dc106a68f7543af5 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Sat, 30 Apr 2016 13:17:26 +0100
Subject: [PATCH 0818/1587] Trait snippet for PHP

---
 UltiSnips/php.snippets | 19 +++++++++++++++++++
 snippets/php.snippets  | 12 ++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index fc7d1d34d..59c8c1d45 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -314,6 +314,25 @@ interface $1
 }
 endsnippet
 
+snippet trait "Trait declaration template" b
+<?php
+
+namespace ${1:`!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`};
+
+/**
+ * Interface ${1:`!p snip.rv=snip.basename`}
+ * @author ${2:`!v g:snips_author`}
+ */
+trait $1
+{
+	public function ${3:someFunction}();$4                                                                                                              
+}
+endsnippet
 
 snippet construct "__construct()" b
 /**
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 9edefa2c7..269e55bf1 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -218,6 +218,18 @@ snippet interface
 	{
 		${0}
 	}
+# Trait
+snippet trait
+	/**
+	 * ${2:undocumented class}
+	 *
+	 * @package ${3:default}
+	 * @author ${4:`g:snips_author`}
+	 */
+	trait ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
 # class ...
 snippet class
 	/**

From a13199fb3c4f7c3dd64d1b93503e37686defddbf Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Sat, 30 Apr 2016 13:33:27 +0100
Subject: [PATCH 0819/1587] Moved snippet `sfa` into Symfony snippets

---
 UltiSnips/php-symfony2.snippets | 12 ++++++++++++
 UltiSnips/php.snippets          | 14 --------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/UltiSnips/php-symfony2.snippets b/UltiSnips/php-symfony2.snippets
index 5b7417b25..2b127ee98 100644
--- a/UltiSnips/php-symfony2.snippets
+++ b/UltiSnips/php-symfony2.snippets
@@ -53,6 +53,18 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
+snippet sfa "Symfony 2 Controller action"
+/**
+* @Route("/${1:route_name}", name="$1")
+* @Template()
+*/
+public function $1Action($2)
+{
+	$3
+	return ${4:array();}$0
+}
+endsnippet
+
 snippet act "Symfony2 action" b
 /**
  * @Route("${3}", name="${4}")
diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 59c8c1d45..f105ee6e1 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -330,7 +330,6 @@ if m:
  */
 trait $1
 {
-	public function ${3:someFunction}();$4                                                                                                              
 }
 endsnippet
 
@@ -352,19 +351,6 @@ snippet pc "Dumb debug helper in cli"
 var_export($1);$0
 endsnippet
 
-# Symfony 2 based snippets
-snippet sfa "Symfony 2 Controller action"
-/**
-* @Route("/${1:route_name}", name="$1")
-* @Template()
-*/
-public function $1Action($2)
-{
-	$3
-	return ${4:array();}$0
-}
-endsnippet
-
 snippet inheritdoc "@inheritdoc docblock"
 /**
  * {@inheritdoc}

From c95c0e4cda77336bfdaf7adf89a77d0fa9e8afd1 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Sat, 30 Apr 2016 13:57:11 +0100
Subject: [PATCH 0820/1587] Fix the PHPDoc for trait snippet

---
 UltiSnips/php.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index f105ee6e1..01ab715e8 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -325,7 +325,7 @@ if m:
 `};
 
 /**
- * Interface ${1:`!p snip.rv=snip.basename`}
+ * Trait ${1:`!p snip.rv=snip.basename`}
  * @author ${2:`!v g:snips_author`}
  */
 trait $1

From e7af7326ea2c1ba55df6bcff7fb32bd6f52a285e Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Sat, 30 Apr 2016 16:31:04 +0100
Subject: [PATCH 0821/1587] Initial snippets for phpspec

---
 UltiSnips/php-phpspec.snippets | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 UltiSnips/php-phpspec.snippets

diff --git a/UltiSnips/php-phpspec.snippets b/UltiSnips/php-phpspec.snippets
new file mode 100644
index 000000000..b9ec03203
--- /dev/null
+++ b/UltiSnips/php-phpspec.snippets
@@ -0,0 +1,38 @@
+# Snippets for phpspec
+
+priority -50
+
+snippet spec "phpspec class" b
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
+
+/**
+ * @author `!v g:snips_author`
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends ObjectBehavior
+{
+	public function it${1:_does_something}()
+	{
+		$0
+	}
+}
+endsnippet
+
+snippet it "phpspec function it..." b
+public function it${1:_does_something}()
+{
+	$0
+}
+endsnippet
+

From ee4c92c6943a0f1ebb84f2ca7cee98681bdcca65 Mon Sep 17 00:00:00 2001
From: Rory McNamara <rmcnamara@gdssecurity.com>
Date: Wed, 4 May 2016 10:48:24 +0100
Subject: [PATCH 0822/1587] add visual interpolation to tex snippets

---
 snippets/tex.snippets | 64 +++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index a618ceb1e..68ac5d056 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -16,57 +16,57 @@ snippet dmo \DeclareMathOperator
 # \begin{}...\end{}
 snippet begin \begin{} ... \end{} block
 	\begin{${1:env}}
-		${0}
+		${0:${VISUAL}}
 	\end{$1}
 # Tabular
 snippet tab tabular (or arbitrary) environment
 	\begin{${1:tabular}}{${2:c}}
-		${0}
+		${0:${VISUAL}}
 	\end{$1}
 snippet thm thm (or arbitrary) environment with optional argument
 	\begin[${1:author}]{${2:thm}}
-		${0}
+		${0:${VISUAL}}
 	\end{$2}
 snippet center center environment
 	\begin{center}
-		${0}
+		${0:${VISUAL}}
 	\end{center}
 # Align(ed)
 snippet ali align(ed) environment
 	\begin{align${1:ed}}
 		\label{eq:${2}}
-		${0}
+		${0:${VISUAL}}
 	\end{align$1}
 # Gather(ed)
 snippet gat gather(ed) environment
 	\begin{gather${1:ed}}
-		${0}
+		${0:${VISUAL}}
 	\end{gather$1}
 # Equation
 snippet eq equation environment
 	\begin{equation}
-		${0}
+		${0:${VISUAL}}
 	\end{equation}
 # Equation
 snippet eql Labeled equation environment
 	\begin{equation}
 		\label{eq:${2}}
-	${0}
+	${0:${VISUAL}}
 	\end{equation}
 # Equation
 snippet eq* unnumbered equation environment
 	\begin{equation*}
-		${0}
+		${0:${VISUAL}}
 	\end{equation*}
 # Unnumbered Equation
 snippet \ unnumbered equation: \[ ... \]
 	\[
-		${0}
+		${0:${VISUAL}}
 	\]
 # Equation array
 snippet eqnarray eqnarray environment
 	\begin{eqnarray}
-		${0}
+		${0:${VISUAL}}
 	\end{eqnarray}
 # Label
 snippet lab \label
@@ -90,7 +90,7 @@ snippet itemize itemize environment
 		\item ${0}
 	\end{itemize}
 snippet item \item
-	\item ${1}
+	\item ${1:${VISUAL}}
 # Description
 snippet desc description environment
 	\begin{description}
@@ -103,18 +103,18 @@ snippet ]i \item (recursive)
 # Matrix
 snippet mat smart matrix environment
 	\begin{${1:p/b/v/V/B/small}matrix}
-		${0}
+		${0:${VISUAL}}
 	\end{$1matrix}
 # Cases
 snippet cas cases environment
 	\begin{cases}
 		${1:equation}, &\text{ if }${2:case}\\
-		${0}
+		${0:${VISUAL}}
 	\end{cases}
 # Split
 snippet spl split environment
 	\begin{split}
-		${0}
+		${0:${VISUAL}}
 	\end{split}
 # Part
 snippet part document \part
@@ -203,32 +203,32 @@ snippet fcite \footcite[]{}
 	\footcite[${1}]{${2}}${0}
 #Formating text: italic, bold, underline, small capital, emphase ..
 snippet it italic text
-	\textit{${0:text}}
+	\textit{${0:${VISUAL:text}}}
 snippet bf bold face text
-	\textbf{${0:text}}
+	\textbf{${0:${VISUAL:text}}}
 snippet under underline text
-	\underline{${0:text}}
+	\underline{${0:${VISUAL:text}}}
 snippet emp emphasize text
-	\emph{${0:text}}
+	\emph{${0:${VISUAL:text}}}
 snippet sc small caps text
-	\textsc{${0:text}}
+	\textsc{${0:${VISUAL:text}}}
 #Choosing font
 snippet sf sans serife text
-	\textsf{${0:text}}
+	\textsf{${0:${VISUAL:text}}}
 snippet rm roman font text
-	\textrm{${0:text}}
+	\textrm{${0:${VISUAL:text}}}
 snippet tt typewriter (monospace) text
-	\texttt{${0:text}}
+	\texttt{${0:${VISUAL:text}}}
 #Math font
 snippet mf mathfrak
-	\mathfrak{${0:text}}
+	\mathfrak{${0:${VISUAL:text}}}
 snippet mc mathcal
-	\mathcal{${0:text}}
+	\mathcal{${0:${VISUAL:text}}}
 snippet ms mathscr
-	\mathscr{${0:text}}
+	\mathscr{${0:${VISUAL:text}}}
 #misc
 snippet ft \footnote
-	\footnote{${0:text}}
+	\footnote{${0:${VISUAL:text}}}
 snippet fig figure environment (includegraphics)
 	\begin{figure}
 	\begin{center}
@@ -260,19 +260,19 @@ snippet lim \lim_{}
 	\lim_{${1:n \to \infty}} ${0}
 snippet frame frame environment
 	\begin{frame}[${1:t}]{${2:title}}
-		${0}
+		${0:${VISUAL}}
 	\end{frame}
 snippet block block environment
 	\begin{block}{${1:title}}
-	${0}
+	${0:${VISUAL}}
 	\end{block}
 snippet alert alertblock environment
 	\begin{alertblock}{${1:title}}
-	${0}
+	${0:${VISUAL}}
 	\end{alertblock}
 snippet example exampleblock environment
 	\begin{exampleblock}{${1:title}}
-	${0}
+	${0:${VISUAL}}
 	\end{exampleblock}
 snippet col2 two-column environment
 	\begin{columns}
@@ -301,7 +301,7 @@ snippet lra langle rangle
 # Code listings
 snippet lst
 	\begin{listing}[language=${1:language}]
-		${0}
+		${0:${VISUAL}}
 	\end{listing}
 snippet lsi
 	\lstinline|${1}| ${0}

From e8cb8d01655672d9230c72d981550e858e7b0033 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Thu, 5 May 2016 14:23:12 +0100
Subject: [PATCH 0823/1587] PHP and Twig conditional snippets to be consistent
 with naming convention: if, ife, eif, el, wh

---
 UltiSnips/php.snippets  | 20 ++++++++++++-------
 UltiSnips/twig.snippets | 18 +++++++++++++++++
 snippets/php.snippets   |  2 +-
 snippets/twig.snippets  | 43 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 snippets/twig.snippets

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 01ab715e8..ff3e6f390 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -11,6 +11,12 @@ snippet def "def"
 define('${1:VARIABLE_NAME}', ${2:'definition'});${3}
 endsnippet
 
+snippet wh "while"
+while (${1}) {
+	${0:${VISUAL}}
+}
+endsnippet
+
 snippet do "do"
 do {
 	${2:// code... }
@@ -39,9 +45,9 @@ interface ${1:someClass}
 } // END interface $1"
 endsnippet
 
-snippet else "else"
+snippet el "else"
 else {
-	${1:// code...}
+	${0:${VISUAL}}
 }
 endsnippet
 
@@ -62,14 +68,14 @@ $_GET['${1}']${2}
 endsnippet
 
 snippet if "if"
-if (${1:/* condition */}) {
-	${2:// code...}
+if (${1}) {
+	${0:${VISUAL}}
 }
 endsnippet
 
-snippet elif "elseif"
-elseif (${1:/* condition */}) {
-	${2:// code...}
+snippet eif "elseif"
+elseif (${1}) {
+	${0:${VISUAL}}
 }
 endsnippet
 
diff --git a/UltiSnips/twig.snippets b/UltiSnips/twig.snippets
index 156b981b0..c470d9b9c 100644
--- a/UltiSnips/twig.snippets
+++ b/UltiSnips/twig.snippets
@@ -20,10 +20,28 @@ endsnippet
 
 snippet if "twig if" b
 {% if ${1} %}
+${0:${VISUAL}}
+{% endif %}
+endsnippet
+
+snippet ife "twig if ... else" b
+{% if ${1} %}
 ${2}
+{% else %}
+${0}
 {% endif %}
 endsnippet
 
+snippet el "twig else"
+{% else %}
+${0:${VISUAL}}
+endsnippet
+
+snippet eif "twig elseif"
+{% elseif ${1} %}
+${0:${VISUAL}}
+endsnippet
+
 snippet for "twig for" b
 {% for ${1} in ${2} %}
 ${3}
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 269e55bf1..f611c7c10 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -299,7 +299,7 @@ snippet el
 		${0}
 	}
 snippet eif
-	elseif (${1:/* condition */}) {
+	elseif (${1}) {
 		${0}
 	}
 snippet switch
diff --git a/snippets/twig.snippets b/snippets/twig.snippets
new file mode 100644
index 000000000..dcd1a0460
--- /dev/null
+++ b/snippets/twig.snippets
@@ -0,0 +1,43 @@
+# twig block
+snippet bl
+{% block ${1} %}
+${2}
+{% endblock $1 %}
+# twig javascripts
+snippet js
+{% javascripts '${1}' %}
+	<script src="{{ asset_url }}"></script>
+{% endjavascripts %}
+# twig stylesheets
+snippet css
+{% stylesheets '${1}' %}
+	<link rel="stylesheet" href="{{ asset_url }}">
+{% endstylesheets %}
+# twig if
+snippet if
+{% if ${1} %}
+${2}
+{% endif %}
+# twig if ... else
+snippet ife
+{% if ${1} %}
+${2}
+{% else %}
+${0}
+{% endif %}
+# twig else
+snippet el
+{% else %}
+${0}
+# twig elseif
+snippet eif
+{% elseif ${1} %}
+${0}
+# twig for
+snippet for
+{% for ${1} in ${2} %}
+${3}
+{% endfor %}
+# twig extends
+snippet ext
+{% extends ${1} %}

From b2dda36fc77c6a15d2ec4ea273df610a55e92952 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Fri, 6 May 2016 12:29:42 +0100
Subject: [PATCH 0824/1587] Correctly indented snipMate template for Twig

---
 snippets/twig.snippets | 50 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/snippets/twig.snippets b/snippets/twig.snippets
index dcd1a0460..50ae82322 100644
--- a/snippets/twig.snippets
+++ b/snippets/twig.snippets
@@ -1,43 +1,43 @@
 # twig block
 snippet bl
-{% block ${1} %}
-${2}
-{% endblock $1 %}
+	{% block ${1} %}
+	${2}
+	{% endblock $1 %}
 # twig javascripts
 snippet js
-{% javascripts '${1}' %}
-	<script src="{{ asset_url }}"></script>
-{% endjavascripts %}
+	{% javascripts '${1}' %}
+		<script src="{{ asset_url }}"></script>
+	{% endjavascripts %}
 # twig stylesheets
 snippet css
-{% stylesheets '${1}' %}
-	<link rel="stylesheet" href="{{ asset_url }}">
-{% endstylesheets %}
+	{% stylesheets '${1}' %}
+		<link rel="stylesheet" href="{{ asset_url }}">
+	{% endstylesheets %}
 # twig if
 snippet if
-{% if ${1} %}
-${2}
-{% endif %}
+	{% if ${1} %}
+	${2}
+	{% endif %}
 # twig if ... else
 snippet ife
-{% if ${1} %}
-${2}
-{% else %}
-${0}
-{% endif %}
+	{% if ${1} %}
+	${2}
+	{% else %}
+	${0}
+	{% endif %}
 # twig else
 snippet el
-{% else %}
-${0}
+	{% else %}
+	${0}
 # twig elseif
 snippet eif
-{% elseif ${1} %}
-${0}
+	{% elseif ${1} %}
+	${0}
 # twig for
 snippet for
-{% for ${1} in ${2} %}
-${3}
-{% endfor %}
+	{% for ${1} in ${2} %}
+	${3}
+	{% endfor %}
 # twig extends
 snippet ext
-{% extends ${1} %}
+	{% extends ${1} %}

From 0a9c97439c0bf8b9d99b053ad4b34f7ee6a5fb41 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Thu, 12 May 2016 15:02:37 +0100
Subject: [PATCH 0825/1587] Makefile snippets for if, ife and el and
 .DEFAULT_GOAL

---
 snippets/make.snippets | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index 8367b8fe6..68a75e25c 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -25,7 +25,21 @@ snippet add
 snippet print
 	print-%: ; @echo $*=$($*)
 # ifeq
-snippet ifeq
+snippet if
 	ifeq (${1:cond0}, ${2:cond1})
 		${0}
 	endif
+# ifeq ... else ... endif
+snippet ife
+	ifeq (${1:cond0}, ${2:cond1})
+		${3}
+	else
+		${0}
+	endif
+# else ...
+snippet el
+	else
+		${0}
+# .DEFAULT_GOAL := target
+snippet default
+	.DEFAULT_GOAL := ${1}

From dcab6f8d0ae5ed01b7b701922420629d8e81a1e5 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Sun, 15 May 2016 10:42:28 +0100
Subject: [PATCH 0826/1587] phpspec matcher snippets

---
 UltiSnips/php-phpspec.snippets | 196 ++++++++++++++++++++++++++++++++-
 1 file changed, 190 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/php-phpspec.snippets b/UltiSnips/php-phpspec.snippets
index b9ec03203..297b73d86 100644
--- a/UltiSnips/php-phpspec.snippets
+++ b/UltiSnips/php-phpspec.snippets
@@ -1,8 +1,9 @@
-# Snippets for phpspec
+# Snippets for phpspec, to use add the following to your .vimrc
+# `autocmd BufRead,BufNewFile,BufEnter *Spec.php UltiSnipsAddFiletypes php-phpspec`
 
 priority -50
 
-snippet spec "phpspec class" b
+snippet spec "class XYZSpec extends ObjectBehaviour"
 <?php
 
 namespace `!p
@@ -22,17 +23,200 @@ class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
 ` extends ObjectBehavior
 {
-	public function it${1:_does_something}()
+	function it${1}()
 	{
 		$0
 	}
 }
 endsnippet
 
-snippet it "phpspec function it..." b
-public function it${1:_does_something}()
+snippet it "function it_does_something() { ... }"
+function it${1}()
 {
-	$0
+	${0:${VISUAL}}
 }
 endsnippet
 
+snippet let "function let() { ... }"
+function let()
+{
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet letgo "function letgo() { ... }"
+function letgo()
+{
+	${0:${VISUAL}}
+}
+endsnippet
+
+# Object construction
+snippet cw "$this->beConstructedWith($arg)"
+$this->beConstructedWith(${1});
+endsnippet
+
+snippet ct "$this->beConstructedThrough($methodName, [$arg])"
+$this->beConstructedThrough(${1:'methodName'}, [${2:'$arg'}]);
+endsnippet
+
+# Identity and comparison matchers
+snippet sreturn "$this->XYZ()->shouldReturn('value')"
+$this->${1:method}()->shouldReturn(${2:'value'});
+endsnippet
+
+snippet snreturn "$this->XYZ()->shouldNotReturn('value')"
+$this->${1:method}()->shouldNotReturn(${2:'value'});
+endsnippet
+
+snippet sbe "$this->XYZ()->shouldBe('value')"
+$this->${1:method}()->shouldBe(${2:'value'});
+endsnippet
+
+snippet snbe "$this->XYZ()->shouldNotBe('value')"
+$this->${1:method}()->shouldNotBe(${2:'value'});
+endsnippet
+
+snippet sequal "$this->XYZ()->shouldEqual('value')"
+$this->${1:method}()->shouldEqual(${2:'value'});
+endsnippet
+
+snippet snequal "$this->XYZ()->shouldNotEqual('value')"
+$this->${1:method}()->shouldNotEqual(${2:'value'});
+endsnippet
+
+snippet sbequalto "$this->XYZ()->shouldBeEqualTo('value')"
+$this->${1:method}()->shouldBeEqualTo(${2:'value'});
+endsnippet
+
+snippet snbequalto "$this->XYZ()->shouldNotBeEqualTo('value')"
+$this->${1:method}()->shouldNotBeEqualTo(${2:'value'});
+endsnippet
+
+snippet sblike "$this->XYZ()->shouldBeLike('value')"
+$this->${1:method}()->shouldBeLike(${2:'value'});
+endsnippet
+
+snippet snblike "$this->XYZ()->shouldNotBeLike('value')"
+$this->${1:method}()->shouldNotBeLike(${2:'value'});
+endsnippet
+
+# Throw matcher
+snippet sthrowm "$this->shouldThrow('\Exception')->duringXYZ($arg)"
+$this->shouldThrow(${1:'\Exception'})->during${2:Method}(${3:'$arg'});
+endsnippet
+
+snippet sthrowi "$this->shouldThrow('\Exception')->duringInstantiation()"
+$this->shouldThrow(${1:'\Exception'})->duringInstantiation();
+endsnippet
+
+# Type matchers
+snippet stype "$this->shouldHaveType('Type')"
+$this->shouldHaveType(${1});
+endsnippet
+
+snippet sntype "$this->shouldNotHaveType('Type')"
+$this->shouldNotHaveType(${1});
+endsnippet
+
+snippet srinstance "$this->shouldReturnAnInstanceOf('Type')"
+$this->shouldReturnAnInstanceOf(${1});
+endsnippet
+
+snippet snrinstance "$this->shouldNotReturnAnInstanceOf('Type')"
+$this->shouldNotReturnAnInstanceOf(${1});
+endsnippet
+
+snippet sbinstance "$this->shouldBeAnInstanceOf('Type')"
+$this->shouldBeAnInstanceOf(${1});
+endsnippet
+
+snippet snbinstance "$this->shouldNotBeAnInstanceOf('Type')"
+$this->shouldNotBeAnInstanceOf(${1});
+endsnippet
+
+snippet simplement "$this->shouldImplement('Type')"
+$this->shouldImplement(${1});
+endsnippet
+
+snippet snimplement "$this->shouldNotImplement('Type')"
+$this->shouldNotImplement(${1});
+endsnippet
+
+# Object state matchers
+snippet sbstate "$this->shouldBeXYZ()"
+$this->shouldBe${1}();
+endsnippet
+
+snippet snbstate "$this->shouldNotBeXYZ()"
+$this->shouldNotBe${1}();
+endsnippet
+
+# Count matchers
+snippet scount "$this->XYZ()->shouldHaveCount(7)"
+$this->${1:method}()->shouldHaveCount(${2:7});
+endsnippet
+
+snippet sncount "$this->XYZ()->shouldNotHaveCount(7)"
+$this->${1:method}()->shouldNotHaveCount(${2:7});
+endsnippet
+
+# Scalar type matchers
+snippet sbscalar "$this->XYZ()->shouldBeString|Array|Bool()"
+$this->${1:method}()->shouldBe(${2:'String|Array|Bool'});
+endsnippet
+
+snippet snbscalar "$this->XYZ()->shouldNotBeString|Array|Bool()"
+$this->${1:method}()->shouldNotBe(${2:'String|Array|Bool'});
+endsnippet
+
+# Contain matcher
+snippet scontain "$this->XYZ()->shouldContain('value')"
+$this->${1:method}()->shouldContain(${2:'value'});
+endsnippet
+
+snippet sncontain "$this->XYZ()->shouldNotContain('value')"
+$this->${1:method}()->shouldNotContain(${2:'value'});
+endsnippet
+
+# Array matchers
+snippet skey "$this->XYZ()->shouldHaveKey('key')"
+$this->${1:method}()->shouldHaveKey(${2:'key'});
+endsnippet
+
+snippet snkey "$this->XYZ()->shouldNotHaveKey('key')"
+$this->${1:method}()->shouldNotHaveKey(${2:'key'});
+endsnippet
+
+snippet skeyvalue "$this->XYZ()->shouldHaveKeyWithValue('key', 'value')"
+$this->${1:method}()->shouldHaveKeyWithValue(${2:'key'}, ${3:'value'});
+endsnippet
+
+snippet snkeyvalue "$this->XYZ()->shouldNotHaveKeyWithValue('key', 'value')"
+$this->${1:method}()->shouldNotHaveKeyWithValue(${2:'key'}, ${3:'value'});
+endsnippet
+
+# String matchers
+snippet sstart "$this->XYZ()->shouldStartWith('string')"
+$this->${1:method}()->shouldStartWith(${2:'string'});
+endsnippet
+
+snippet snstart "$this->XYZ()->shouldNotStartWith('string')"
+$this->${1:method}()->shouldNotStartWith(${2:'string'});
+endsnippet
+
+snippet send "$this->XYZ()->shouldEndWith('string')"
+$this->${1:method}()->shouldEndWith(${2:'string'});
+endsnippet
+
+snippet snend "$this->XYZ()->shouldNotEndWith('string')"
+$this->${1:method}()->shouldNotEndWith(${2:'string'});
+endsnippet
+
+snippet smatch "$this->XYZ()->shouldMatch('/wizard/i')"
+$this->${1:method}()->shouldMatch(${2:'/wizard/i'});
+endsnippet
+
+snippet snmatch "$this->XYZ()->shouldNotMatch('/wizard/i')"
+$this->${1:method}()->shouldNotMatch(${2:'/wizard/i'});
+endsnippet

From 6bf0288d5dd9ffea5713cbfda3257dd434c2fb7d Mon Sep 17 00:00:00 2001
From: Gueunet Charles <charles.gueunet+git@gmail.com>
Date: Sun, 15 May 2016 22:52:35 +0200
Subject: [PATCH 0827/1587] Add coma at the end of lambda snippets

---
 snippets/cpp.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 1539d5f97..d06b3c90c 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -146,9 +146,9 @@ snippet itera
 ## Lambdas
 # lamda (one line)
 snippet ld
-	[${1}](${2}){${3}}
+	[${1}](${2}){${3}};
 # lambda (multi-line)
 snippet lld
 	[${1}](${2}){
 		${3}
-	}
+	};

From efab1575ed1b1a08c60423ae7b3759126c97a5d5 Mon Sep 17 00:00:00 2001
From: Harald Wartig <hwartig@gmail.com>
Date: Mon, 16 May 2016 09:55:26 +0200
Subject: [PATCH 0828/1587] Add snippet for `# frozen_string_literal: true`

See https://wyeworks.com/blog/2015/12/1/immutable-strings-in-ruby-2-dot-3 for a detailed description of the frozen_string_literal comment.
---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index a6340e46d..772f46440 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -1,5 +1,7 @@
 snippet enc
 	# encoding: utf-8
+snippet frozen
+	# frozen_string_literal: true
 snippet #!
 	#!/usr/bin/env ruby
 # New Block

From c7f4b0a7f7ab441249cca4fce8a559f5271f30eb Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Tue, 17 May 2016 15:29:01 +0100
Subject: [PATCH 0829/1587] Snippet for `help` target for self-documented
 Makefile

---
 snippets/make.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index 68a75e25c..b46ee701f 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -43,3 +43,8 @@ snippet el
 # .DEFAULT_GOAL := target
 snippet default
 	.DEFAULT_GOAL := ${1}
+# help target for self-documentated Makefile
+snippet help
+	help: ## Prints help for targets with comments
+		@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $\$1, $\$2}'
+	${0}

From 1fb648c5e88de356f2d6674d9875cea5327c5719 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Mon, 2 May 2016 13:55:36 +0100
Subject: [PATCH 0830/1587] PHPUnit snippets for setup, tear down and marking
 tests skipped

---
 UltiSnips/php-phpunit.snippets | 40 ++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/php-phpunit.snippets b/UltiSnips/php-phpunit.snippets
index 9120406bd..73b03e201 100644
--- a/UltiSnips/php-phpunit.snippets
+++ b/UltiSnips/php-phpunit.snippets
@@ -1,8 +1,11 @@
 # suggestion? report bugs?
 # please go to https://github.com/chrisyue/vim-snippets/issues
+#
+# to use add the following to your .vimrc
+# `autocmd BufRead,BufNewFile,BufEnter *Test.php UltiSnipsAddFiletypes php-phpunit`
 priority -50
 
-snippet test "phpunit test class" b
+snippet testcase "class XYZTest extends \PHPUnit_Framework_TestCase { ... }"
 <?php
 
 namespace `!p
@@ -21,11 +24,32 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 {
 	public function test${1}()
 	{
-		${2}
+		${0:${VISUAL}}
 	}
 }
 endsnippet
 
+snippet test "public function testXYZ() { ... }"
+public function test${1}()
+{
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet setup "protected function setUp() { ... }"
+protected function setUp()
+{
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet teardown "protected function tearDown() { ... }"
+protected function tearDown()
+{
+	${0:${VISUAL}}
+}
+endsnippet
+
 snippet exp "phpunit expects" i
 expects($this->${1:once}())
 	->method('${2}')
@@ -38,3 +62,15 @@ snippet testcmt "phpunit comment with group" b
 * @group ${1}
 */
 endsnippet
+
+snippet fail "$this->fail()"
+$this->fail(${1});
+endsnippet
+
+snippet marki "$this->markTestIncomplete()"
+$this->markTestIncomplete(${1});
+endsnippet
+
+snippet marks "$this->markTestSkipped()"
+$this->markTestSkipped(${1});
+endsnippet

From 30fd9083db703faa3b96b7fda709d74b8ea8e5c8 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Mon, 23 May 2016 12:16:36 +0100
Subject: [PATCH 0831/1587] Corrected typo in description for self-documented
 Makefile snippet

---
 snippets/make.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index b46ee701f..332d6fc9d 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -43,7 +43,7 @@ snippet el
 # .DEFAULT_GOAL := target
 snippet default
 	.DEFAULT_GOAL := ${1}
-# help target for self-documentated Makefile
+# help target for self-documented Makefile
 snippet help
 	help: ## Prints help for targets with comments
 		@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $\$1, $\$2}'

From 477ede1985a92f3ae1a5ff806a7507823abcc203 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 24 May 2016 12:52:57 +0100
Subject: [PATCH 0832/1587] Erlang EUnit snippets

---
 snippets/erlang.snippets | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index ca92651bd..5440d7c46 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -482,6 +482,37 @@ snippet gen_event
 	%%%===================================================================
 	%%% Internal functions
 	%%%===================================================================
+# EUnit snippets
+snippet eunit
+	-module(${1:`vim_snippets#Filename('', 'my')`}).
+	-include_lib("eunit/include/eunit.hrl").
+
+	${0}
+snippet ieunit
+	-ifdef(TEST).
+	-include_lib("eunit/include/eunit.hrl").
+
+	${0}
+
+	-endif.
+snippet as
+	?assert(${0})
+snippet asn
+	?assertNot(${0})
+snippet aseq
+	?assertEqual(${1}, ${0})
+snippet asneq
+	?assertNotEqual(${1}, ${0})
+snippet asmat
+	?assertMatch(${1:Pattern}, ${0:Expression})
+snippet asnmat
+	?assertNotMatch(${1:Pattern}, ${0:Expression})
+snippet aserr
+	?assertError(${1:Pattern}, ${0:Expression})
+snippet asex
+	?assertExit(${1:Pattern}, ${0:Expression})
+snippet asexc
+	?assertException(${1:Class}, ${2:Pattern}, ${0:Expression})
 # common_test test_SUITE
 snippet testsuite
 	-module(${0:`vim_snippets#Filename('', 'my')`}).

From 55213060adceb4d3ad5c60bb1513442e75387731 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Tue, 24 May 2016 15:28:12 +0100
Subject: [PATCH 0833/1587] if, ife and ifn snippets for Mustache

---
 snippets/mustache.snippets | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 snippets/mustache.snippets

diff --git a/snippets/mustache.snippets b/snippets/mustache.snippets
new file mode 100644
index 000000000..8296afcb9
--- /dev/null
+++ b/snippets/mustache.snippets
@@ -0,0 +1,18 @@
+# if {{#value}} ... {{/value}}
+snippet if
+	{{#${1:value}}}
+	${0}
+	{{/$1}}
+# if not {{^value}} ... {{/value}}
+snippet ifn
+	{{^${1:value}}}
+	${0}
+	{{/$1}}
+# if else {{#value}} ... {{/value}} {{^value}} ... {{/value}}
+snippet ife
+	{{#${1:value}}}
+	${2}
+	{{/$1}}
+	{{^$1}}
+	${3}
+	{{/$1}}

From 9a8082aba696c879269edb4ec8710cc42f0eb8ff Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Wed, 25 May 2016 08:57:06 +0100
Subject: [PATCH 0834/1587] Fixed the PHPDoc block for the getter to use
 @return

---
 UltiSnips/php.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index ff3e6f390..465a6c4fd 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -115,7 +115,7 @@ snippet getter "PHP Class Getter" b
 /**
  * Getter for $1
  *
- * ${2:return string}
+ * @return ${2:string}
  */
 public function get${1/\w+\s*/\u$0/}()
 {
@@ -127,7 +127,7 @@ snippet setter "PHP Class Setter" b
 /**
  * Setter for $1
  *
- * @param ${2:string} $$1                                                                                                                               
+ * @param ${2:string} $$1
  * @return ${3:`!p snip.rv=snip.basename`}
  */
 public function set${1/\w+\s*/\u$0/}(${4:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
@@ -143,7 +143,7 @@ snippet gs "PHP Class Getter Setter" b
 /**
  * Getter for $1
  *
- * return ${2:string}
+ * @return ${2:string}
  */
 public function get${1/\w+\s*/\u$0/}()
 {
@@ -316,7 +316,7 @@ if m:
  */
 interface $1
 {
-	public function ${3:someFunction}();$4                                                                                                              
+	public function ${3:someFunction}();$4
 }
 endsnippet
 

From ff64f4d90ad94fed56bb2e5b546285f7d1742a75 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 26 May 2016 23:57:22 +0100
Subject: [PATCH 0835/1587] Elixir: ExUnit async by default

---
 snippets/elixir.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 17cebbbb2..ef971de98 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -114,7 +114,7 @@ snippet testa
 	end
 snippet exunit
 	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
-		use ExUnit.Case
+		use ExUnit.Case, async: true
 
 		${0}
 	end

From 120ead2c37ef9358c32b8ec211b261b438c54323 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Fri, 27 May 2016 13:18:16 +0100
Subject: [PATCH 0836/1587] Tidied up and consolidated snippets for PHPUnit

---
 UltiSnips/php-phpunit.snippets | 76 --------------------------
 UltiSnips/php.snippets         | 25 +++++++++
 snippets/php.snippets          | 98 ++++++++++++++++++----------------
 3 files changed, 77 insertions(+), 122 deletions(-)
 delete mode 100644 UltiSnips/php-phpunit.snippets

diff --git a/UltiSnips/php-phpunit.snippets b/UltiSnips/php-phpunit.snippets
deleted file mode 100644
index 73b03e201..000000000
--- a/UltiSnips/php-phpunit.snippets
+++ /dev/null
@@ -1,76 +0,0 @@
-# suggestion? report bugs?
-# please go to https://github.com/chrisyue/vim-snippets/issues
-#
-# to use add the following to your .vimrc
-# `autocmd BufRead,BufNewFile,BufEnter *Test.php UltiSnipsAddFiletypes php-phpunit`
-priority -50
-
-snippet testcase "class XYZTest extends \PHPUnit_Framework_TestCase { ... }"
-<?php
-
-namespace `!p
-relpath = os.path.relpath(path)
-m = re.search(r'[A-Z].+(?=/)', relpath)
-if m:
-	snip.rv = m.group().replace('/', '\\')
-`;
-
-/**
- * @author `!v g:snips_author`
- */
-class `!p
-snip.rv = re.match(r'.*(?=\.)', fn).group()
-` extends \PHPUnit_Framework_TestCase
-{
-	public function test${1}()
-	{
-		${0:${VISUAL}}
-	}
-}
-endsnippet
-
-snippet test "public function testXYZ() { ... }"
-public function test${1}()
-{
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet setup "protected function setUp() { ... }"
-protected function setUp()
-{
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet teardown "protected function tearDown() { ... }"
-protected function tearDown()
-{
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet exp "phpunit expects" i
-expects($this->${1:once}())
-	->method('${2}')
-	->with($this->equalTo(${3})${4})
-	->will($this->returnValue(${5}));
-endsnippet
-
-snippet testcmt "phpunit comment with group" b
-/**
-* @group ${1}
-*/
-endsnippet
-
-snippet fail "$this->fail()"
-$this->fail(${1});
-endsnippet
-
-snippet marki "$this->markTestIncomplete()"
-$this->markTestIncomplete(${1});
-endsnippet
-
-snippet marks "$this->markTestSkipped()"
-$this->markTestSkipped(${1});
-endsnippet
diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 465a6c4fd..f2e7b64b3 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -363,4 +363,29 @@ snippet inheritdoc "@inheritdoc docblock"
  */
 endsnippet
 
+# PHPUnit snippets
+snippet testcase "class XYZTest extends \PHPUnit_Framework_TestCase { ... }"
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+/**
+ * @author `!v g:snips_author`
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends \PHPUnit_Framework_TestCase
+{
+	public function test${1}()
+	{
+		${0:${VISUAL}}
+	}
+}
+endsnippet
+
 # :vim:ft=snippets:
diff --git a/snippets/php.snippets b/snippets/php.snippets
index f611c7c10..8939d6e3e 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -27,7 +27,7 @@ snippet ns
 snippet use
 	use ${1:Foo\Bar\Baz};
 	${0}
-snippet	c
+snippet c
 	class ${1:`vim_snippets#Filename()`}
 	{
 		${0}
@@ -571,71 +571,77 @@ snippet CSVIterator
 	
 	} // end class
 
-snippet is
+snippet is "isset()"
 	isset($1{VISUAL})
-
-# phpunit	
-snippet ase
+# phpunit
+snippet ase "$this->assertEquals()"
 	$this->assertEquals(${1:expected}, ${2:actual});
-
-snippet asne
+snippet asne "$this->assertNotEquals()"
 	$this->assertNotEquals(${1:expected}, ${2:actual});
-
-snippet asf
-	$this->assertFalse(${1:Something});
-
-snippet ast
-	$this->assertTrue(${1:Something});
-
-snippet asfex
-	$this->assertFileExists(${1:path/to/file});
-
-snippet asfnex
-	$this->assertFileNotExists(${1:path/to/file});
-
-snippet ascon
-	$this->assertContains(${1:Search Value}, ${2:Array or Iterator});
-
-snippet ashk
-	$this->assertArrayHasKey(${1:key}, ${2:array});
-
-snippet asnhk
-	this->assertArrayNotHasKey(${1:value}, ${2:array});
-
-snippet ascha
-	$this->assertClassHasAttribute('${1:Attribute Name}', '${2:ClassName}');
-
-snippet asi
+snippet asf "$this->assertFalse()"
+	$this->assertFalse(${1});
+snippet ast "$this->assertTrue()"
+	$this->assertTrue(${1});
+snippet asfex "$this->assertFileExists()"
+	$this->assertFileExists(${1:'path/to/file'});
+snippet asfnex "$this->assertFileNotExists()"
+	$this->assertFileNotExists(${1:'path/to/file'});
+snippet ascon "$this->assertContains()"
+	$this->assertContains(${1:$needle}, ${2:$haystack});
+snippet ashk "$this->assertArrayHasKey()"
+	$this->assertArrayHasKey(${1:$key}, ${2:$array});
+snippet asnhk "$this->assertArrayNotHasKey()"
+	this->assertArrayNotHasKey(${1:$key}, ${2:$array});
+snippet ascha "$this->assertClassHasAttribute()"
+	$this->assertClassHasAttribute(${1:$attributeName}, '${2:$className}');
+snippet asi "$this->assertInstanceOf(...)"
 	$this->assertInstanceOf(${1:expected}, ${2:actual});
-
-snippet tc
-	public function test${1:name_of_the_test}()
+snippet test "public function testXYZ() { ... }"
+	public function test${1}()
+	{
+		${0}
+	}
+snippet setup "protected function setUp() { ... }"
+	protected function setUp()
 	{
-		${0:code}
+		${0}
 	}
-snippet te 
+snippet teardown "protected function tearDown() { ... }"
+	protected function tearDown()
+	{
+		${0}
+	}
+snippet exp "phpunit expects"
+	expects($this->${1:once}())
+		->method('${2}')
+		->with($this->equalTo(${3})${4})
+		->will($this->returnValue(${5}));
+snippet testcmt "phpunit comment with group"
+	/**
+	* @group ${1}
+	*/
+snippet fail "$this->fail()"
+	$this->fail(${1});
+snippet marki "$this->markTestIncomplete()"
+	$this->markTestIncomplete(${1});
+snippet marks "$this->markTestSkipped()"
+	$this->markTestSkipped(${1});
+# end of phpunit snippets
+snippet te "throw new Exception()"
 	throw new ${1:Exception}("${2:Error Processing Request}");
-
 snippet fpc "file_put_contents" b
 	file_put_contents(${1:file}, ${2:content}${3:, FILE_APPEND});$0
-
 snippet sr "str_replace"
 	str_replace(${1:search}, ${2:replace}, ${3:subject})$0
-
 snippet ia "in_array"
 	in_array(${1:needle}, ${2:haystack})$0
-
 snippet is "isset"
 	isset(${1:var})$0
-
 snippet isa "isset array"
 	isset($${1:array}[${2:key}])$0
-
 snippet in "is_null"
 	is_null($${1:var})$0
-
 snippet fe "file_exists"
 	file_exists(${1:file})$0
-
 snippet id "is_dir"
 	is_dir(${1:path})$0

From c2cb84db110a3fd073e7c631e266aed0e49ba174 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Fri, 27 May 2016 14:18:12 +0100
Subject: [PATCH 0837/1587] Removed redundant UltiSnips for Twig

---
 UltiSnips/twig.snippets | 53 -----------------------------------------
 snippets/twig.snippets  | 27 +++++++--------------
 2 files changed, 9 insertions(+), 71 deletions(-)
 delete mode 100644 UltiSnips/twig.snippets

diff --git a/UltiSnips/twig.snippets b/UltiSnips/twig.snippets
deleted file mode 100644
index c470d9b9c..000000000
--- a/UltiSnips/twig.snippets
+++ /dev/null
@@ -1,53 +0,0 @@
-priority -50
-
-snippet bl "twig block" b
-{% block ${1} %}
-${2}
-{% endblock $1 %}
-endsnippet
-
-snippet js "twig javascripts" b
-{% javascripts '${1}' %}
-	<script src="{{ asset_url }}"></script>
-{% endjavascripts %}
-endsnippet
-
-snippet css "twig stylesheets" b
-{% stylesheets '${1}' %}
-	<link rel="stylesheet" href="{{ asset_url }}">
-{% endstylesheets %}
-endsnippet
-
-snippet if "twig if" b
-{% if ${1} %}
-${0:${VISUAL}}
-{% endif %}
-endsnippet
-
-snippet ife "twig if ... else" b
-{% if ${1} %}
-${2}
-{% else %}
-${0}
-{% endif %}
-endsnippet
-
-snippet el "twig else"
-{% else %}
-${0:${VISUAL}}
-endsnippet
-
-snippet eif "twig elseif"
-{% elseif ${1} %}
-${0:${VISUAL}}
-endsnippet
-
-snippet for "twig for" b
-{% for ${1} in ${2} %}
-${3}
-{% endfor %}
-endsnippet
-
-snippet ext "twig extends" b
-{% extends ${1} %}
-endsnippet
diff --git a/snippets/twig.snippets b/snippets/twig.snippets
index 50ae82322..47997c3b2 100644
--- a/snippets/twig.snippets
+++ b/snippets/twig.snippets
@@ -1,43 +1,34 @@
-# twig block
-snippet bl
+snippet bl "{% block xyz %} .. {% endblock xyz %}"
 	{% block ${1} %}
 	${2}
 	{% endblock $1 %}
-# twig javascripts
-snippet js
+snippet js "{% javascripts 'xyz' %} .. {% endjavascripts %}"
 	{% javascripts '${1}' %}
 		<script src="{{ asset_url }}"></script>
 	{% endjavascripts %}
-# twig stylesheets
-snippet css
+snippet css "{% stylesheets 'xyz' %} .. {% endstylesheets %}"
 	{% stylesheets '${1}' %}
 		<link rel="stylesheet" href="{{ asset_url }}">
 	{% endstylesheets %}
-# twig if
-snippet if
+snippet if "{% if %} .. {% endif %}"
 	{% if ${1} %}
 	${2}
 	{% endif %}
-# twig if ... else
-snippet ife
+snippet ife "{% if %} .. {% else %} .. {% endif %}"
 	{% if ${1} %}
 	${2}
 	{% else %}
 	${0}
 	{% endif %}
-# twig else
-snippet el
+snippet el "{% else %}"
 	{% else %}
 	${0}
-# twig elseif
-snippet eif
+snippet eif "{% elseif %}"
 	{% elseif ${1} %}
 	${0}
-# twig for
-snippet for
+snippet for "{% for x in y %} .. {% endfor %}"
 	{% for ${1} in ${2} %}
 	${3}
 	{% endfor %}
-# twig extends
-snippet ext
+snippet ext "{% extends xyz %}"
 	{% extends ${1} %}

From 8db9cc10b07eea56b415af7383d97212cf93cccf Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 27 May 2016 22:25:24 +0100
Subject: [PATCH 0838/1587] Elm snippets

---
 snippets/elm.snippets | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 snippets/elm.snippets

diff --git a/snippets/elm.snippets b/snippets/elm.snippets
new file mode 100644
index 000000000..ee9c66b20
--- /dev/null
+++ b/snippets/elm.snippets
@@ -0,0 +1,16 @@
+snippet mod
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` exposing (${1})
+	${0}
+snippet imp
+	import ${0:List}
+snippet impe
+	import ${1:List} exposing (${0:map})
+snippet fn
+	${1:fn} :: ${2:a} -> ${3:a}
+	$1 ${4} = ${0}
+snippet fn2
+	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a}
+	$1 ${5} = ${0}
+snippet fn3
+	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
+	$1 ${6} = ${0}

From 40d6b45a71d5194796abe26ac57c2f8f9b3c94aa Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 27 May 2016 22:43:08 +0100
Subject: [PATCH 0839/1587] Elm case snippets

---
 snippets/elm.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index ee9c66b20..ae2c72bb3 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -14,3 +14,10 @@ snippet fn2
 snippet fn3
 	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
 	$1 ${6} = ${0}
+snippet case
+	case ${1} of
+		${2} ->
+			${0}
+snippet -
+	${1} ->
+		${0}

From 317155e9eb71d5d836f1f8f284b615a3afff5a20 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 28 May 2016 01:42:42 +0100
Subject: [PATCH 0840/1587] Elm if and let snippets

---
 snippets/elm.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index ae2c72bb3..ca6266c9b 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -21,3 +21,13 @@ snippet case
 snippet -
 	${1} ->
 		${0}
+snippet let
+	let
+		${1} = ${2}
+	in
+		${0}
+snippet if
+	if ${1} then
+		${2}
+	else
+		${0}

From f79462e9ec1f0f6dcabe1d6df81e1dd0c69bb5a8 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Sun, 29 May 2016 12:51:19 +0100
Subject: [PATCH 0841/1587] Consolidated PHP snippets and removed UltiSnips
 duplicates

---
 UltiSnips/php.snippets | 138 -----------------------------------------
 snippets/php.snippets  | 103 +++++++++++++++++-------------
 2 files changed, 59 insertions(+), 182 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index f2e7b64b3..74b51cc00 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -3,114 +3,6 @@ priority -50
 ## Snippets from SnipMate, taken from
 ## https://github.com/scrooloose/snipmate-snippets.git
 
-snippet array "array"
-$${1:arrayName} = array('${2}' => ${3});${4}
-endsnippet
-
-snippet def "def"
-define('${1:VARIABLE_NAME}', ${2:'definition'});${3}
-endsnippet
-
-snippet wh "while"
-while (${1}) {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet do "do"
-do {
-	${2:// code... }
-} while (${1:/* condition */});
-endsnippet
-
-snippet doc_f "doc_f"
-/**
- * $2
- * @return ${4:void}
- * @author ${5:`!v g:snips_author`}
- **/
-${1:public }function ${2:someFunc}(${3})
-{${6}
-}
-endsnippet
-
-snippet doc_i "doc_i"
-/**
- * $1
- * @package ${2:default}
- * @author ${3:`!v g:snips_author`}
- **/
-interface ${1:someClass}
-{${4}
-} // END interface $1"
-endsnippet
-
-snippet el "else"
-else {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet for "for"
-for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-	${4:// code...}
-}
-endsnippet
-
-snippet foreachk "foreachk"
-foreach ($${1:variable} as $${2:key} => $${3:value}) {
-	${4:// code...}
-}
-endsnippet
-
-snippet get "get"
-$_GET['${1}']${2}
-endsnippet
-
-snippet if "if"
-if (${1}) {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet eif "elseif"
-elseif (${1}) {
-	${0:${VISUAL}}
-}
-endsnippet
-
-snippet inc "inc"
-include '${1:file}';${2}
-endsnippet
-
-snippet log "log"
-error_log(var_export(${1}, true));${2}
-endsnippet
-
-snippet post "post"
-$_POST['${1}']${2}
-endsnippet
-
-snippet req "req1"
-require_once '${1:file}';${2}
-endsnippet
-
-snippet req1 "req1"
-require_once '${1:file}';${2}
-endsnippet
-
-snippet session "session"
-$_SESSION['${1}']${2}
-endsnippet
-
-snippet t "t"
-$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};${5}
-endsnippet
-
-snippet var "var"
-var_export(${1});${2}
-endsnippet
-
 snippet getter "PHP Class Getter" b
 /**
  * Getter for $1
@@ -251,27 +143,11 @@ function ${1:name}(${2:$param})
 $0
 endsnippet
 
-snippet fore "Foreach loop"
-foreach ($${1:variable} as $${3:value}) {
-	${VISUAL}${4}
-}
-$0
-endsnippet
-
 snippet new "New class instance" b
 $${1:variableName} = new ${2:${1/\w+\s*/\u$0/}}($3);
 $0
 endsnippet
 
-snippet ife "if else"
-if (${1:/* condition */}) {
-	${2:// code...}
-} else {
-	${3:// code...}
-}
-$0
-endsnippet
-
 snippet ns "namespace declaration" b
 namespace ${1:`!p
 relpath = os.path.relpath(path)
@@ -349,20 +225,6 @@ public function __construct(${1:$dependencies})
 $0
 endsnippet
 
-snippet ve "Dumb debug helper in HTML"
-    echo '<pre>' . var_export($1, 1) . '</pre>';$0
-endsnippet
-
-snippet pc "Dumb debug helper in cli"
-var_export($1);$0
-endsnippet
-
-snippet inheritdoc "@inheritdoc docblock"
-/**
- * {@inheritdoc}
- */
-endsnippet
-
 # PHPUnit snippets
 snippet testcase "class XYZTest extends \PHPUnit_Framework_TestCase { ... }"
 <?php
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 8939d6e3e..d382a8b1c 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -24,9 +24,6 @@ snippet ?i
 snippet ns
 	namespace ${1:Foo\Bar\Baz};
 	${0}
-snippet use
-	use ${1:Foo\Bar\Baz};
-	${0}
 snippet c
 	class ${1:`vim_snippets#Filename()`}
 	{
@@ -81,13 +78,14 @@ snippet $s
 #getter
 snippet $g
 	${1:$foo}->get${0:Bar}();
-
 # Tertiary conditional
 snippet =?:
 	$${1:foo} = ${2:true} ? ${3:a} : ${0};
 snippet ?:
 	${1:true} ? ${2:a} : ${0}
-
+snippet t "$retVal = (condition) ? a : b"
+	$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};
+# Predefined variables
 snippet C
 	$_COOKIE['${1:variable}']
 snippet E
@@ -104,7 +102,12 @@ snippet S
 	$_SERVER['${1:variable}']
 snippet SS
 	$_SESSION['${1:variable}']
-
+snippet get "get"
+	$_GET['${1}']
+snippet post "post"
+	$_POST['${1}']
+snippet session "session"
+	$_SESSION['${1}']
 # the following are old ones
 snippet inc
 	include '${1:file}';
@@ -205,7 +208,19 @@ snippet doc_h
 	 * @copyright ${4:$2}, `strftime('%d %B, %Y')`
 	 * @package ${0:default}
 	 */
-
+snippet doc_i "interface someClass {}"
+	/**
+	 * $1
+	 * @package ${2:default}
+	 * @author ${3:`!v g:snips_author`}
+	 **/
+	interface ${1:someClass}
+	{${4}
+	}
+snippet inheritdoc "@inheritdoc docblock"
+	/**
+	 * {@inheritdoc}
+	 */
 # Interface
 snippet interface
 	/**
@@ -254,55 +269,54 @@ snippet nc
 		${0}
 	}
 # define(...)
-snippet def
-	define('${1}'${2});
+snippet def "define('VARIABLE_NAME', 'definition')"
+	define('${1:VARIABLE_NAME}', ${2:'definition'});
 # defined(...)
 snippet def?
 	${1}defined('${2}')
-snippet wh
+snippet wh "while (condition) { ... }"
 	while (${1:/* condition */}) {
 		${0}
 	}
-# do ... while
-snippet do
+snippet do "do { ... } while (condition)"
 	do {
 		${0}
-	} while (${1:/* condition */});
-snippet if
-	if (${1:/* condition */}) {
+	} while (${1});
+snippet if "if (condition) { ... }"
+	if (${1}) {
 		${0}
 	}
-snippet ifn
-	if (!${1:/* condition */}) {
+snippet ifn "if (!condition) { ... }"
+	if (!${1}) {
 		${2}
 	}
-snippet ifil
-	<?php if (${1:/* condition */}): ?>
+snippet ifil "<?php if (condition): ?> ... <?php endif; ?>"
+	<?php if (${1}): ?>
 		${0}
 	<?php endif; ?>
-snippet ife
-	if (${1:/* condition */}) {
+snippet ife "if (cond) { ... } else { ... }"
+	if (${1}) {
 		${2}
 	} else {
 		${3}
 	}
 	${0}
-snippet ifeil
-	<?php if (${1:/* condition */}): ?>
-		${2:<!-- html... -->}
+snippet ifeil "<?php if (condition): ?> ... <?php else: ?> ... <?php endif; ?>"
+	<?php if (${1}): ?>
+		${2}
 	<?php else: ?>
-		${3:<!-- html... -->}
+		${3}
 	<?php endif; ?>
 	${0}
-snippet el
+snippet el "else { ... }"
 	else {
 		${0}
 	}
-snippet eif
+snippet eif "elseif(condition) { ... }"
 	elseif (${1}) {
 		${0}
 	}
-snippet switch
+snippet switch "switch($var) { case 'xyz': ... default: .... }"
 	switch ($${1:variable}) {
 		case '${2:value}':
 			${3}
@@ -312,34 +326,33 @@ snippet switch
 			${4}
 			break;
 	}
-snippet case
+snippet case "case 'value': ... break"
 	case '${1:value}':
 		${2}
 		break;
-snippet for
+snippet for "for ($i = 0; $i < $count; $i++) { ... }"
 	for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
 		${0}
 	}
-snippet foreach
+snippet foreach "foreach ($var as $value) { .. }"
 	foreach ($${1:variable} as $${2:value}) {
 		${0}
 	}
-snippet foreachil
+snippet foreachil "<?php foreach ($var as $value): ?>  ... <?php endforeach; ?>"
 	<?php foreach ($${1:variable} as $${2:value}): ?>
-		${0:<!-- html... -->}
+		${0}
 	<?php endforeach; ?>
-snippet foreachk
+snippet foreachk "foreach ($var as $key => $value) { .. }"
 	foreach ($${1:variable} as $${2:key} => $${3:value}) {
 		${0}
 	}
-snippet foreachkil
+snippet foreachkil "<?php foreach ($var as $key => $value): ?>  ... <?php endforeach; ?>"
 	<?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
 		${0:<!-- html... -->}
 	<?php endforeach; ?>
-# $... = array (...)
-snippet array b
+snippet array "$... = array(...)"
 	$${1:arrayName} = array('${2}' => ${3});
-snippet try
+snippet try "try { ... } catch (Exception $e) { ... }"
 	try {
 		${0}
 	} catch (${1:Exception} $e) {
@@ -369,6 +382,14 @@ snippet http_redirect
 	header ("HTTP/1.1 301 Moved Permanently");
 	header ("Location: ".URL);
 	exit();
+snippet log "error_log(var_export($var, true));"
+	error_log(var_export(${1}, true));
+snippet var "var_export($var)"
+	var_export(${1});
+snippet ve "Dumb debug helper in HTML"
+	echo '<pre>' . var_export(${1}, 1) . '</pre>';
+snippet pc "Dumb debug helper in cli"
+	var_export($1);$0
 # Getters & Setters
 snippet gs
 	/**
@@ -425,14 +446,12 @@ snippet aw
 	array_walk($${1:foo}, function(&$${2:v}, $${3:k}) {
 		$$2 = ${0};
 	});
-
 # static var assign once
 snippet static_var
 	static $${1} = null;
 	if (is_null($$1)){
 		$$1 = ${2};
 	}
-
 snippet CSVWriter
 	<?php
 	
@@ -467,7 +486,6 @@ snippet CSVWriter
 		}
 	
 	}
-
 snippet CSVIterator
 	
 	// http://snipplr.com/view.php?codeview&id=1986 // modified
@@ -570,9 +588,6 @@ snippet CSVIterator
 		}
 	
 	} // end class
-
-snippet is "isset()"
-	isset($1{VISUAL})
 # phpunit
 snippet ase "$this->assertEquals()"
 	$this->assertEquals(${1:expected}, ${2:actual});

From 2d4032cc28b331a7a5373662a7f88c0da7c70cf1 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 29 May 2016 20:51:58 +0100
Subject: [PATCH 0842/1587] Elixir behaviour snippet

---
 snippets/elixir.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index ef971de98..851dc8be3 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -131,3 +131,6 @@ snippet qu
 	quote do
 		${1}
 	end
+snippet beh
+	@behaviour ${1:Mix.Task}
+	${0}

From f1ca95f112a3b2aa542fa6de8d5cd9b6be4963b3 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 1 Jun 2016 20:56:21 +0100
Subject: [PATCH 0843/1587] Correct Elm fn type syntax

---
 snippets/elm.snippets | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index ca6266c9b..6055a8f44 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -6,14 +6,25 @@ snippet imp
 snippet impe
 	import ${1:List} exposing (${0:map})
 snippet fn
-	${1:fn} :: ${2:a} -> ${3:a}
-	$1 ${4} = ${0}
+	${1:fn} : ${2:a} -> ${3:a}
+	$1 ${4} =
+		${0}
+snippet fn1
+	${1:fn} : ${2:a} -> ${3:a}
+	$1 ${4} =
+		${0}
 snippet fn2
-	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a}
-	$1 ${5} = ${0}
+	${1:fn} : ${2:a} -> ${3:a} -> ${4:a}
+	$1 ${5} =
+		${0}
 snippet fn3
-	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
-	$1 ${6} = ${0}
+	${1:fn} : ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
+	$1 ${6} =
+		${0}
+snippet fn0
+	${1:fn} : ${2:a}
+	$1 =
+		${0}
 snippet case
 	case ${1} of
 		${2} ->

From 641ccbefc5c9c3792fa317d656647872dfdebe8f Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 1 Jun 2016 21:11:40 +0100
Subject: [PATCH 0844/1587] Elm type snippets

---
 snippets/elm.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index 6055a8f44..6a15c83a4 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -42,3 +42,9 @@ snippet if
 		${2}
 	else
 		${0}
+snippet ty
+	type ${1:Msg}
+		= ${0}
+snippet tya
+	type alias ${1:Model} =
+		${0}

From ad04e1d415959427798ff513c4347c6953b02d68 Mon Sep 17 00:00:00 2001
From: Wildsky Fann <poppin.wildsky+gh@gmail.com>
Date: Mon, 6 Jun 2016 23:54:38 +0800
Subject: [PATCH 0845/1587] Create sass.snippets

This file is from scss.snippets without parentheses
---
 snippets/sass.snippets | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 snippets/sass.snippets

diff --git a/snippets/sass.snippets b/snippets/sass.snippets
new file mode 100644
index 000000000..7207360cd
--- /dev/null
+++ b/snippets/sass.snippets
@@ -0,0 +1,36 @@
+extends css
+
+snippet $
+	$${1:variable}: ${0:value}
+snippet imp
+	@import '${0}'
+snippet mix
+	@mixin ${1:name}(${2})
+		${0}
+snippet inc
+	@include ${1:mixin}(${2})
+snippet ext
+	@extend ${0}
+snippet fun
+	@function ${1:name}(${2:args})
+		${0}
+snippet if
+	@if ${1:condition}
+		${0}
+snippet ife
+	@if ${1:condition}
+		${2}
+	@else
+		${0}
+snippet eif
+	@else if ${1:condition}
+		${0}
+snippet for
+	@for ${1:$i} from ${2:1} through ${3:3}
+		${0}
+snippet each
+	@each ${1:$item} in ${2:items}
+		${0}
+snippet while
+	@while ${1:$i} ${2:>} ${3:0}
+		${0}

From 5225b549487bf97eb5aa6c5cae91379a1ad9b7ba Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 8 Jun 2016 20:22:16 +0100
Subject: [PATCH 0846/1587] JS Mocha snippets

---
 snippets/javascript-mocha.snippets | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 snippets/javascript-mocha.snippets

diff --git a/snippets/javascript-mocha.snippets b/snippets/javascript-mocha.snippets
new file mode 100644
index 000000000..f08bf8490
--- /dev/null
+++ b/snippets/javascript-mocha.snippets
@@ -0,0 +1,14 @@
+snippet des "Describe" b
+	describe('${1:}', () => {
+		${0}
+	});
+snippet it "it" b
+	it('${1:}', () => {
+		${0}
+	});
+snippet exp "expect" b
+	expect(${1:})${0};
+snippet expe "expect" b
+	expect(${1:}).to.equal(${0});
+snippet expd "expect" b
+	expect(${1:}).to.deep.equal(${0});

From a65f3096b5fa46959a10d263614db2725aa278a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
Date: Thu, 9 Jun 2016 11:02:09 +0200
Subject: [PATCH 0847/1587] Add snippet generating ISO-formatted date

I am a big fan of the ISO date+time format, because it is our only hope
to overcome endless mess which are current zillion non-sensical national
formats.
---
 snippets/_.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index d7f51bea8..0153a1467 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -7,6 +7,8 @@ snippet date
 	`strftime("%Y-%m-%d")`
 snippet ddate
 	`strftime("%B %d, %Y")`
+snippet diso
+	`strftime("%Y-%m-%dT%H:%M:%S")`
 snippet time
 	`strftime("%H:%M")`
 snippet datetime

From 09068dc107b7aea12c9f1b982630bcccd31c4c67 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Thu, 16 Jun 2016 19:27:02 +0100
Subject: [PATCH 0848/1587] Fixed PHP snippets for sbscalar and snbscalar,
 refactored gs

---
 UltiSnips/php-phpspec.snippets | 8 ++++----
 snippets/php.snippets          | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/UltiSnips/php-phpspec.snippets b/UltiSnips/php-phpspec.snippets
index 297b73d86..08d84a053 100644
--- a/UltiSnips/php-phpspec.snippets
+++ b/UltiSnips/php-phpspec.snippets
@@ -23,7 +23,7 @@ class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
 ` extends ObjectBehavior
 {
-	function it${1}()
+	function it_${1}()
 	{
 		$0
 	}
@@ -31,7 +31,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet it "function it_does_something() { ... }"
-function it${1}()
+function it_${1}()
 {
 	${0:${VISUAL}}
 }
@@ -163,11 +163,11 @@ endsnippet
 
 # Scalar type matchers
 snippet sbscalar "$this->XYZ()->shouldBeString|Array|Bool()"
-$this->${1:method}()->shouldBe(${2:'String|Array|Bool'});
+$this->${1:method}()->shouldBe${2:String|Array|Bool}();
 endsnippet
 
 snippet snbscalar "$this->XYZ()->shouldNotBeString|Array|Bool()"
-$this->${1:method}()->shouldNotBe(${2:'String|Array|Bool'});
+$this->${1:method}()->shouldNotBe${2:String|Array|Bool}();
 endsnippet
 
 # Contain matcher
diff --git a/snippets/php.snippets b/snippets/php.snippets
index d382a8b1c..826b845ae 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -391,13 +391,13 @@ snippet ve "Dumb debug helper in HTML"
 snippet pc "Dumb debug helper in cli"
 	var_export($1);$0
 # Getters & Setters
-snippet gs
+snippet gs "PHP Class Getter Setter"
 	/**
 	 * Gets the value of ${1:foo}
 	 *
-	 * @return ${2:$1}
+	 * @return ${2:string}
 	 */
-	public function get${3:$2}()
+	public function get${3:$1}()
 	{
 		return $this->${4:$1};
 	}

From e016f1f78f026064f3fc7d572e1128a9bda921b5 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Fri, 17 Jun 2016 14:47:00 +0100
Subject: [PATCH 0849/1587] Refactored PHP getter and setter snippets to have
 consistent triggers

---
 UltiSnips/php.snippets | 22 ++++++++++------------
 snippets/php.snippets  | 15 +++++++--------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 74b51cc00..7ba51c75f 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -3,7 +3,7 @@ priority -50
 ## Snippets from SnipMate, taken from
 ## https://github.com/scrooloose/snipmate-snippets.git
 
-snippet getter "PHP Class Getter" b
+snippet gm "PHP Class Getter" b
 /**
  * Getter for $1
  *
@@ -11,11 +11,11 @@ snippet getter "PHP Class Getter" b
  */
 public function get${1/\w+\s*/\u$0/}()
 {
-    return $this->$1;$3
+    return $this->$1;
 }
 endsnippet
 
-snippet setter "PHP Class Setter" b
+snippet sm "PHP Class Setter" b
 /**
  * Setter for $1
  *
@@ -24,11 +24,10 @@ snippet setter "PHP Class Setter" b
  */
 public function set${1/\w+\s*/\u$0/}(${4:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
 {
-    $this->$1 = $$1;$5
+    $this->$1 = $$1;
 
-    ${6:return $this;}
+    ${5:return $this;}
 }
-$0
 endsnippet
 
 snippet gs "PHP Class Getter Setter" b
@@ -39,22 +38,21 @@ snippet gs "PHP Class Getter Setter" b
  */
 public function get${1/\w+\s*/\u$0/}()
 {
-    return $this->$1;$3
+    return $this->$1;
 }
 
 /**
  * Setter for $1
  *
  * @param $2 $$1
- * @return ${4:`!p snip.rv=snip.basename`}
+ * @return ${3:`!p snip.rv=snip.basename`}
  */
-public function set${1/\w+\s*/\u$0/}(${5:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
+public function set${1/\w+\s*/\u$0/}(${4:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
 {
-    $this->$1 = $$1;$6
+    $this->$1 = $$1;
 
-    ${7:return $this;}
+    ${5:return $this;}
 }
-$0
 endsnippet
 
 snippet pub "Public function" b
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 826b845ae..4faa16731 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -47,28 +47,27 @@ snippet m
 	{
 		${0}
 	}
-# setter method
-snippet sm
+snippet sm "PHP Class Setter"
 	/**
 	 * Sets the value of ${1:foo}
 	 *
-	 * @param ${2:$1} $$1 ${3:description}
+	 * @param ${2:string} $$1 ${3:description}
 	 *
 	 * @return ${4:`vim_snippets#Filename()`}
 	 */
-	${5:public} function set${6:$2}(${7:$2 }$$1)
+	${5:public} function set${6:$1}(${7:$2 }$$1)
 	{
 		$this->${8:$1} = $$1;
+
 		return $this;
 	}
-# getter method
-snippet gm
+snippet gm "PHP Class Getter Setter"
 	/**
 	 * Gets the value of ${1:foo}
 	 *
-	 * @return ${2:$1}
+	 * @return ${2:string}
 	 */
-	${3:public} function get${4:$2}()
+	${3:public} function get${4:$1}()
 	{
 		return $this->${5:$1};
 	}

From 7d4913e0c11138499d71e04fc38200f46f2b0dfa Mon Sep 17 00:00:00 2001
From: Josh Vandergrift <joshmattvander@gmail.com>
Date: Sat, 18 Jun 2016 11:04:59 -0700
Subject: [PATCH 0850/1587] Add support for HTML snippets in *.html.eex files

---
 snippets/eelixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index bb6c5d4a9..3d6e33d43 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -1,3 +1,5 @@
+extends html
+
 snippet %
 	<% ${0} %>
 snippet =

From d879609014ba7f3036f95472d3f884d89bbc1a42 Mon Sep 17 00:00:00 2001
From: Mathieu Comandon <strycore@gmail.com>
Date: Tue, 21 Jun 2016 17:36:46 -0700
Subject: [PATCH 0851/1587] Fix csrf snippet name in htmldjango

---
 UltiSnips/htmldjango.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/htmldjango.snippets b/UltiSnips/htmldjango.snippets
index ad5715049..37fa85fd0 100644
--- a/UltiSnips/htmldjango.snippets
+++ b/UltiSnips/htmldjango.snippets
@@ -186,7 +186,7 @@ snippet iblock "" bi
 {% block ${1:blockname} %}${VISUAL}{% endblock $1 %}
 endsnippet
 
-snippet csfr "" bi
+snippet csrf "" bi
 {% csrf_token %}
 endsnippet
 

From ece5fc1593d5374b5c08be68df380607d7ccdabc Mon Sep 17 00:00:00 2001
From: Gustavo Ferreira <gustavojcoferreira@gmail.com>
Date: Wed, 22 Jun 2016 03:00:57 +0100
Subject: [PATCH 0852/1587] Added new snippets to json file.

---
 UltiSnips/json.snippets | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/json.snippets b/UltiSnips/json.snippets
index b0cad8303..75edef9d1 100644
--- a/UltiSnips/json.snippets
+++ b/UltiSnips/json.snippets
@@ -4,7 +4,7 @@ snippet s "String" b
 "${1:key}": "${0:value}",
 endsnippet
 
-snippet n "number" b
+snippet n "Number" b
 "${1:key}": ${0:value},
 endsnippet
 
@@ -13,8 +13,39 @@ snippet a "Array" b
 	${VISUAL}$0
 ],
 endsnippet
+
+snippet na "Named array" b
+"${1:key}": [
+	${VISUAL}$0
+],
+endsnippet
+
 snippet o "Object" b
 {
 	${VISUAL}$0
 },
 endsnippet
+
+snippet no "Named object" b
+"${1:key}": {
+	${VISUAL}$0
+},
+endsnippet
+
+snippet null "Null" b
+"${0:key}": null,
+endsnippet
+
+
+global !p
+def compB(t, opts):
+	if t:
+		opts = [m[len(t):] for m in opts if m.startswith(t)]
+	if len(opts) == 1:
+		return opts[0]
+	return "(" + '|'.join(opts) + ')'
+endglobal
+
+snippet b "Bool" b
+"${1:key}": $2`!p snip.rv=compB(t[2], ['true', 'false'])`,
+endsnippet

From fff3ae40617b7b91a3a3f2b7b786175755fa4589 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Wed, 22 Jun 2016 10:30:27 +0100
Subject: [PATCH 0853/1587] Strict typed snippets for PHP getters that check
 declare(strict_types=1) or for g:ultisnips_php_scalar_types=1

---
 UltiSnips/php.snippets | 13 +++++++++++--
 snippets/php.snippets  |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 7ba51c75f..c7344a592 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -1,5 +1,14 @@
 priority -50
 
+global !p
+import vim
+
+# Set g:ultisnips_php_scalar_types to 1 if you'd like to enable PHP 7's scalar types for return values
+def isPHPScalarTypesEnabled():
+	isEnabled = vim.eval("get(g:, 'ultisnips_php_scalar_types', 0)") == "1"
+	return isEnabled or re.match('<\?php\s+declare\(strict_types=[01]\);', '\n'.join(vim.current.window.buffer))
+endglobal
+
 ## Snippets from SnipMate, taken from
 ## https://github.com/scrooloose/snipmate-snippets.git
 
@@ -9,7 +18,7 @@ snippet gm "PHP Class Getter" b
  *
  * @return ${2:string}
  */
-public function get${1/\w+\s*/\u$0/}()
+public function get${1/\w+\s*/\u$0/}()`!p snip.rv = ': '+t[2] if isPHPScalarTypesEnabled() else ''`
 {
     return $this->$1;
 }
@@ -36,7 +45,7 @@ snippet gs "PHP Class Getter Setter" b
  *
  * @return ${2:string}
  */
-public function get${1/\w+\s*/\u$0/}()
+public function get${1/\w+\s*/\u$0/}()`!p snip.rv = ': '+t[2] if isPHPScalarTypesEnabled() else ''`
 {
     return $this->$1;
 }
diff --git a/snippets/php.snippets b/snippets/php.snippets
index 4faa16731..064485905 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -2,6 +2,8 @@ snippet <?
 	<?php
 
 	${0}
+snippet dst "declare(strict_types=1)"
+	declare(strict_types=${1:1});
 snippet ec
 	echo ${0};
 snippet <?e

From d26a13e8ed96e06a38569295946ef918af8c7fb7 Mon Sep 17 00:00:00 2001
From: Austin Wood <i@austinwood.me>
Date: Fri, 1 Jul 2016 23:05:18 -0700
Subject: [PATCH 0854/1587] Add self-closing tags to void elements

---
 snippets/html.snippets | 132 ++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 67 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index f41f983ed..5ae8e749d 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -159,18 +159,18 @@ snippet address
 		${0}
 	</address>
 snippet area
-	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}">
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}" />
 snippet area+
-	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}">
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}" />
 	area+
 snippet area:c
-	<area shape="circle" coords="${1}" href="${2}" alt="${0}">
+	<area shape="circle" coords="${1}" href="${2}" alt="${0}" />
 snippet area:d
-	<area shape="default" coords="${1}" href="${2}" alt="${0}">
+	<area shape="default" coords="${1}" href="${2}" alt="${0}" />
 snippet area:p
-	<area shape="poly" coords="${1}" href="${2}" alt="${0}">
+	<area shape="poly" coords="${1}" href="${2}" alt="${0}" />
 snippet area:r
-	<area shape="rect" coords="${1}" href="${2}" alt="${0}">
+	<area shape="rect" coords="${1}" href="${2}" alt="${0}" />
 snippet article
 	<article>
 		${0}
@@ -200,7 +200,7 @@ snippet audio
 snippet b
 	<b>${0}</b>
 snippet base
-	<base href="${1}" target="${0}">
+	<base href="${1}" target="${0}" />
 snippet bdi
 	<bdi>${0}</bdo>
 snippet bdo
@@ -218,7 +218,7 @@ snippet body
 		${0}
 	</body>
 snippet br
-	<br>
+	<br />
 snippet button
 	<button type="${1:submit}">${0}</button>
 snippet button.
@@ -240,9 +240,9 @@ snippet cite
 snippet code
 	<code>${0}</code>
 snippet col
-	<col>
+	<col />
 snippet col+
-	<col>
+	<col />
 	col+
 snippet colgroup
 	<colgroup>
@@ -330,7 +330,7 @@ snippet dt+
 snippet em
 	<em>${0}</em>
 snippet embed
-	<embed src="${1}" type="${0}">
+	<embed src="${1}" type="${0}" />
 snippet fieldset
 	<fieldset>
 		${0}
@@ -423,7 +423,7 @@ snippet h6#
 	<h6 id="${1}">${0}</h6>
 snippet head
 	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8">
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
 		<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 		${0}
@@ -449,7 +449,7 @@ snippet hgroup.
 		${0}
 	</hgroup>
 snippet hr
-	<hr>
+	<hr />
 snippet html
 	<html>
 	${0}
@@ -462,8 +462,8 @@ snippet html5
 	<!DOCTYPE html>
 	<html>
 		<head>
-			<meta charset="utf-8">
-			<meta name="viewport" content="width=device-width">
+			<meta charset="utf-8" />
+			<meta name="viewport" content="width=device-width" />
 			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${2:link}
 		</head>
@@ -475,8 +475,8 @@ snippet html5l
 	<!DOCTYPE html>
 	<html lang="${1:es}">
 		<head>
-			<meta charset="utf-8">
-			<meta name="viewport" content="width=device-width">
+			<meta charset="utf-8" />
+			<meta name="viewport" content="width=device-width" />
 			<title>${2:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${3:link}
 		</head>
@@ -493,65 +493,63 @@ snippet iframe.
 snippet iframe#
 	<iframe id="${1}" src="${2}" frameborder="0"></iframe>
 snippet img
-	<img src="${1}" alt="${2}">
+	<img src="${1}" alt="${2}" />
 snippet img.
-	<img class="${1}" src="${2}" alt="${3}">
+	<img class="${1}" src="${2}" alt="${3}" />
 snippet img#
-	<img id="${1}" src="${2}" alt="${3}">
+	<img id="${1}" src="${2}" alt="${3}" />
 snippet input
-	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}">
+	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}" />
 snippet input.
-	<input class="${1}" type="${2:text/submit/hidden/button/image}" name="${3}" id="${4:$3}" value="${5}">
+	<input class="${1}" type="${2:text/submit/hidden/button/image}" name="${3}" id="${4:$3}" value="${5}" />
 snippet input:text
-	<input type="text" name="${1}" id="${2:$1}" value="${3}">
+	<input type="text" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:submit
-	<input type="submit" name="${1}" id="${2:$1}" value="${3}">
+	<input type="submit" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:hidden
-	<input type="hidden" name="${1}" id="${2:$1}" value="${3}">
+	<input type="hidden" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:button
-	<input type="button" name="${1}" id="${2:$1}" value="${3}">
+	<input type="button" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:image
-	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}">
+	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}" />
 snippet input:checkbox
-	<input type="checkbox" name="${1}" id="${2:$1}">
+	<input type="checkbox" name="${1}" id="${2:$1}" />
 snippet input:radio
-	<input type="radio" name="${1}" id="${2:$1}">
+	<input type="radio" name="${1}" id="${2:$1}" />
 snippet input:color
-	<input type="color" name="${1}" id="${2:$1}" value="${3}">
+	<input type="color" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:date
-	<input type="date" name="${1}" id="${2:$1}" value="${3}">
+	<input type="date" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:datetime
-	<input type="datetime" name="${1}" id="${2:$1}" value="${3}">
+	<input type="datetime" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:datetime-local
-	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}">
+	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:email
-	<input type="email" name="${1}" id="${2:$1}" value="${3}">
+	<input type="email" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:file
-	<input type="file" name="${1}" id="${2:$1}" value="${3}">
+	<input type="file" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:month
-	<input type="month" name="${1}" id="${2:$1}" value="${3}">
+	<input type="month" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:number
-	<input type="number" name="${1}" id="${2:$1}" value="${3}">
+	<input type="number" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:password
-	<input type="password" name="${1}" id="${2:$1}" value="${3}">
+	<input type="password" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:range
-	<input type="range" name="${1}" id="${2:$1}" value="${3}">
+	<input type="range" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:reset
-	<input type="reset" name="${1}" id="${2:$1}" value="${3}">
+	<input type="reset" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:search
-	<input type="search" name="${1}" id="${2:$1}" value="${3}">
+	<input type="search" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:time
-	<input type="time" name="${1}" id="${2:$1}" value="${3}">
+	<input type="time" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:url
-	<input type="url" name="${1}" id="${2:$1}" value="${3}">
+	<input type="url" name="${1}" id="${2:$1}" value="${3}" />
 snippet input:week
-	<input type="week" name="${1}" id="${2:$1}" value="${3}">
+	<input type="week" name="${1}" id="${2:$1}" value="${3}" />
 snippet ins
 	<ins>${0}</ins>
 snippet kbd
 	<kbd>${0}</kbd>
-snippet keygen
-	<keygen>${0}</keygen>
 snippet label
 	<label for="${0:$1}">${1}</label>
 snippet label:i
@@ -579,19 +577,19 @@ snippet lia+
 	<li><a href="${2:#}">${1}</a></li>
 	lia+
 snippet link
-	<link rel="${1}" href="${2}" title="${3}" type="${4}">
+	<link rel="${1}" href="${2}" title="${3}" type="${4}" />
 snippet link:atom
-	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml">
+	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml" />
 snippet link:s
-	<link rel="stylesheet" href="${1:style.css}">
+	<link rel="stylesheet" href="${1:style.css}" />
 snippet link:css
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />
 snippet link:favicon
-	<link rel="shortcut icon" href="${1:favicon.ico}" type="image/x-icon">
+	<link rel="shortcut icon" href="${1:favicon.ico}" type="image/x-icon" />
 snippet link:rss
-	<link rel="alternate" href="${1:rss.xml}" title="RSS" type="application/atom+xml">
+	<link rel="alternate" href="${1:rss.xml}" title="RSS" type="application/atom+xml" />
 snippet link:touch
-	<link rel="apple-touch-icon" href="${1:favicon.png}">
+	<link rel="apple-touch-icon" href="${1:favicon.png}" />
 snippet main
 	<main role="main">
 		${0}
@@ -610,7 +608,7 @@ snippet map#
 	</map>
 snippet map+
 	<map name="${1}">
-		<area shape="${2}" coords="${3}" href="${4}" alt="${5}">${6}
+		<area shape="${2}" coords="${3}" href="${4}" alt="${5}" />${6}
 	</map>
 snippet mark
 	<mark>${0}</mark>
@@ -627,17 +625,17 @@ snippet menu:t
 		${0}
 	</menu>
 snippet meta
-	<meta http-equiv="${1}" content="${2}">
+	<meta http-equiv="${1}" content="${2}" />
 snippet meta:s
-	<meta ${0}>
+	<meta ${0} />
 snippet meta:d
-	<meta name="description" content="${0}">
+	<meta name="description" content="${0}" />
 snippet meta:compat
-	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}">
+	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}" />
 snippet meta:refresh
-	<meta http-equiv="refresh" content="text/html;charset=UTF-8">
+	<meta http-equiv="refresh" content="text/html;charset=UTF-8" />
 snippet meta:utf
-	<meta http-equiv="content-type" content="text/html;charset=UTF-8">
+	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
 snippet meter
 	<meter>${0}</meter>
 snippet nav
@@ -665,13 +663,13 @@ snippet movie
 	<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
 	codebase="http://www.apple.com/qtactivex/qtplugin.cab">
 		<param name="src" value="$1" />
-		<param name="controller" value="$4">
-		<param name="autoplay" value="$5">
+		<param name="controller" value="$4" />
+		<param name="autoplay" value="$5" />
 		<embed src="${1:movie.mov}"
 			width="${2:320}" height="${3:240}"
 			controller="${4:true}" autoplay="${5:true}"
 			scale="tofit" cache="true"
-			pluginspage="http://www.apple.com/quicktime/download/">
+			pluginspage="http://www.apple.com/quicktime/download/" />
 	</object>
 snippet ol
 	<ol>
@@ -711,7 +709,7 @@ snippet p.
 snippet p#
 	<p id="${1}">${0}</p>
 snippet param
-	<param name="${1}" value="${2}">
+	<param name="${1}" value="${2}" />
 snippet pre
 	<pre>
 		${0}
@@ -774,7 +772,7 @@ snippet select+
 snippet small
 	<small>${0}</small>
 snippet source
-	<source src="${1}" type="${2}" media="${0}">
+	<source src="${1}" type="${2}" media="${0}" />
 snippet span
 	<span>${0}</span>
 snippet span.
@@ -853,7 +851,7 @@ snippet tr+
 		td+${0}
 	</tr>
 snippet track
-	<track src="${1}" srclang="${2}" label="${3}" default="${4:default}>${5}</track>
+	<track src="${1}" srclang="${2}" label="${3}" default="${4:default} />${5}
 snippet ul
 	<ul>
 		${0}
@@ -876,4 +874,4 @@ snippet var
 snippet video
 	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>
 snippet wbr
-	<wbr>
+	<wbr />

From 2d77c2826d1a0c6762089e1f8524e9588b4fb623 Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Tue, 5 Jul 2016 16:13:04 +0800
Subject: [PATCH 0855/1587] add fnt,refl,tb3x4

---
 UltiSnips/markdown.snippets | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index 0720cbfce..add9f7f95 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -1,5 +1,27 @@
 priority -50
 
+global !p
+def create_table(snip):
+    # retrieving single line from current string and treat it like tabstops count
+    placeholders_string = snip.buffer[snip.line].strip().split("x",1)
+    rows_amount = int(placeholders_string[0])
+    columns_amount = int(placeholders_string[1])
+
+    # erase current line
+    snip.buffer[snip.line] = ''
+
+    # create anonymous snippet with expected content and number of tabstops
+    anon_snippet_title = ' | '.join(['$' + str(col) for col in range(1,columns_amount+1)]) + "\n"
+    anon_snippet_delimiter = ':-|' * (columns_amount-1) + ":-\n"
+    anon_snippet_body = ""
+    for row in range(1,rows_amount+1):
+        anon_snippet_body += ' | '.join(['$' + str(row*columns_amount+col) for col in range(1,columns_amount+1)]) + "\n"
+    anon_snippet_table = anon_snippet_title + anon_snippet_delimiter + anon_snippet_body
+
+    # expand anonymous snippet
+    snip.expand_anon(anon_snippet_table)
+endglobal
+
 ###########################
 # Sections and Paragraphs #
 ###########################
@@ -50,4 +72,21 @@ $1
 $0
 endsnippet
 
+snippet refl "Reference Link"
+[${1:${VISUAL:Text}}][${2:id}]$0
+
+[$2]:${4:http://${3:www.url.com}} "${5:$4}"
+endsnippet
+
+snippet fnt "Footnote"
+[^${1:${VISUAL:Footnote}}]$0
+
+[^$1]:${2:Text}
+endsnippet
+
+post_jump "create_table(snip)"
+snippet "tb(\d+x\d+)" "Customizable table" br
+`!p snip.rv = match.group(1)`
+endsnippet
+
 # vim:ft=snippets:

From c74d97c65046bd9d2ee29a3b6ba82fe3bc50c0f9 Mon Sep 17 00:00:00 2001
From: Alvin Chan <aschan@gmail.com>
Date: Tue, 19 Jul 2016 16:29:56 -0700
Subject: [PATCH 0856/1587] By default, use VISUAL selection for HTML tag
 content

---
 UltiSnips/html.snippets | 46 ++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index fd1aca51f..973fe0ef8 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -162,25 +162,25 @@ endsnippet
 
 snippet body "<body>"
 <body>
-	$0
+	${0:${VISUAL}}
 </body>
 endsnippet
 
 snippet div "<div>" w
 <div>
-	$0
+	${0:${VISUAL}}
 </div>
 endsnippet
 
 snippet div. "<div> with class" w
 <div`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`>
-	$0
+	${0:${VISUAL}}
 </div>
 endsnippet
 
 snippet div# "<div> with ID & class" w
 <div`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`>
-	$0
+	${0:${VISUAL}}
 </div>
 endsnippet
 
@@ -188,33 +188,41 @@ snippet form "XHTML <form>" w
 <form action="${1:`!p
 snip.rv = (snip.basename or 'unnamed') + '_submit'
 `}" method="${2:get}" accept-charset="utf-8">
-	$0
+	${0:${VISUAL}}
 
 	<p><input type="submit" value="Continue →"`!p x(snip)`></p>
 </form>
 endsnippet
 
 snippet h1 "XHTML <h1>" w
-<h1>$0</h1>
+<h1>${0:${VISUAL}}</h1>
 endsnippet
 
 snippet h2 "XHTML <h2>" w
-<h2>$0</h2>
+<h2>${0:${VISUAL}}</h2>
 endsnippet
 
 snippet h3 "XHTML <h3>" w
-<h3>$0</h3>
+<h3>${0:${VISUAL}}</h3>
 endsnippet
 
 snippet h4 "XHTML <h4>" w
-<h4>$0</h4>
+<h4>${0:${VISUAL}}</h4>
+endsnippet
+
+snippet h5 "XHTML <h5>" w
+<h5>${0:${VISUAL}}</h5>
+endsnippet
+
+snippet h6 "XHTML <h6>" w
+<h6>${0:${VISUAL}}</h6>
 endsnippet
 
 snippet head "XHTML <head>"
 <head>
 	<meta charset="utf-8">
 	<title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
-	$0
+	${0:${VISUAL}}
 </head>
 endsnippet
 
@@ -232,13 +240,13 @@ endsnippet
 
 snippet script "XHTML <script>" w
 <script type="text/javascript" charset="utf-8">
-	$0
+	${0:${VISUAL}}
 </script>
 endsnippet
 
 snippet style "XHTML <style>" w
 <style type="text/css" media="screen">
-	$0
+	${0:${VISUAL}}
 </style>
 endsnippet
 
@@ -254,29 +262,29 @@ snippet a "Link" w
 endsnippet
 
 snippet p "paragraph" w
-<p>$0</p>
+<p>${0:${VISUAL}}</p>
 endsnippet
 
 snippet li "list item" w
-<li>$0</li>
+<li>${0:${VISUAL}}</li>
 endsnippet
 
 snippet ul "unordered list" w
 <ul>
-$0
+${0:${VISUAL}}
 </ul>
 endsnippet
 
 snippet td "table cell" w
-<td>$0</td>
+<td>${0:${VISUAL}}</td>
 endsnippet
 
 snippet th "table header" w
-<th>$0</th>
+<th>${0:${VISUAL}}</th>
 endsnippet
 
 snippet tr "table row" w
-<tr>$0</tr>
+<tr>${0:${VISUAL}}</tr>
 endsnippet
 
 snippet title "XHTML <title>" w
@@ -286,7 +294,7 @@ endsnippet
 snippet fieldset "Fieldset" w
 <fieldset id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}" ${2:class="${3:}"}>
 	<legend>$1</legend>
-	$0
+	${0:${VISUAL}}
 </fieldset>
 endsnippet
 

From fb4e3f09863b39ff49c5982b9d9dd32736baf259 Mon Sep 17 00:00:00 2001
From: Alvin Chan <aschan@gmail.com>
Date: Tue, 19 Jul 2016 16:54:17 -0700
Subject: [PATCH 0857/1587] Clean up HTML snippets that add extraneous tags

---
 UltiSnips/html.snippets | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 973fe0ef8..4e92a960c 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -127,7 +127,6 @@ endsnippet
 #############
 snippet input "Input with Label" w
 <label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}">$1</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="$5"${6: id="${7:$2}"}`!p x(snip)`>
-
 endsnippet
 
 snippet input "XHTML   <input>" w
@@ -141,9 +140,7 @@ endsnippet
 
 snippet select "Select Box" w
 <select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: onchange="${6:}"}${7: size="${8:1}"}}>
-	<option${9: value="${10:option1}"}>${11:$10}</option>
-	<option${12: value="${13:option2}"}>${14:$13}</option>${15:}
-	$0
+	${0:${VISUAL}}
 </select>
 endsnippet
 
@@ -189,8 +186,6 @@ snippet form "XHTML <form>" w
 snip.rv = (snip.basename or 'unnamed') + '_submit'
 `}" method="${2:get}" accept-charset="utf-8">
 	${0:${VISUAL}}
-
-	<p><input type="submit" value="Continue →"`!p x(snip)`></p>
 </form>
 endsnippet
 
@@ -252,8 +247,7 @@ endsnippet
 
 snippet table "XHTML <table>" w
 <table border="${1:0}"${2: cellspacing="${3:5}" cellpadding="${4:5}"}>
-	<tr><th>${5:Header}</th></tr>
-	<tr><td>${0:Data}</td></tr>
+	${0:${VISUAL}}
 </table>
 endsnippet
 
@@ -271,7 +265,7 @@ endsnippet
 
 snippet ul "unordered list" w
 <ul>
-${0:${VISUAL}}
+	${0:${VISUAL}}
 </ul>
 endsnippet
 

From e19ccebe270d5daeee9884d3600c574452b228fe Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 25 Jul 2016 00:34:57 -0700
Subject: [PATCH 0858/1587] alternate iife in old format

---
 snippets/javascript/javascript.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 0d054f4e6..3573fae59 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -30,6 +30,11 @@ snippet (f
 	(function(${1}) {
 		${0}
 	}(${2}));
+# Minify safe iife
+snippet iife
+	;(function(${1}) {
+		${0}
+	}(${2}))
 # self-defining function
 snippet sdf
 	var ${1:function_name} = function (${2:argument}) {

From f4c2004d125c8470e866806bd586d5753c951aa6 Mon Sep 17 00:00:00 2001
From: bounceme <chrispetrunoff@me.com>
Date: Mon, 25 Jul 2016 02:50:24 -0700
Subject: [PATCH 0859/1587] Update javascript.snippets

---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 3573fae59..db04e5452 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -31,7 +31,7 @@ snippet (f
 		${0}
 	}(${2}));
 # Minify safe iife
-snippet iife
+snippet ;fe
 	;(function(${1}) {
 		${0}
 	}(${2}))

From 4809c1750d35dce7bf5bdec0f2a58448bd7f05c1 Mon Sep 17 00:00:00 2001
From: binaryplease <binaryplease@gmail.com>
Date: Tue, 26 Jul 2016 21:14:00 +0200
Subject: [PATCH 0860/1587] added println snipped for go

---
 snippets/go.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index b3acac1ad..b2bdc9e02 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -171,6 +171,9 @@ snippet pn
 # print
 snippet pr
 	fmt.Printf("%${1:s}\n", ${2:var})
+# println
+snippet pl
+	fmt.Println("${1:s}")
 # range
 snippet rn
 	range ${0}

From 78b123a2f5cbece62c73aca6f4022dd83ef498f7 Mon Sep 17 00:00:00 2001
From: robin <robinkjoy@users.noreply.github.com>
Date: Fri, 29 Jul 2016 11:42:33 +0530
Subject: [PATCH 0861/1587] Add support for VHDL

---
 snippets/vhdl.snippets | 127 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 snippets/vhdl.snippets

diff --git a/snippets/vhdl.snippets b/snippets/vhdl.snippets
new file mode 100644
index 000000000..b7051cd17
--- /dev/null
+++ b/snippets/vhdl.snippets
@@ -0,0 +1,127 @@
+#
+## Libraries
+
+snippet lib
+	library ${1}
+	use ${1}.${2}
+
+# Standard Libraries
+snippet libs
+	library IEEE;
+	use IEEE.std_logic_1164.ALL;
+	use IEEE.numeric_std.ALL;
+
+# Xilinx Library
+snippet libx
+	library UNISIM;
+	use UNISIM.VCOMPONENTS.ALL;
+
+## Entity Declaration
+snippet ent
+	entity ${1:`Filename()`} is
+		generic (
+			${2}
+		);
+		port (
+			${3}
+		);
+	end entity $1;
+
+## Architecture
+snippet arc
+	architecture ${1:behav} of ${2:`Filename()`} is
+
+		${3}
+
+	begin
+
+
+	end $1;
+
+## Declarations
+# std_logic
+snippet st
+	signal ${1} : std_logic;
+# std_logic_vector
+snippet sv
+	signal ${1} : std_logic_vector (${2} downto 0);
+# std_logic in
+snippet ist
+	${1} : in std_logic;
+# std_logic_vector in
+snippet isv
+	${1} : in std_logic_vector (${2} downto 0);
+# std_logic out
+snippet ost
+	${1} : out std_logic;
+# std_logic_vector out
+snippet osv
+	${1} : out std_logic_vector (${2} downto 0);
+# unsigned
+snippet un
+	signal ${1} : unsigned (${2} downto 0);
+## Process Statements
+# process
+snippet pr
+	process (${1})
+	begin
+		${2}
+	end process;
+# process with clock
+snippet prc
+	process (${1:clk})
+	begin
+		if rising_edge ($1) then
+			${2}
+		end if;
+	end process;
+# process all
+snippet pra
+	process (${1:all})
+	begin
+		${2}
+	end process;
+## Control Statements
+# if
+snippet if
+	if ${1} then
+		${2}
+	end if;
+# if
+snippet ife
+	if ${1} then
+		${2}
+	else
+		${3}
+	end if;
+# else
+snippet el
+	else
+		${1}
+# if
+snippet eif
+	elsif ${1} then
+		${2}
+# case
+snippet ca
+	case ${1} is
+		${2}
+	end case;
+# when
+snippet wh
+	when ${1} =>
+		${2}
+# for
+snippet for
+	for ${1:i} in ${2} ${3:to} ${4} loop
+		${5}
+	end loop;
+# while
+snippet wh
+	while ${1} loop
+		${2}
+	end loop;
+## Misc
+# others
+snippet oth
+	(others => '${1:0}');

From 600215a447a8cc374d5b06cd87bb20ff9aa8190c Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 29 Jul 2016 13:06:07 +0100
Subject: [PATCH 0862/1587] Elixir describe snippet

---
 snippets/elixir.snippets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 851dc8be3..0a3efbdcd 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -105,13 +105,17 @@ snippet imp
 snippet ali
 	alias ${0:module_name}
 snippet test
-	test "${1:test_name}" do
+	test "${1:test name}" do
 		${0}
 	end
 snippet testa
 	test "${1:test_name}", %{${2:arg: arg}} do
 		${0}
 	end
+snippet des
+	describe "${1:test group subject}" do
+		${0}
+	end
 snippet exunit
 	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		use ExUnit.Case, async: true

From 1a7f5f90514fc174f4e89180657a953349d547a3 Mon Sep 17 00:00:00 2001
From: robin <robinkjoy@users.noreply.github.com>
Date: Fri, 29 Jul 2016 20:27:14 +0530
Subject: [PATCH 0863/1587] Fix Filename call, use vim-snippets implementation

Current code breaks in Ultisnips
---
 snippets/vhdl.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/vhdl.snippets b/snippets/vhdl.snippets
index b7051cd17..f13f5bf9b 100644
--- a/snippets/vhdl.snippets
+++ b/snippets/vhdl.snippets
@@ -18,7 +18,7 @@ snippet libx
 
 ## Entity Declaration
 snippet ent
-	entity ${1:`Filename()`} is
+	entity ${1:`vim_snippets#Filename()`} is
 		generic (
 			${2}
 		);
@@ -29,7 +29,7 @@ snippet ent
 
 ## Architecture
 snippet arc
-	architecture ${1:behav} of ${2:`Filename()`} is
+	architecture ${1:behav} of ${2:`vim_snippets#Filename()`} is
 
 		${3}
 

From 4f498954ab0cefefeefdfcb9bfecfb334700613e Mon Sep 17 00:00:00 2001
From: Julien Pivard <pivardjulien@gmail.com>
Date: Fri, 5 Aug 2016 13:50:55 +0200
Subject: [PATCH 0864/1587] fix ada filename mixedcase with - object oriented

Derived types use caracter '.' in package name. But in the filename dot
are replaced by '-' .

For exemple :
```ada
package Mother_Package.Daughter_Package is
    -- ...
end Mother_Package.Daughter_Package;
```
is in a file named : Mother_Package-Daughter_Package.ads

So function ada_case(word) change the '-' in filename to dot in the
package name with mixedcase.
---
 UltiSnips/ada.snippets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/ada.snippets b/UltiSnips/ada.snippets
index cc35c2c25..bea2a6cd3 100644
--- a/UltiSnips/ada.snippets
+++ b/UltiSnips/ada.snippets
@@ -5,7 +5,9 @@ global !p
 def ada_case(word):
 	out = word[0].upper()
 	for i in range(1, len(word)):
-		if word[i - 1] == '_':
+		if word[i] == '-':
+			out = out + '.'
+		elif word[i - 1] == '_' or word[i - 1] == '-':
 			out = out + word[i].upper()
 		else:
 			out = out + word[i]

From af01563f66199894a85b397a40512256c7b5fd28 Mon Sep 17 00:00:00 2001
From: Arvind <dnivra@users.noreply.github.com>
Date: Mon, 8 Aug 2016 09:35:37 +0530
Subject: [PATCH 0865/1587] Rename CPP inc snippet to prevent name collision
 with C inc snippet

---
 snippets/cpp.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index d06b3c90c..42c373413 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -3,7 +3,7 @@ extends c
 ##
 ## Preprocessor
 # #include <...>
-snippet inc
+snippet incc
 	#include <${1:iostream}>
 snippet binc
 	#include <boost/${1:shared_ptr}.hpp>

From c9c237cc6ca6d883ae494bb1a86b6f9faeed8d63 Mon Sep 17 00:00:00 2001
From: Vladislav Khvostov <vladkhvo@gmail.com>
Date: Mon, 22 Aug 2016 17:07:14 +0300
Subject: [PATCH 0866/1587] Added display flex snip.

---
 snippets/stylus.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/stylus.snippets b/snippets/stylus.snippets
index 205f84792..3f54f7818 100644
--- a/snippets/stylus.snippets
+++ b/snippets/stylus.snippets
@@ -379,6 +379,8 @@ snippet d:mis
 	display -moz-inline-stack
 snippet d:b
 	display block
+snippet d:f
+	display flex
 snippet d:cp
 	display compact
 snippet d:ib

From 9c373cbec0ed0523576bc19c0cb9e6f01ba94d12 Mon Sep 17 00:00:00 2001
From: Steve Brown <steve@zergsoft.com>
Date: Thu, 25 Aug 2016 10:28:16 +0900
Subject: [PATCH 0867/1587] added span, span. and span#

---
 UltiSnips/html.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 4e92a960c..084d9f786 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -239,6 +239,18 @@ snippet script "XHTML <script>" w
 </script>
 endsnippet
 
+snippet span "<span>" w
+<span> ${0:${VISUAL}} </span>
+endsnippet
+
+snippet span. "<span> with class" w
+<span`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`> ${0:${VISUAL}} </span>
+endsnippet
+
+snippet span# "<span> with ID & class" w
+<span`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`> ${0:${VISUAL}} </span>
+endsnippet
+
 snippet style "XHTML <style>" w
 <style type="text/css" media="screen">
 	${0:${VISUAL}}

From 890c4fc771dd702f7ed3be73c7edfad6a1873dbb Mon Sep 17 00:00:00 2001
From: djdt <blackjack.tom@gmail.com>
Date: Sun, 28 Aug 2016 21:03:32 +1000
Subject: [PATCH 0868/1587] Allow expansion of dates within braces etc.

---
 UltiSnips/all.snippets | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 0e286e5a0..a1db587da 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -73,4 +73,27 @@ snippet modeline "Vim modeline"
 vim`!v ':set '. (&expandtab ? printf('et sw=%i ts=%i', &sw, &ts) : printf('noet sts=%i sw=%i ts=%i', &sts, &sw, &ts)) . (&tw ? ' tw='. &tw : '') . ':'`
 endsnippet
 
+#########
+# DATES #
+#########
+snippet date "YYYY-MM-DD" w
+`date +%Y-%m-%d`
+endsnippet
+
+snippet ddate "Month DD, YYYY" w
+`date +%B\ %d,\ %Y`
+endsnippet
+
+snippet diso "ISO format datetime" w
+`date +%Y-%m-%dT%H:%M:%S`
+endsnippet
+
+snippet time "hh:mm" w
+`date +%H:%M`
+endsnippet
+
+snippet datetime "YYYY-MM-DD hh:mm" w
+`date +%Y-%m-%d\ %H:%M`
+endsnippet
+
 # vim:ft=snippets:

From 8ce8c77b876eb315fa048212a285224eb353a125 Mon Sep 17 00:00:00 2001
From: djdt <blackjack.tom@gmail.com>
Date: Sun, 28 Aug 2016 21:13:25 +1000
Subject: [PATCH 0869/1587] ISO timezone

---
 UltiSnips/all.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index a1db587da..8b7079e24 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -85,7 +85,7 @@ snippet ddate "Month DD, YYYY" w
 endsnippet
 
 snippet diso "ISO format datetime" w
-`date +%Y-%m-%dT%H:%M:%S`
+`date +%Y-%m-%dT%H:%M:%S%:z`
 endsnippet
 
 snippet time "hh:mm" w

From 1fc0e9c43d9b028b8da18105adeeef3f28c879e7 Mon Sep 17 00:00:00 2001
From: Steve Brown <steve@zergsoft.com>
Date: Wed, 31 Aug 2016 13:00:03 +0900
Subject: [PATCH 0870/1587] extended html in snippets/eruby

---
 snippets/eruby.snippets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index adad8cb06..64f79ef32 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -1,6 +1,7 @@
 # .erb and .rhmtl files
 
 # Includes html.snippets
+extends html
 
 # Rails *****************************
 snippet rc

From 9ee26ce9e1185bfd0160dd56bbc3d4ff2fb30fd1 Mon Sep 17 00:00:00 2001
From: James Turley <james.turley@signalmedia.co>
Date: Wed, 31 Aug 2016 15:37:48 +0100
Subject: [PATCH 0871/1587] add word boundary flag to ultisnips/javascript
 `fun` snippet

---
 UltiSnips/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 4537baea6..f468d0aa1 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -46,7 +46,7 @@ for (var ${2:i} = ${1:Things.length} - 1; $2 >= 0; $2--) {
 }
 endsnippet
 
-snippet fun "function (fun)"
+snippet fun "function (fun)" w
 function ${1:function_name}(${2:argument}) {
 	${VISUAL}$0
 }

From 33aa7e77f88c45b79440a9c20e5d2746d8cf674c Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sat, 3 Sep 2016 15:55:45 -0400
Subject: [PATCH 0872/1587] Add vanilla es6 react snippets

This snippets file is an updated version of this repo:
https://github.com/justinj/vim-react-snippets

I have removed any snippets dealing with deprecated functions.
---
 snippets/react.snippets | 68 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 snippets/react.snippets

diff --git a/snippets/react.snippets b/snippets/react.snippets
new file mode 100644
index 000000000..78cf0d2e8
--- /dev/null
+++ b/snippets/react.snippets
@@ -0,0 +1,68 @@
+snippet cdm
+	componentDidMount() {
+		${1}
+	},
+snippet cdup
+	componentDidUpdate(prevProps, prevState) {
+		${1}
+	},
+snippet cwm
+	componentWillMount() {
+		${1}
+	},
+snippet cwr
+	componentWillReceiveProps(nextProps) {
+		${1}
+	},
+snippet cwun
+	componentWillUnmount() {
+		${1}
+	},
+snippet cwu
+	componentWillUpdate(nextProps, nextState) {
+		${1}
+	},
+snippet fup
+	forceUpdate(${1:callback});
+snippet gdp
+	getDefaultProps() {
+		return {
+			${1}
+		};
+	},
+snippet gis
+	getInitialState() {
+		return {
+			${1}: ${2}
+		};
+	},
+snippet pt
+	propTypes: {
+		${1}: React.PropTypes.${2:string}
+	},
+snippet rcc
+	class ${1:ClassName} extends React.Component {
+		render() {
+			return (
+				${0:<div />}
+			);
+		}
+	});
+snippet ren
+	render() {
+		return (
+			${1:<div />}
+		);
+	}
+snippet sst
+	setState({
+		${1}: ${2}
+	});
+snippet scu
+	shouldComponentUpdate(nextProps, nextState) {
+		${1}
+	},
+snippet props
+	this.props.${1}
+snippet state
+	this.state.${1}

From a14c92f9cdb5b9d2c71c50118af24a605f5a4345 Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sat, 3 Sep 2016 19:34:39 -0400
Subject: [PATCH 0873/1587] Fix residual parenthesis and semicolons

---
 snippets/react.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/react.snippets b/snippets/react.snippets
index 78cf0d2e8..1d036275e 100644
--- a/snippets/react.snippets
+++ b/snippets/react.snippets
@@ -47,7 +47,7 @@ snippet rcc
 				${0:<div />}
 			);
 		}
-	});
+	}
 snippet ren
 	render() {
 		return (

From a42244fd545c80bc13561141b912a521b31768c2 Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sat, 3 Sep 2016 19:37:38 -0400
Subject: [PATCH 0874/1587] Add react and react-dom import snippets

---
 snippets/react.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/react.snippets b/snippets/react.snippets
index 1d036275e..0976bcf75 100644
--- a/snippets/react.snippets
+++ b/snippets/react.snippets
@@ -1,3 +1,7 @@
+snippet ir
+	import React from 'react';
+snippet ird
+	import ReactDOM from 'react-dom';
 snippet cdm
 	componentDidMount() {
 		${1}

From 66b4231dcd1cc10fd7f9c1d352ccdc86e29ab8cd Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sat, 3 Sep 2016 19:47:07 -0400
Subject: [PATCH 0875/1587] Add constructor snippet

---
 snippets/react.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/react.snippets b/snippets/react.snippets
index 0976bcf75..4047034cb 100644
--- a/snippets/react.snippets
+++ b/snippets/react.snippets
@@ -52,6 +52,11 @@ snippet rcc
 			);
 		}
 	}
+snippet ctor
+	constructor() {
+		super();
+		${1}
+	}
 snippet ren
 	render() {
 		return (

From 1966731e02bfdc90ae992f49bdd98f99323d373f Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sat, 3 Sep 2016 19:48:55 -0400
Subject: [PATCH 0876/1587] Add export default component snippet

---
 snippets/react.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/react.snippets b/snippets/react.snippets
index 4047034cb..efda1cd97 100644
--- a/snippets/react.snippets
+++ b/snippets/react.snippets
@@ -52,6 +52,14 @@ snippet rcc
 			);
 		}
 	}
+snippet ercc
+	export default class ${1:ClassName} extends React.Component {
+		render() {
+			return (
+				${0:<div />}
+			);
+		}
+	}
 snippet ctor
 	constructor() {
 		super();

From aa32c69d1513b1faee0fc717bd8188f40cddc838 Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sat, 3 Sep 2016 23:09:53 -0400
Subject: [PATCH 0877/1587] Rename props and state snippet to avoid collision

Also apply the in-word option
---
 snippets/react.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/react.snippets b/snippets/react.snippets
index efda1cd97..2d2001b37 100644
--- a/snippets/react.snippets
+++ b/snippets/react.snippets
@@ -79,7 +79,7 @@ snippet scu
 	shouldComponentUpdate(nextProps, nextState) {
 		${1}
 	},
-snippet props
+snippet prp i
 	this.props.${1}
-snippet state
+snippet ste i
 	this.state.${1}

From 926a4867552e9354f909f998fbf47d2094f6ec4e Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sat, 3 Sep 2016 23:10:24 -0400
Subject: [PATCH 0878/1587] Modify setState to use this

---
 snippets/react.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/react.snippets b/snippets/react.snippets
index 2d2001b37..6301c6d12 100644
--- a/snippets/react.snippets
+++ b/snippets/react.snippets
@@ -72,7 +72,7 @@ snippet ren
 		);
 	}
 snippet sst
-	setState({
+	this.setState({
 		${1}: ${2}
 	});
 snippet scu

From 45bdce57403e73635820797852792407d9b02038 Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sun, 4 Sep 2016 19:02:09 -0400
Subject: [PATCH 0879/1587] Move and rename react.snippets

---
 snippets/{react.snippets => javascript/javascript-react.snippets} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename snippets/{react.snippets => javascript/javascript-react.snippets} (100%)

diff --git a/snippets/react.snippets b/snippets/javascript/javascript-react.snippets
similarity index 100%
rename from snippets/react.snippets
rename to snippets/javascript/javascript-react.snippets

From a1d4064d442a6d4e89c015de175d7d33753bb040 Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sun, 4 Sep 2016 19:58:56 -0400
Subject: [PATCH 0880/1587] Add ReactDOM.render() method

---
 snippets/javascript/javascript-react.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index 6301c6d12..b2bb54980 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -52,6 +52,8 @@ snippet rcc
 			);
 		}
 	}
+snippet rdr
+	ReactDOM.render(${1}, ${2})
 snippet ercc
 	export default class ${1:ClassName} extends React.Component {
 		render() {

From 2f9b3012c124487356e35434af3d4a78829b69aa Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sun, 4 Sep 2016 20:04:00 -0400
Subject: [PATCH 0881/1587] Remove commas from previous non-ES6 functions

---
 snippets/javascript/javascript-react.snippets | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index b2bb54980..579adb325 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -5,27 +5,27 @@ snippet ird
 snippet cdm
 	componentDidMount() {
 		${1}
-	},
+	}
 snippet cdup
 	componentDidUpdate(prevProps, prevState) {
 		${1}
-	},
+	}
 snippet cwm
 	componentWillMount() {
 		${1}
-	},
+	}
 snippet cwr
 	componentWillReceiveProps(nextProps) {
 		${1}
-	},
+	}
 snippet cwun
 	componentWillUnmount() {
 		${1}
-	},
+	}
 snippet cwu
 	componentWillUpdate(nextProps, nextState) {
 		${1}
-	},
+	}
 snippet fup
 	forceUpdate(${1:callback});
 snippet gdp
@@ -33,17 +33,17 @@ snippet gdp
 		return {
 			${1}
 		};
-	},
+	}
 snippet gis
 	getInitialState() {
 		return {
 			${1}: ${2}
 		};
-	},
+	}
 snippet pt
 	propTypes: {
 		${1}: React.PropTypes.${2:string}
-	},
+	}
 snippet rcc
 	class ${1:ClassName} extends React.Component {
 		render() {
@@ -80,7 +80,7 @@ snippet sst
 snippet scu
 	shouldComponentUpdate(nextProps, nextState) {
 		${1}
-	},
+	}
 snippet prp i
 	this.props.${1}
 snippet ste i

From c13b4d5d55ada1c31d437013c30a5f62492c13e5 Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Sun, 4 Sep 2016 20:05:36 -0400
Subject: [PATCH 0882/1587] Remove semicolons

I just realized that I don't like semicolons that much...
---
 snippets/javascript/javascript-react.snippets | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index 579adb325..d39c76cb1 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -1,7 +1,7 @@
 snippet ir
-	import React from 'react';
+	import React from 'react'
 snippet ird
-	import ReactDOM from 'react-dom';
+	import ReactDOM from 'react-dom'
 snippet cdm
 	componentDidMount() {
 		${1}
@@ -27,18 +27,18 @@ snippet cwu
 		${1}
 	}
 snippet fup
-	forceUpdate(${1:callback});
+	forceUpdate(${1:callback})
 snippet gdp
 	getDefaultProps() {
 		return {
 			${1}
-		};
+		}
 	}
 snippet gis
 	getInitialState() {
 		return {
 			${1}: ${2}
-		};
+		}
 	}
 snippet pt
 	propTypes: {
@@ -49,7 +49,7 @@ snippet rcc
 		render() {
 			return (
 				${0:<div />}
-			);
+			)
 		}
 	}
 snippet rdr
@@ -59,24 +59,24 @@ snippet ercc
 		render() {
 			return (
 				${0:<div />}
-			);
+			)
 		}
 	}
 snippet ctor
 	constructor() {
-		super();
+		super()
 		${1}
 	}
 snippet ren
 	render() {
 		return (
 			${1:<div />}
-		);
+		)
 	}
 snippet sst
 	this.setState({
 		${1}: ${2}
-	});
+	})
 snippet scu
 	shouldComponentUpdate(nextProps, nextState) {
 		${1}

From 2e8cc1717307a7cd289b2bcaf5d242e4cc5143d7 Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Mon, 5 Sep 2016 09:01:21 -0400
Subject: [PATCH 0883/1587] Add semicolons back

---
 snippets/javascript/javascript-react.snippets | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index d39c76cb1..579adb325 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -1,7 +1,7 @@
 snippet ir
-	import React from 'react'
+	import React from 'react';
 snippet ird
-	import ReactDOM from 'react-dom'
+	import ReactDOM from 'react-dom';
 snippet cdm
 	componentDidMount() {
 		${1}
@@ -27,18 +27,18 @@ snippet cwu
 		${1}
 	}
 snippet fup
-	forceUpdate(${1:callback})
+	forceUpdate(${1:callback});
 snippet gdp
 	getDefaultProps() {
 		return {
 			${1}
-		}
+		};
 	}
 snippet gis
 	getInitialState() {
 		return {
 			${1}: ${2}
-		}
+		};
 	}
 snippet pt
 	propTypes: {
@@ -49,7 +49,7 @@ snippet rcc
 		render() {
 			return (
 				${0:<div />}
-			)
+			);
 		}
 	}
 snippet rdr
@@ -59,24 +59,24 @@ snippet ercc
 		render() {
 			return (
 				${0:<div />}
-			)
+			);
 		}
 	}
 snippet ctor
 	constructor() {
-		super()
+		super();
 		${1}
 	}
 snippet ren
 	render() {
 		return (
 			${1:<div />}
-		)
+		);
 	}
 snippet sst
 	this.setState({
 		${1}: ${2}
-	})
+	});
 snippet scu
 	shouldComponentUpdate(nextProps, nextState) {
 		${1}

From 1d86e2e1c67e0c953271ade3cec5cd6f80b6f051 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 9 Sep 2016 18:20:10 +0100
Subject: [PATCH 0884/1587] LFE snippets

---
 snippets/lfe.snippets | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 snippets/lfe.snippets

diff --git a/snippets/lfe.snippets b/snippets/lfe.snippets
new file mode 100644
index 000000000..b716e6efe
--- /dev/null
+++ b/snippets/lfe.snippets
@@ -0,0 +1,18 @@
+snippet defmo
+	(defmodule ${1:`vim_snippets#Filename()`}
+		(export ${2:all}))
+	$0
+snippet def
+	(defun $1 ($2)
+		$0)
+snippet ltest
+	(defmodule ${1:`vim_snippets#Filename()`}
+		(behaviour ltest-unit)
+		(export all))
+
+	(include-lib "ltest/include/ltest-macros.lfe")
+
+	$0
+snippet test
+	(deftest $1
+		$0)

From 2eeff06b3e1a850a1194df49ca236cc2aaf8dae4 Mon Sep 17 00:00:00 2001
From: Andre Walker <andre.walker@booking.com>
Date: Tue, 13 Sep 2016 15:30:13 +0200
Subject: [PATCH 0885/1587] Suggest a better default for Perl package names

The previous snippet for Perl 'package' was apparently copy-pasted from
html.snippets (see 'head' and 'title' snippets). It didn't really make
sense, and for me it actually always returned an empty string.

This one looks for the path name of the file and removes everything up
to the lib/ folder. It then replaces '/' with '::'. I think it's a
pretty sensible default.

Finally, I also added "use strict" and "use warnings" to the package
definition.
---
 snippets/perl.snippets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index 65120a25d..c6d865be9 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -84,7 +84,9 @@ snippet fore
 	${1:expression} foreach @${2:array};
 # Package
 snippet package
-	package ${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`};
+	package ${1:`vim_snippets#Filename(expand('%:p:s?.*lib/??:r:gs?/?::?'))`};
+	use strict;
+	use warnings;
 
 	${0}
 
@@ -93,7 +95,9 @@ snippet package
 	__END__
 # Package syntax perl >= 5.14
 snippet packagev514
-	package ${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`} ${2:0.99};
+	package ${1:`vim_snippets#Filename(expand('%:p:s?.*lib/??:r:gs?/?::?'))`} ${2:0.99};
+	use v5.14;
+	use warnings;
 
 	${0}
 

From b468a4374f8ee496c8bd611a6cba668e5160fd54 Mon Sep 17 00:00:00 2001
From: Andre Walker <andre.walker@booking.com>
Date: Tue, 13 Sep 2016 16:58:28 +0200
Subject: [PATCH 0886/1587] Actually, Filename() here is not necessary

---
 snippets/perl.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index c6d865be9..2ed2932a6 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -84,7 +84,7 @@ snippet fore
 	${1:expression} foreach @${2:array};
 # Package
 snippet package
-	package ${1:`vim_snippets#Filename(expand('%:p:s?.*lib/??:r:gs?/?::?'))`};
+	package ${1:`expand('%:p:s?.*lib/??:r:gs?/?::?')`};
 	use strict;
 	use warnings;
 
@@ -95,7 +95,7 @@ snippet package
 	__END__
 # Package syntax perl >= 5.14
 snippet packagev514
-	package ${1:`vim_snippets#Filename(expand('%:p:s?.*lib/??:r:gs?/?::?'))`} ${2:0.99};
+	package ${1:`expand('%:p:s?.*lib/??:r:gs?/?::?')`} ${2:0.99};
 	use v5.14;
 	use warnings;
 

From 4b28763d20e26f374ec0d0879af49f8c90f797a5 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 29 Sep 2016 20:36:20 +0100
Subject: [PATCH 0887/1587] Elixir with snippets

---
 snippets/elixir.snippets | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 0a3efbdcd..46ac7c861 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -48,6 +48,21 @@ snippet fori
 	for ${1:item} <- ${2:items}, into: ${3} do
 		${0}
 	end
+snippet wi
+	with(
+		${1:item} <- ${2:items}
+	) do
+		${0}
+	end
+snippet wie
+	with(
+		${1:item} <- ${2:items}
+	) do
+		${3}
+	else
+		${4} ->
+			${0}
+	end
 snippet df
 	def ${1:name}, do: ${2}
 snippet def

From 5837d8dc5c51609b4cd373103a3cf570db7cb7eb Mon Sep 17 00:00:00 2001
From: Vladislav Khvostov <vladkhvo@gmail.com>
Date: Sat, 1 Oct 2016 15:53:29 +0300
Subject: [PATCH 0888/1587] Added bemjson.snippets

---
 snippets/javascript/bemjson.snippets | 52 ++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 snippets/javascript/bemjson.snippets

diff --git a/snippets/javascript/bemjson.snippets b/snippets/javascript/bemjson.snippets
new file mode 100644
index 000000000..ec3af59d6
--- /dev/null
+++ b/snippets/javascript/bemjson.snippets
@@ -0,0 +1,52 @@
+# Snippet for bemjson. https://en.bem.info/platform/bemjson/
+
+# Blocks
+snippet b
+    {
+        block : '${1:name}',
+        content : [
+            '${2:content}'
+        ]
+    }
+
+# btc - BEM block with text content
+snippet btc
+    {
+         block : '${1:name}',
+         content: '${2:content}'
+    }
+
+# bwm - BEM block with modifier.
+snippet bwm
+    {
+        block : '${1:name}',
+        mods: { ${2:modName}: '${3:modVal}' },
+        content : [
+            '${4:content}'
+        ]
+    }
+
+# Elems
+
+# e - BEM elem
+snippet e
+    {
+        elem : '${1:name}',
+        content : [
+            '${2:content}'
+        ]
+    }
+
+
+# mo - Mods
+snippet mo
+    mods : { ${1:modName} : '${2:modVal}' },
+
+mi - BEM mix mod
+snippet mi
+    mix : [ { ${1:block} : '${2:block}' } ],
+
+# a - BEM attrs mod
+snippet a
+    attrs : { ${1:attr} : '${2:val}' },
+

From 47870e954d94e934c425de51f7c1599d2c0741f2 Mon Sep 17 00:00:00 2001
From: Sokovikov <skv-headless@yandex.ru>
Date: Sat, 1 Oct 2016 19:38:23 +0400
Subject: [PATCH 0889/1587] console.warn js snippet

---
 snippets/javascript/javascript.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index db04e5452..f24e6f772 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -262,6 +262,9 @@ snippet cd
 # console.error
 snippet ce
 	console.error(${0});
+# console.warn
+snippet cw
+	console.warn(${0});
 # console.trace
 snippet ct
 	console.trace(${0:label});

From 1cc15671958d5608dd98f53074a432ac07989da9 Mon Sep 17 00:00:00 2001
From: Vladislav Khvostov <vladkhvo@gmail.com>
Date: Sat, 1 Oct 2016 20:17:00 +0300
Subject: [PATCH 0890/1587] Update bemjson.snippets

---
 snippets/javascript/bemjson.snippets | 52 ++++++++++++++--------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/snippets/javascript/bemjson.snippets b/snippets/javascript/bemjson.snippets
index ec3af59d6..e96c70d92 100644
--- a/snippets/javascript/bemjson.snippets
+++ b/snippets/javascript/bemjson.snippets
@@ -2,51 +2,51 @@
 
 # Blocks
 snippet b
-    {
-        block : '${1:name}',
-        content : [
-            '${2:content}'
-        ]
-    }
+	{
+		block : '${1:name}',
+		content : [
+			'${2:content}'
+		]
+	}
 
 # btc - BEM block with text content
 snippet btc
-    {
-         block : '${1:name}',
-         content: '${2:content}'
-    }
+	{
+		 block : '${1:name}',
+		 content: '${2:content}'
+	}
 
 # bwm - BEM block with modifier.
 snippet bwm
-    {
-        block : '${1:name}',
-        mods: { ${2:modName}: '${3:modVal}' },
-        content : [
-            '${4:content}'
-        ]
-    }
+	{
+		block : '${1:name}',
+		mods: { ${2:modName}: '${3:modVal}' },
+		content : [
+			'${4:content}'
+		]
+	}
 
 # Elems
 
 # e - BEM elem
 snippet e
-    {
-        elem : '${1:name}',
-        content : [
-            '${2:content}'
-        ]
-    }
+	{
+		elem : '${1:name}',
+		content : [
+			'${2:content}'
+		]
+	}
 
 
 # mo - Mods
 snippet mo
-    mods : { ${1:modName} : '${2:modVal}' },
+	mods : { ${1:modName} : '${2:modVal}' },
 
 mi - BEM mix mod
 snippet mi
-    mix : [ { ${1:block} : '${2:block}' } ],
+	mix : [ { ${1:block} : '${2:block}' } ],
 
 # a - BEM attrs mod
 snippet a
-    attrs : { ${1:attr} : '${2:val}' },
+	attrs : { ${1:attr} : '${2:val}' },
 

From 395d6924106b8d208a983e5f7201e94b9c9e313e Mon Sep 17 00:00:00 2001
From: Andrey Paskal <apaskal@gmail.com>
Date: Sun, 2 Oct 2016 10:24:42 +0300
Subject: [PATCH 0891/1587] Missing comment sign at line start

---
 snippets/javascript/bemjson.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/bemjson.snippets b/snippets/javascript/bemjson.snippets
index e96c70d92..7899c22d9 100644
--- a/snippets/javascript/bemjson.snippets
+++ b/snippets/javascript/bemjson.snippets
@@ -42,7 +42,7 @@ snippet e
 snippet mo
 	mods : { ${1:modName} : '${2:modVal}' },
 
-mi - BEM mix mod
+# mi - BEM mix mod
 snippet mi
 	mix : [ { ${1:block} : '${2:block}' } ],
 

From a4260ba7dbb6024e09d0bca3fb04a61763676fa6 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 2 Oct 2016 18:29:49 +0100
Subject: [PATCH 0892/1587] Remove AMD JS snippets from main JS file

---
 UltiSnips/javascript.snippets | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index f468d0aa1..8821c5caf 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -158,14 +158,4 @@ snippet cw "console.warn" b
 console.warn(${1:"${2:value}"});
 endsnippet
 
-# AMD (Asynchronous Module Definition) snippets
-
-snippet def "define an AMD module"
-define(${1:optional_name, }[${2:'jquery'}], ${3:callback});
-endsnippet
-
-snippet req "require an AMD module"
-require([${1:'dependencies'}], ${2:callback});
-endsnippet
-
 # vim:ft=snippets:

From f01e7c6b751027ba71ac41cd94a8f51f3cec9f3e Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 2 Oct 2016 18:31:13 +0100
Subject: [PATCH 0893/1587] Move library JS snippets out of default import

---
 .../{javascript/bemjson.snippets => javascript-bemjson.snippets}  | 0
 .../{javascript/javascript.d3.snippets => javascript-d3.snippets} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename snippets/{javascript/bemjson.snippets => javascript-bemjson.snippets} (100%)
 rename snippets/{javascript/javascript.d3.snippets => javascript-d3.snippets} (100%)

diff --git a/snippets/javascript/bemjson.snippets b/snippets/javascript-bemjson.snippets
similarity index 100%
rename from snippets/javascript/bemjson.snippets
rename to snippets/javascript-bemjson.snippets
diff --git a/snippets/javascript/javascript.d3.snippets b/snippets/javascript-d3.snippets
similarity index 100%
rename from snippets/javascript/javascript.d3.snippets
rename to snippets/javascript-d3.snippets

From 4dad754a15f7afdbfd11d271f96342642b5f453c Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 2 Oct 2016 18:53:37 +0100
Subject: [PATCH 0894/1587] Remove extra newlines from javascript snippets

---
 snippets/javascript/javascript.snippets | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index f24e6f772..67efaf0a2 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -1,5 +1,4 @@
 # Functions
-
 # prototype
 snippet proto
 	${1:class_name}.prototype.${2:method_name} = function(${3}) {
@@ -44,9 +43,7 @@ snippet sdf
 			${0}
 		};
 	};
-
 # Flow control
-
 # if
 snippet if
 	if (${1:true}) {
@@ -100,9 +97,6 @@ snippet terr
 # return
 snippet ret
 	return ${0:result};
-
-# Loops
-
 # for loop
 snippet for
 	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2++) {
@@ -128,9 +122,7 @@ snippet fori
 	for (var ${1:prop} in ${2:object}) {
 		${0:$2[$1]}
 	}
-
 # Objects
-
 # Object Method
 snippet :f
 	${1:method_name}: function (${2:attribute}) {
@@ -207,9 +199,7 @@ snippet prop
 			configurable : ${0:boolean}
 		}
 	);
-
 # Documentation
-
 # docstring
 snippet /**
 	/**
@@ -228,9 +218,7 @@ snippet jsonp
 # JSON.stringify
 snippet jsons
 	JSON.stringify(${0:object});
-
 # DOM selectors
-
 # Get elements
 snippet get
 	getElementsBy${1:TagName}('${0}')
@@ -249,7 +237,6 @@ snippet qs
 # Query selector all
 snippet qsa
 	${1:document}.querySelectorAll('${0:CSS selector}')
-
 # Debugging
 snippet de
 	debugger;
@@ -277,13 +264,10 @@ snippet ca
 # console.dir
 snippet cdir
 	console.dir(${0:obj});
-
 # Misc
-
 # 'use strict';
 snippet us
 	'use strict';
-
 # setTimeout function
 snippet timeout
 	setTimeout(function () {${0}}${2}, ${1:10});

From 3c3f3ac63096b593241d0dc7d20017448e743813 Mon Sep 17 00:00:00 2001
From: marocchino <marocchino@users.noreply.github.com>
Date: Tue, 4 Oct 2016 22:51:53 +0900
Subject: [PATCH 0895/1587] Add clac to es6 snippets

---
 snippets/javascript/javascript.es6.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
index df059a150..464f0096b 100644
--- a/snippets/javascript/javascript.es6.snippets
+++ b/snippets/javascript/javascript.es6.snippets
@@ -12,6 +12,12 @@ snippet clax
 	class ${1} extends ${2} {
 		${0}
 	}
+snippet clac
+	class ${1} {
+		constructor(${2}) {
+			${0}
+		}
+	}
 snippet =>
 	(${1}) => {
 		${0}

From 915e32e65eed1897b9010b6ad9bde57446868990 Mon Sep 17 00:00:00 2001
From: Kevin Murray <kdmurray91@users.noreply.github.com>
Date: Wed, 5 Oct 2016 13:18:24 +1100
Subject: [PATCH 0896/1587] Fix parsing of `&comments`

This fixes a crash where comment formats should have a description pre-prended to them
---
 pythonx/vimsnippets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index 6a446a2a7..d1cee17b9 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -32,7 +32,7 @@ def _parse_comments(s):
             flags, text = next(i).split(':', 1)
 
             if len(flags) == 0:
-                rv.append((text, text, text, ""))
+                rv.append(('OTHER', text, text, text, ""))
             # parse 3-part comment, but ignore those with O flag
             elif 's' in flags and 'O' not in flags:
                 ctriple = ["TRIPLE"]

From 190624c38fd0c3ed5287add12349be56729f6020 Mon Sep 17 00:00:00 2001
From: marocchino <marocchino@users.noreply.github.com>
Date: Thu, 6 Oct 2016 13:21:51 +0900
Subject: [PATCH 0897/1587] Add more es2015 snippets

---
 snippets/javascript/javascript.es6.snippets | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
index 464f0096b..16e463282 100644
--- a/snippets/javascript/javascript.es6.snippets
+++ b/snippets/javascript/javascript.es6.snippets
@@ -18,6 +18,24 @@ snippet clac
 			${0}
 		}
 	}
+# For of loop
+snippet foro
+	for (let ${1:prop} of ${2:object}) {
+		${0:$1}
+	}
+# Generator
+snippet fun*
+	function* ${1:function_name}(${2}) {
+		${0}
+	}
+snippet c=>
+	const ${1:function_name} = (${2}) => {
+		${0}
+	}
+snippet caf
+	const ${1:function_name} = (${2}) => {
+		${0}
+	}
 snippet =>
 	(${1}) => {
 		${0}

From 060fc4a04858d5015850462597da509a1d023cd0 Mon Sep 17 00:00:00 2001
From: Mauro Porras P <mauroporrasp@gmail.com>
Date: Mon, 10 Oct 2016 23:22:04 -0500
Subject: [PATCH 0898/1587] wip

---
 .../javascript/javascript.es6.react.snippets  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 snippets/javascript/javascript.es6.react.snippets

diff --git a/snippets/javascript/javascript.es6.react.snippets b/snippets/javascript/javascript.es6.react.snippets
new file mode 100644
index 000000000..65f9d86d5
--- /dev/null
+++ b/snippets/javascript/javascript.es6.react.snippets
@@ -0,0 +1,29 @@
+# Import only React
+snippet ri1
+	import React from 'react'
+
+# Import both React and Component
+snippet ri2
+	import React, { Component } from 'react'
+
+# Import ReactDOM
+snippet ri3
+	import ReactDOM from 'react-dom'
+
+# React class
+snippet rcla
+	class ${1} extends Component {
+		render() {
+			${0}
+		}
+	}
+
+# React constructor
+snippet rcon
+	constructor(props) {
+		super(props)
+
+		this.state = {
+			${1}
+		}
+	}

From 8f7c00a3ea6dc46e17d50ece9c9ee48aad5311a0 Mon Sep 17 00:00:00 2001
From: Mauro Porras P <mauroporrasp@gmail.com>
Date: Mon, 10 Oct 2016 23:34:08 -0500
Subject: [PATCH 0899/1587] wip

---
 .../javascript/javascript.es6.react.snippets  | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/snippets/javascript/javascript.es6.react.snippets b/snippets/javascript/javascript.es6.react.snippets
index 65f9d86d5..3b0666c17 100644
--- a/snippets/javascript/javascript.es6.react.snippets
+++ b/snippets/javascript/javascript.es6.react.snippets
@@ -6,15 +6,13 @@ snippet ri1
 snippet ri2
 	import React, { Component } from 'react'
 
-# Import ReactDOM
-snippet ri3
-	import ReactDOM from 'react-dom'
-
 # React class
 snippet rcla
 	class ${1} extends Component {
 		render() {
-			${0}
+			return (
+				${0}
+			)
 		}
 	}
 
@@ -27,3 +25,33 @@ snippet rcon
 			${1}
 		}
 	}
+
+# Presentational component
+snippet rcom
+	(props) => {
+		return (
+			${1}
+		)
+	}
+
+# Lifecycle Methods
+snippet rcdm
+	componentDidMount() {
+		${1}
+	}
+
+# State
+snippet rsst
+	this.setState({
+		${1}: ${2}
+	})
+
+snippet rst
+	this.state.${1}
+
+# Props
+snippet rp
+	props.${1}
+
+snippet rtp
+	this.props.${1}

From 97cc2135b013c84e1d9b6085fa1d2ef8dde67ee7 Mon Sep 17 00:00:00 2001
From: Mauro Porras P <mauroporrasp@gmail.com>
Date: Mon, 10 Oct 2016 23:41:22 -0500
Subject: [PATCH 0900/1587] wip

---
 .../javascript/javascript.es6.react.snippets  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/snippets/javascript/javascript.es6.react.snippets b/snippets/javascript/javascript.es6.react.snippets
index 3b0666c17..b83f63cbb 100644
--- a/snippets/javascript/javascript.es6.react.snippets
+++ b/snippets/javascript/javascript.es6.react.snippets
@@ -8,10 +8,10 @@ snippet ri2
 
 # React class
 snippet rcla
-	class ${1} extends Component {
+	class ${1:MyComponent} extends Component {
 		render() {
 			return (
-				${0}
+				${0:<div></div>}
 			)
 		}
 	}
@@ -22,7 +22,7 @@ snippet rcon
 		super(props)
 
 		this.state = {
-			${1}
+			${1}: ${0},
 		}
 	}
 
@@ -30,28 +30,28 @@ snippet rcon
 snippet rcom
 	(props) => {
 		return (
-			${1}
+			${0:<div></div>}
 		)
 	}
 
 # Lifecycle Methods
 snippet rcdm
 	componentDidMount() {
-		${1}
+		${0}
 	}
 
 # State
 snippet rsst
 	this.setState({
-		${1}: ${2}
+		${1}: ${0},
 	})
 
-snippet rst
-	this.state.${1}
+snippet rtst
+	this.state.${0}
 
 # Props
 snippet rp
-	props.${1}
+	props.${0}
 
 snippet rtp
-	this.props.${1}
+	this.props.${0}

From eb2ffbabc38fe75092bb5db036b35264dc651219 Mon Sep 17 00:00:00 2001
From: Paco Esteban <paco@onna.be>
Date: Tue, 11 Oct 2016 09:59:51 +0200
Subject: [PATCH 0901/1587] correction on C for loops (added type on temp
 variable declaration) Added some handy snippets on arduino snippets file.

---
 snippets/arduino.snippets | 32 +++++++++++++++++++++++++-------
 snippets/c.snippets       |  4 ++--
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/snippets/arduino.snippets b/snippets/arduino.snippets
index 77ee46fa4..6f7f41372 100644
--- a/snippets/arduino.snippets
+++ b/snippets/arduino.snippets
@@ -1,8 +1,8 @@
 snippet setup
 	void setup()
 	{
-		${0}
-		Serial.begin(9600);
+		Serial.begin(${1:9600});
+		${2}
 	}
 
 snippet loop
@@ -14,6 +14,9 @@ snippet loop
 snippet inc
 	#include <${1}.h>
 
+snippet def
+	#define ${1}
+
 # if
 snippet if
 	if (${1:/* condition */}) {
@@ -50,12 +53,12 @@ snippet case
 
 # for
 snippet for
-	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
+	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
 		${4}
 	}
 # for (custom)
 snippet forr
-	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
+	for (int ${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
 		${5}
 	}
 # while
@@ -93,14 +96,29 @@ snippet dwLow
 # digitalRead
 snippet dr
 	digitalRead(${1});
+# analogRead
+snippet ar
+	analogRead(${1});
+# analogWrite
+snippet aw
+	analogWrite(${1});
 # serialRead
 snippet sr
-	serialRead();
-# serial.println
+	Serial.read();
+# serialWrite
+snippet sw
+	Serial.write();
+# serial.print
 snippet sp
-	serial.println(${1});
+	Serial.print(${1});
+# serial.println
+snippet sl
+	Serial.println(${1});
 
 
 # delay
 snippet dl
 	delay(${1});
+# millis
+snippet ml
+	millis();
diff --git a/snippets/c.snippets b/snippets/c.snippets
index f4745c25b..e5aa89353 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -104,12 +104,12 @@ snippet ret
 ## Loops
 # for
 snippet for
-	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
+	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
 		${4}
 	}
 # for (custom)
 snippet forr
-	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
+	for (int ${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
 		${5}
 	}
 # while

From 059dd49f819a0cda370f239005ca08c237390315 Mon Sep 17 00:00:00 2001
From: Mauro Porras P <mauroporrasp@gmail.com>
Date: Tue, 11 Oct 2016 09:05:05 -0500
Subject: [PATCH 0902/1587] wip

---
 snippets/{javascript => }/javascript.es6.react.snippets | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename snippets/{javascript => }/javascript.es6.react.snippets (100%)

diff --git a/snippets/javascript/javascript.es6.react.snippets b/snippets/javascript.es6.react.snippets
similarity index 100%
rename from snippets/javascript/javascript.es6.react.snippets
rename to snippets/javascript.es6.react.snippets

From 78652e068f56548b460664f0b715e028fc306fdd Mon Sep 17 00:00:00 2001
From: Mauro Porras P <mauroporrasp@gmail.com>
Date: Tue, 11 Oct 2016 09:43:56 -0500
Subject: [PATCH 0903/1587] Add JavaScript console.info

---
 snippets/javascript/javascript.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 67efaf0a2..0ac0bfb46 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -252,6 +252,9 @@ snippet ce
 # console.warn
 snippet cw
 	console.warn(${0});
+# console.info
+snippet ci
+	console.info(${0});
 # console.trace
 snippet ct
 	console.trace(${0:label});

From 58f76d646a86e6e8e02056293796408e16701a0b Mon Sep 17 00:00:00 2001
From: Andrej Radovic <r.andrej@gmail.com>
Date: Fri, 14 Oct 2016 22:27:22 +0200
Subject: [PATCH 0904/1587] Add visual placeholders to box and bbox

Add a visual placeholder to box and bbox, so you can use them to surround visual selections.
---
 UltiSnips/all.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 8b7079e24..215487ec6 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -18,7 +18,7 @@ snippet box "A nice box with the current comment symbol" b
 box = make_box(len(t[1]))
 snip.rv = box[0]
 snip += box[1]
-`${1:content}`!p
+`${1:${VISUAL:content}}`!p
 box = make_box(len(t[1]))
 snip.rv = box[2]
 snip += box[3]`
@@ -32,7 +32,7 @@ if not snip.c:
 box = make_box(len(t[1]), width)
 snip.rv = box[0]
 snip += box[1]
-`${1:content}`!p
+`${1:${VISUAL:content}}`!p
 box = make_box(len(t[1]), width)
 snip.rv = box[2]
 snip += box[3]`

From dfbf4a20215d8c81487c7e3d1c5a8fceef9eff9d Mon Sep 17 00:00:00 2001
From: Ernest <ernest.rekel@gmail.com>
Date: Tue, 18 Oct 2016 22:09:04 +0300
Subject: [PATCH 0905/1587] Change arrays to short syntax verions

---
 snippets/php.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 064485905..2d9f51524 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -351,8 +351,8 @@ snippet foreachkil "<?php foreach ($var as $key => $value): ?>  ... <?php endfor
 	<?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
 		${0:<!-- html... -->}
 	<?php endforeach; ?>
-snippet array "$... = array(...)"
-	$${1:arrayName} = array('${2}' => ${3});
+snippet array "$... = ['' => ]"
+	$${1:arrayName} = ['${2}' => ${3}];
 snippet try "try { ... } catch (Exception $e) { ... }"
 	try {
 		${0}
@@ -466,7 +466,7 @@ snippet CSVWriter
 				? fopen($file_or_handle, $mode)
 				: $file_or_handle;
 	
-			$this->fputcsv_args = array($this->f, null, $sep, $quot);
+			$this->fputcsv_args = [$this->f, null, $sep, $quot];
 	
 			if (!$this->f) throw new Exception('bad file descriptor');
 		}
@@ -502,7 +502,7 @@ snippet CSVIterator
 			* enclosure
 			* delimiter
 			*/
-		public function __construct( $file_or_handle, $opts = array(4096, ',') )
+		public function __construct( $file_or_handle, $opts = [4096, ','] )
 		{
 			$d = function($n) use(&$opts){ return isset($opts[$n]) ? $opts[$n] : false; };
 	
@@ -515,13 +515,13 @@ snippet CSVIterator
 				? fopen( $file_or_handle, 'r' )
 				: $file_or_handle;
 			if (!$this->f) throw new Exception('bad file descriptor');
-			$this->fgetcsv_args = array(
+			$this->fgetcsv_args = [
 					$this->f,
 					isset($opts['row_size']) ? $opts['row_size'] : 4096,
 					isset($opts['delimiter']) ? $opts['delimiter'] : ',',
 					isset($opts['enclosure']) ? $opts['enclosure'] : '"',
 					isset($opts['escape']) ? $opts['escape'] : '\\',
-			);
+			];
 			$this->start();
 		}
 	

From 04af9c40c189b5bb15e5c4645ec524fa378aa82c Mon Sep 17 00:00:00 2001
From: Ernest <ernest.rekel@gmail.com>
Date: Tue, 18 Oct 2016 22:22:22 +0300
Subject: [PATCH 0906/1587] Change arrays to short syntax for laravel snippet

---
 UltiSnips/php-laravel.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/php-laravel.snippets b/UltiSnips/php-laravel.snippets
index 7367a1471..de2447366 100644
--- a/UltiSnips/php-laravel.snippets
+++ b/UltiSnips/php-laravel.snippets
@@ -121,9 +121,9 @@ class ${2:`!v expand('%:t:r')`} extends \Eloquent {
 
     public $timestamps = ${5:false};
 
-    protected $hidden  = array(${6});
+    protected $hidden  = [${6}];
 
-    protected $guarded = array(${7:'id'});
+    protected $guarded = [${7:'id'}];
 }
 endsnippet
 
@@ -162,7 +162,7 @@ abstract class ${2:`!v expand('%:t:r')`} implements ${3:BaseRepositoryInterface}
      *
      * \return  Illuminate\Database\Eloquent\Collection
      */
-    public function all($columns = array('*')) {
+    public function all($columns = ['*']) {
         return $this->model->all()->toArray();
     }
 
@@ -189,7 +189,7 @@ abstract class ${2:`!v expand('%:t:r')`} implements ${3:BaseRepositoryInterface}
      *
      * \return  mixed
      */
-    public function find($id, $columns = array('*')) {
+    public function find($id, $columns = ['*']) {
         return $this->model->find($id, $columns);
     }
 }

From d0250e15f41fd4de585c2f89c667062ae7712a7a Mon Sep 17 00:00:00 2001
From: Ernest <ernest.rekel@gmail.com>
Date: Tue, 18 Oct 2016 22:25:00 +0300
Subject: [PATCH 0907/1587] Change array to short syntax for symfony2 snippet

---
 UltiSnips/php-symfony2.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php-symfony2.snippets b/UltiSnips/php-symfony2.snippets
index 2b127ee98..9bca168c5 100644
--- a/UltiSnips/php-symfony2.snippets
+++ b/UltiSnips/php-symfony2.snippets
@@ -61,7 +61,7 @@ snippet sfa "Symfony 2 Controller action"
 public function $1Action($2)
 {
 	$3
-	return ${4:array();}$0
+	return ${4:[];}$0
 }
 endsnippet
 

From d92f70a886924f0c9493bee17a0ca863026da567 Mon Sep 17 00:00:00 2001
From: Robin Grindrod <robingrindrod@live.ie>
Date: Wed, 19 Oct 2016 11:00:58 +0530
Subject: [PATCH 0908/1587] Remove unused attributes from HTML table snippet

This removes the border, cellspacing and cellpadding attributes from the
HTML table snippet.

See issue honza/vim-snippets#804
---
 UltiSnips/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 084d9f786..4f4e03bc2 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -258,7 +258,7 @@ snippet style "XHTML <style>" w
 endsnippet
 
 snippet table "XHTML <table>" w
-<table border="${1:0}"${2: cellspacing="${3:5}" cellpadding="${4:5}"}>
+<table>
 	${0:${VISUAL}}
 </table>
 endsnippet

From be9330ddeac5541da37ea80e0fa23686cf1253d1 Mon Sep 17 00:00:00 2001
From: Anne Douwe Bouma <annedouwebouma@gmail.com>
Date: Tue, 25 Oct 2016 16:54:40 +0200
Subject: [PATCH 0909/1587] Update html.snippets

Add a responsive viewport meta line.
---
 UltiSnips/html.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 4f4e03bc2..026985cba 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -317,4 +317,8 @@ snippet movie "Embed QT movie (movie)" b
 	`!p x(snip)`>
 </object>
 endsnippet
+
+snippet viewport "Responsive viewport meta" w
+<meta name="viewport" content="width=device-width, initial-scale=1">
+endsnippet
 # vim:ft=snippets:

From d247344bed8aca041e28571ce32307c37dd28eae Mon Sep 17 00:00:00 2001
From: Michael Hinrichs <michaelghinrichs@gmail.com>
Date: Tue, 25 Oct 2016 08:16:19 -0700
Subject: [PATCH 0910/1587] Add Proptypes and Default Props

I believe these are important to have, as proptypes and default props should be something that is defined on every component.
---
 snippets/javascript.es6.react.snippets | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/snippets/javascript.es6.react.snippets b/snippets/javascript.es6.react.snippets
index b83f63cbb..91d7a5e66 100644
--- a/snippets/javascript.es6.react.snippets
+++ b/snippets/javascript.es6.react.snippets
@@ -4,7 +4,7 @@ snippet ri1
 
 # Import both React and Component
 snippet ri2
-	import React, { Component } from 'react'
+	import React, { Component, PropTypes } from 'react'
 
 # React class
 snippet rcla
@@ -26,6 +26,18 @@ snippet rcon
 		}
 	}
 
+# Proptypes for React Class
+snippet rcpt
+	static propTypes = {
+		${1:prop}: PropType.${0:type}
+	}
+
+# Default props for React Class
+snipet rcdp
+	static defaultProps = {
+		${1:prop}: ${0:'value'}
+	}
+
 # Presentational component
 snippet rcom
 	(props) => {
@@ -33,6 +45,17 @@ snippet rcom
 			${0:<div></div>}
 		)
 	}
+# Proptypes for Presentational component
+snippet rpt
+	${1}.propTypes = {
+		${2:prop}: PropType.${0:type}
+	}
+
+# Default props for Presentational component
+snippet rdp
+	${1}.defaultProps = {
+		${2:prop}: ${0:'value'}
+	}
 
 # Lifecycle Methods
 snippet rcdm

From 5b35043a9503e664e526b53fcbb4ff6b8f536890 Mon Sep 17 00:00:00 2001
From: Michael Hinrichs <michaelghinrichs@gmail.com>
Date: Tue, 25 Oct 2016 08:21:26 -0700
Subject: [PATCH 0911/1587] Spelling and trailing comma

---
 snippets/javascript.es6.react.snippets | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/snippets/javascript.es6.react.snippets b/snippets/javascript.es6.react.snippets
index 91d7a5e66..08e772e63 100644
--- a/snippets/javascript.es6.react.snippets
+++ b/snippets/javascript.es6.react.snippets
@@ -29,13 +29,13 @@ snippet rcon
 # Proptypes for React Class
 snippet rcpt
 	static propTypes = {
-		${1:prop}: PropType.${0:type}
+		${1:prop}: PropTypes.${0:type},
 	}
 
 # Default props for React Class
-snipet rcdp
+snippet rcdp
 	static defaultProps = {
-		${1:prop}: ${0:'value'}
+		${1:prop}: ${0:'value'},
 	}
 
 # Presentational component
@@ -45,16 +45,17 @@ snippet rcom
 			${0:<div></div>}
 		)
 	}
+
 # Proptypes for Presentational component
 snippet rpt
 	${1}.propTypes = {
-		${2:prop}: PropType.${0:type}
+		${2:prop}: PropTypes.${0:type},
 	}
 
 # Default props for Presentational component
 snippet rdp
 	${1}.defaultProps = {
-		${2:prop}: ${0:'value'}
+		${2:prop}: ${0:'value'},
 	}
 
 # Lifecycle Methods

From a6730679c563fd1f94adae9f6a450e9ef134991c Mon Sep 17 00:00:00 2001
From: Anne Douwe Bouma <annedouwebouma@gmail.com>
Date: Tue, 25 Oct 2016 17:23:50 +0200
Subject: [PATCH 0912/1587] Update html.snippets

Responsive viewport snippet for snipmate
---
 snippets/html.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 5ae8e749d..85d0e526c 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -875,3 +875,5 @@ snippet video
 	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>
 snippet wbr
 	<wbr />
+snippet viewport
+	<meta name="viewport" content="width=device-width, initial-scale=1">

From b3d631d66ae3600b3988194b27686106b0f39c11 Mon Sep 17 00:00:00 2001
From: Michael Hinrichs <michaelghinrichs@gmail.com>
Date: Tue, 25 Oct 2016 08:29:14 -0700
Subject: [PATCH 0913/1587] Remove initial values that do nothing

---
 snippets/javascript.es6.react.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/javascript.es6.react.snippets b/snippets/javascript.es6.react.snippets
index 08e772e63..0762eb6bd 100644
--- a/snippets/javascript.es6.react.snippets
+++ b/snippets/javascript.es6.react.snippets
@@ -29,13 +29,13 @@ snippet rcon
 # Proptypes for React Class
 snippet rcpt
 	static propTypes = {
-		${1:prop}: PropTypes.${0:type},
+		${1}: PropTypes.${0},
 	}
 
 # Default props for React Class
 snippet rcdp
 	static defaultProps = {
-		${1:prop}: ${0:'value'},
+		${1}: ${0},
 	}
 
 # Presentational component
@@ -49,13 +49,13 @@ snippet rcom
 # Proptypes for Presentational component
 snippet rpt
 	${1}.propTypes = {
-		${2:prop}: PropTypes.${0:type},
+		${2}: PropTypes.${0},
 	}
 
 # Default props for Presentational component
 snippet rdp
 	${1}.defaultProps = {
-		${2:prop}: ${0:'value'},
+		${2}: ${0},
 	}
 
 # Lifecycle Methods

From f0e0ff135d9edf951a2ef573995975cd3b51085a Mon Sep 17 00:00:00 2001
From: tyronepost <tyrone.post.a@gmail.com>
Date: Tue, 25 Oct 2016 20:51:36 -0400
Subject: [PATCH 0914/1587] adding dfp snippet to elixir snippets

---
 snippets/elixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 46ac7c861..942fc20df 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -88,6 +88,8 @@ snippet defmo
 	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		${0}
 	end
+snippet dfp
+	defp ${1:name}, do: ${2}
 snippet defp
 	defp ${1:name} do
 		${0}

From bc55bec4e0f9ddb00161a6cc81bb8d3c8e20a5ad Mon Sep 17 00:00:00 2001
From: Igor Goldvekht <goldvekht.igor@gmail.com>
Date: Thu, 27 Oct 2016 01:40:48 -0400
Subject: [PATCH 0915/1587] Update gdp, gis, and pt to ES6 style

---
 snippets/javascript/javascript-react.snippets | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index 579adb325..9deae796c 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -28,21 +28,17 @@ snippet cwu
 	}
 snippet fup
 	forceUpdate(${1:callback});
-snippet gdp
-	getDefaultProps() {
-		return {
-			${1}
-		};
+snippet dp
+	static defaultProps = {
+		${1}: ${2},
 	}
-snippet gis
-	getInitialState() {
-		return {
-			${1}: ${2}
-		};
+snippet st
+	state = {
+		${1}: ${2},
 	}
 snippet pt
-	propTypes: {
-		${1}: React.PropTypes.${2:string}
+	static propTypes = {
+		${1}: React.PropTypes.${2:type},
 	}
 snippet rcc
 	class ${1:ClassName} extends React.Component {

From 44d4fd4c40a9979e799a58e4de3e554f949d37c9 Mon Sep 17 00:00:00 2001
From: Michael Hinrichs <michaelghinrichs@gmail.com>
Date: Thu, 27 Oct 2016 09:12:16 -0700
Subject: [PATCH 0916/1587] add xit

---
 snippets/javascript-mocha.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/javascript-mocha.snippets b/snippets/javascript-mocha.snippets
index f08bf8490..cabfd401d 100644
--- a/snippets/javascript-mocha.snippets
+++ b/snippets/javascript-mocha.snippets
@@ -6,6 +6,10 @@ snippet it "it" b
 	it('${1:}', () => {
 		${0}
 	});
+snippet xit "xit" b
+	xit('${1:}', () => {
+		${0}
+	});
 snippet exp "expect" b
 	expect(${1:})${0};
 snippet expe "expect" b

From 4329242bbd06ed72d36ab11e7398b8d54ffbe54d Mon Sep 17 00:00:00 2001
From: Trevor Sullivan <trevor.sullivan@clusterhq.com>
Date: Fri, 28 Oct 2016 02:48:56 +0000
Subject: [PATCH 0917/1587] Initial commit for PowerShell snippets

---
 snippets/powershell.snippets | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 snippets/powershell.snippets

diff --git a/snippets/powershell.snippets b/snippets/powershell.snippets
new file mode 100644
index 000000000..ecfba10cd
--- /dev/null
+++ b/snippets/powershell.snippets
@@ -0,0 +1,34 @@
+# Snippets for 
+# Authored by Trevor Sullivan <trevor@trevorsullivan.net>
+
+# PowerShell Class
+snippet class
+	class {
+	  [string] ${0:FirstName}
+	}
+
+# PowerShell Advanced Function 
+snippet function
+	function {0:name} {
+	  [CmdletBinding()]
+	  param (
+	    [Parameter(Mandatory = $true)]
+	    [string] $Param1
+	  )
+
+	  begin {
+	  }
+
+	  process {
+	  }
+
+	  end {
+	  }
+	}
+
+# PowerShell Splatting
+	$Params = @{
+	  ${0:Param1} = 'Value1'
+	  ${1:Param2} = 'Value2'
+	}
+	${3:CommandName}

From 6d4e8f5391586646aa4fd710be6e548205c7356d Mon Sep 17 00:00:00 2001
From: jiangyc0 <jiangyc0@qq.com>
Date: Fri, 28 Oct 2016 16:00:42 +0800
Subject: [PATCH 0918/1587] update java.snippets add snippets: psvm add
 snippets: sout add snippets: serr

---
 snippets/java.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index e40bbf523..39cc850ad 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -214,12 +214,20 @@ snippet wh
 	while (${1}) ${0}
 ##
 ## Main method
+snippet psvm
+	public static void main (String[] args) {
+		${0}
+	}
 snippet main
 	public static void main (String[] args) {
 		${0}
 	}
 ##
 ## Print Methods
+snippet sout
+	System.out.println(${0});
+snippet serr
+	System.err.println(${0});
 snippet print
 	System.out.print("${0:Message}");
 snippet printf

From 26c5b4bb9184c485404db61c12db0ca3e6f332f8 Mon Sep 17 00:00:00 2001
From: Trevor Sullivan <trevor.sullivan@clusterhq.com>
Date: Fri, 28 Oct 2016 17:32:45 +0000
Subject: [PATCH 0919/1587] Added PowerShell snippets

---
 snippets/powershell.snippets | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/snippets/powershell.snippets b/snippets/powershell.snippets
index ecfba10cd..4460c36a2 100644
--- a/snippets/powershell.snippets
+++ b/snippets/powershell.snippets
@@ -27,8 +27,32 @@ snippet function
 	}
 
 # PowerShell Splatting
+snippet splatting
 	$Params = @{
 	  ${0:Param1} = 'Value1'
 	  ${1:Param2} = 'Value2'
 	}
 	${3:CommandName}
+
+# PowerShell Enumeration
+snippet enum
+	enum ${0:name} {
+	  ${1:item1}
+	  ${2:item2}
+	}
+
+# PowerShell if..then
+snippet if
+	if (${0:condition}) {
+	  ${1:statement}
+	}
+
+# PowerShell While Loop
+snippet while
+ 	while (${0:condition}) {
+ 	  ${1:statement}
+ 	}
+
+# PowerShell Filter..Sort
+snippet filtersort
+	${0:command} | Where-Object -FilterScript { $PSItem.${1:property} -${2:operator} '${3:expression}' } | Sort-Object -Property ${4:sortproperty}

From 6c9369894b62d24f8beeea4df24bd466885809b3 Mon Sep 17 00:00:00 2001
From: Trevor Sullivan <trevor.sullivan@clusterhq.com>
Date: Fri, 28 Oct 2016 17:37:10 +0000
Subject: [PATCH 0920/1587] Fix for Travis complaining about indentation with
 spaces

---
 snippets/powershell.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/powershell.snippets b/snippets/powershell.snippets
index 4460c36a2..cf6ea6f04 100644
--- a/snippets/powershell.snippets
+++ b/snippets/powershell.snippets
@@ -49,9 +49,9 @@ snippet if
 
 # PowerShell While Loop
 snippet while
- 	while (${0:condition}) {
+	while (${0:condition}) {
  	  ${1:statement}
- 	}
+	}
 
 # PowerShell Filter..Sort
 snippet filtersort

From 2485a7546417d3f01a264960d90dd75d8c0e614c Mon Sep 17 00:00:00 2001
From: Trevor Sullivan <trevor.sullivan@clusterhq.com>
Date: Fri, 28 Oct 2016 17:43:19 +0000
Subject: [PATCH 0921/1587] Fixed more whitespace indents

---
 snippets/powershell.snippets | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/snippets/powershell.snippets b/snippets/powershell.snippets
index cf6ea6f04..acab10cc3 100644
--- a/snippets/powershell.snippets
+++ b/snippets/powershell.snippets
@@ -4,53 +4,53 @@
 # PowerShell Class
 snippet class
 	class {
-	  [string] ${0:FirstName}
+		[string] ${0:FirstName}
 	}
 
 # PowerShell Advanced Function 
 snippet function
 	function {0:name} {
-	  [CmdletBinding()]
-	  param (
-	    [Parameter(Mandatory = $true)]
-	    [string] $Param1
-	  )
+		[CmdletBinding()]
+		param (
+			[Parameter(Mandatory = $true)]
+			[string] $Param1
+		)
 
-	  begin {
-	  }
+		begin {
+		}
 
-	  process {
-	  }
+		process {
+		}
 
-	  end {
-	  }
+		end {
+		}
 	}
 
 # PowerShell Splatting
 snippet splatting
 	$Params = @{
-	  ${0:Param1} = 'Value1'
-	  ${1:Param2} = 'Value2'
+		${0:Param1} = 'Value1'
+		${1:Param2} = 'Value2'
 	}
 	${3:CommandName}
 
 # PowerShell Enumeration
 snippet enum
 	enum ${0:name} {
-	  ${1:item1}
-	  ${2:item2}
+		${1:item1}
+		${2:item2}
 	}
 
 # PowerShell if..then
 snippet if
 	if (${0:condition}) {
-	  ${1:statement}
+		${1:statement}
 	}
 
 # PowerShell While Loop
 snippet while
 	while (${0:condition}) {
- 	  ${1:statement}
+		${1:statement}
 	}
 
 # PowerShell Filter..Sort

From 184f992f4fe36be4462d1ab6b27feefb6f66d106 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Wed, 2 Nov 2016 05:01:21 +0000
Subject: [PATCH 0922/1587] Add C variable printf debug snippets

---
 snippets/c.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index e5aa89353..524b5b866 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -164,6 +164,12 @@ snippet pr
 # fprintf (again, this isn't as nice as TextMate's version, but it works)
 snippet fpr
 	fprintf(${1:stderr}, "${2:%s}\n"${3});
+snippet prd
+	printf("${1:} = %d\n", $1);
+snippet prf
+	printf("${1:} = %f\n", $1);
+snippet prx
+	printf("${1:} = %${2}\n", $1);
 # getopt
 snippet getopt
 	int choice;

From 52c5cbcbcb2fdd9cacc7c6628e9d10a4d93e3662 Mon Sep 17 00:00:00 2001
From: Vladislav Khvostov <vladkhvo@gmail.com>
Date: Thu, 3 Nov 2016 01:41:17 +0300
Subject: [PATCH 0923/1587] Update stylus.snippets

---
 snippets/stylus.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/stylus.snippets b/snippets/stylus.snippets
index 3f54f7818..3ce35c269 100644
--- a/snippets/stylus.snippets
+++ b/snippets/stylus.snippets
@@ -993,3 +993,7 @@ snippet for
 	for ${1:i} in ${0}
 snippet keyf
 	@keyframes ${0}
+snippet jc:c
+	justify-content center
+snippet jc
+	justify-content

From 6d3911f4c1a0ffc6030274eb21440bf7657805d2 Mon Sep 17 00:00:00 2001
From: Trevor Sullivan <pcgeek86@gmail.com>
Date: Thu, 3 Nov 2016 00:23:40 -0600
Subject: [PATCH 0924/1587] Rename powershell.snippets to ps1.snippets

This file rename is intended to make this project consistent with the vim-ps1 project on GitHub. They use a Vim filetype of `ps1` to identify PowerShell script files. This snippet is only useful if the filename matches the filetype of the vim-ps1 project.
---
 snippets/{powershell.snippets => ps1.snippets} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename snippets/{powershell.snippets => ps1.snippets} (100%)

diff --git a/snippets/powershell.snippets b/snippets/ps1.snippets
similarity index 100%
rename from snippets/powershell.snippets
rename to snippets/ps1.snippets

From 0b17f2c17efc9884de96a07640a82b8cc0e9cd06 Mon Sep 17 00:00:00 2001
From: Craig Paterson <craig@widdershins.co.za>
Date: Sat, 5 Nov 2016 15:07:40 +0200
Subject: [PATCH 0925/1587] Add snippet for elixir @doc false

---
 snippets/elixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 942fc20df..058f986c5 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -102,6 +102,8 @@ snippet doc
 	@doc """
 	${0}
 	"""
+snippet docf
+	@doc false
 snippet fn
 	fn ${1:args} -> ${0} end
 snippet mdoc

From b780548a61a9d77f8e36ae690e4d3fab22f05317 Mon Sep 17 00:00:00 2001
From: Vladislav Khvostov <vladkhvo@gmail.com>
Date: Thu, 10 Nov 2016 17:44:53 +0300
Subject: [PATCH 0926/1587] Update javascript.node.snippets

Modern es fix
---
 snippets/javascript/javascript.node.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.node.snippets b/snippets/javascript/javascript.node.snippets
index 2b5aefb40..489e0abba 100644
--- a/snippets/javascript/javascript.node.snippets
+++ b/snippets/javascript/javascript.node.snippets
@@ -5,7 +5,7 @@ snippet ex
 	module.exports = ${1};
 # require
 snippet re
-	${1:var} ${2} = require('${3:module_name}');
+	${1:const} ${2} = require('${3:module_name}');
 # EventEmitter
 snippet on
 	on('${1:event_name}', function(${2:stream}) {

From 491df432684ab3dc649e06b5e765b8aaad230dea Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Tue, 15 Nov 2016 11:31:07 +0000
Subject: [PATCH 0927/1587] If snippets for Handlebars

---
 snippets/handlebars.snippets | 14 ++++++++++++++
 snippets/mustache.snippets   |  9 +++------
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 snippets/handlebars.snippets

diff --git a/snippets/handlebars.snippets b/snippets/handlebars.snippets
new file mode 100644
index 000000000..d1ab0f036
--- /dev/null
+++ b/snippets/handlebars.snippets
@@ -0,0 +1,14 @@
+snippet if # {{#if value}} ... {{/if}}
+	{{#if ${1:value}}}
+	${0}
+	{{/if}}
+snippet ifn # {{#unless value}} ... {{/unless}}
+	{{#unless ${1:value}}}
+	${0}
+	{{/unless}}
+snippet ife # {{#if value}} ... {{else}} .. {{/if}}
+	{{#if ${1:value}}}
+	${2}
+	{{else}}
+	${3}
+	{{/if}}
diff --git a/snippets/mustache.snippets b/snippets/mustache.snippets
index 8296afcb9..ad8723eda 100644
--- a/snippets/mustache.snippets
+++ b/snippets/mustache.snippets
@@ -1,15 +1,12 @@
-# if {{#value}} ... {{/value}}
-snippet if
+snippet if # {{#value}} ... {{/value}}
 	{{#${1:value}}}
 	${0}
 	{{/$1}}
-# if not {{^value}} ... {{/value}}
-snippet ifn
+snippet ifn # {{^value}} ... {{/value}}
 	{{^${1:value}}}
 	${0}
 	{{/$1}}
-# if else {{#value}} ... {{/value}} {{^value}} ... {{/value}}
-snippet ife
+snippet ife # {{#value}} ... {{/value}} {{^value}} ... {{/value}}
 	{{#${1:value}}}
 	${2}
 	{{/$1}}

From fcbccd48d526241d902c29143ea66c95e58c2447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20D=C3=A9saulniers?= <sim.desaulniers@gmail.com>
Date: Wed, 16 Nov 2016 08:40:46 -0500
Subject: [PATCH 0928/1587] ultisnips.py: add fast def snippet

---
 UltiSnips/python.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index fa3ff8b98..5d8e26410 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -486,6 +486,11 @@ def __coerce__(self, other):
 	${25:pass}
 endsnippet
 
+snippet deff
+def ${1:fname}(`!p snip.rv = vim.eval('indent(".") ? "self" : ""')`$2):
+	$0
+endsnippet
+
 snippet def "function with docstrings" b
 def ${1:function}(`!p
 if snip.indent:

From e3567ee8aaf61dd383d7a54533e594144d66135d Mon Sep 17 00:00:00 2001
From: midchildan <midchildan+git@gmail.com>
Date: Thu, 24 Nov 2016 14:03:26 +0900
Subject: [PATCH 0929/1587] Add cuda.snippets.

---
 UltiSnips/cuda.snippets | 5 +++++
 snippets/cuda.snippets  | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 UltiSnips/cuda.snippets
 create mode 100644 snippets/cuda.snippets

diff --git a/UltiSnips/cuda.snippets b/UltiSnips/cuda.snippets
new file mode 100644
index 000000000..2a9a7e5ef
--- /dev/null
+++ b/UltiSnips/cuda.snippets
@@ -0,0 +1,5 @@
+priority -50
+
+extends cpp
+
+# vim:ft=snippets:
diff --git a/snippets/cuda.snippets b/snippets/cuda.snippets
new file mode 100644
index 000000000..425ca67f1
--- /dev/null
+++ b/snippets/cuda.snippets
@@ -0,0 +1 @@
+extends cpp

From f5ba6cddc8cb1e7d87363ff36ad3cefc9e573e01 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.deangelis@hotmail.it>
Date: Sat, 26 Nov 2016 21:45:12 +0100
Subject: [PATCH 0930/1587] Corrections to Fortran snippets (#783)

* Some correction

* Necessary corrections to if and do constructs

I'm trying to make separate branches for commits related to different snippet files. This commit only affects fortra.snippets.

* A modification to arr snippet

Modified the arr snippets for array in such a way that the second tabstop can be used to remove the allocatable attribute.

* Fixed the tabular snippet

Corrected the tabular snippet (also the one in the table snippet) in order to get the correct number of ampersands even for a non-central first column
---
 UltiSnips/tex.snippets    |  4 ++--
 snippets/fortran.snippets | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 4c7e44b45..f43de5ee0 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -10,7 +10,7 @@ endsnippet
 
 snippet tab "tabular / array environment" b
 \begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
-$0${2/((?<=.)c|l|r)|./(?1: & )/g}
+$0${2/(?<=.)(c|l|r)|./(?1: & )/g}
 \end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 endsnippet
 
@@ -20,7 +20,7 @@ snippet table "Table environment" b
 	\caption{${2:caption}}
 	\label{tab:${3:label}}
 	\begin{${4:t}${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${5:c}}
-	$0${5/((?<=.)c|l|r)|./(?1: & )/g}
+	$0${5/(?<=.)(c|l|r)|./(?1: & )/g}
 	\end{$4${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 \end{table}
 endsnippet
diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
index c9ab0602e..112a12014 100644
--- a/snippets/fortran.snippets
+++ b/snippets/fortran.snippets
@@ -49,7 +49,7 @@ snippet type
 snippet const
 	${1:type}, parameter :: $2 = $0
 snippet arr
-	${1:type}, allocatable, dimension(${2::}) :: $0
+	${1:type}, ${2:allocatable, }dimension(${3::}) :: $0
 snippet intent
 	${1:type}, intent(inout) :: $0
 # Array
@@ -57,7 +57,7 @@ snippet /
 	(/ $1 /) ${2:,&} $0
 snippet if
 	if (${1:condition}) then
-		$2
+		$0
 	end if
 snippet case
 	select case (${1:expr})
@@ -66,8 +66,8 @@ snippet case
 			$3
 	end select $0
 snippet do
-	do ${1:i} = ${2:start},${3:end}, ${4:incr}
-		$4
+	do ${1:i} = ${2:start}, ${3:end}, ${4:incr}
+		$0
 	end do
 snippet dow
 	do while (${1:condition})
@@ -84,10 +84,10 @@ snippet func
 snippet pr
 	write(*,*) $0
 snippet read
-	read( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0
+	read(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0
 snippet write
-	write( unit = ${1:fp}, file = ${2:filename}${3:, iostat = IERR }) $0
+	write(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0
 snippet open
-	open (unit = ${1:fp}, file = ${2:filename}, status = unknown${3:, iostat = IERR }) $0
+	open(unit = ${1:fp}, file = ${2:filename}, status = ${3:unknown}, iostat = ${4:ierr}) $0
 snippet close
-	close ( unit = ${1:fp} ) $0
+	close(unit = ${1:fp}) $0

From 751c1ab90eb130fa30d99cac1dc91f809b4dc2c0 Mon Sep 17 00:00:00 2001
From: Tyrone Post <tyrone.post.a@gmail.com>
Date: Sun, 27 Nov 2016 20:19:54 -0500
Subject: [PATCH 0931/1587] full test name highlighted for change (#826)

---
 snippets/rails.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index e83422227..6a5c5ff0e 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -325,7 +325,7 @@ snippet xpost
 snippet xput
 	xhr :put, :${1:update}, id: ${2:1}, ${3:object}: ${4:object}
 snippet test
-	test 'should ${1:do something}' do
+	test '${1:should do something}' do
 		${0}
 	end
 ###########################

From f19b011ca2a6735f61d185bb14f333070b48b823 Mon Sep 17 00:00:00 2001
From: Johannes Wienke <languitar@semipol.de>
Date: Mon, 28 Nov 2016 13:30:33 +0100
Subject: [PATCH 0932/1587] Indent LaTeX blocks

Consistently indent block contents in LaTeX.
---
 snippets/tex.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 68ac5d056..c37c138ae 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -264,15 +264,15 @@ snippet frame frame environment
 	\end{frame}
 snippet block block environment
 	\begin{block}{${1:title}}
-	${0:${VISUAL}}
+		${0:${VISUAL}}
 	\end{block}
 snippet alert alertblock environment
 	\begin{alertblock}{${1:title}}
-	${0:${VISUAL}}
+		${0:${VISUAL}}
 	\end{alertblock}
 snippet example exampleblock environment
 	\begin{exampleblock}{${1:title}}
-	${0:${VISUAL}}
+		${0:${VISUAL}}
 	\end{exampleblock}
 snippet col2 two-column environment
 	\begin{columns}

From 241a13497aea866078d4005e316ebdae7e4641cb Mon Sep 17 00:00:00 2001
From: Honza Pokorny <honza@redhat.com>
Date: Mon, 28 Nov 2016 15:29:57 -0400
Subject: [PATCH 0933/1587] Add AUTHORS file

---
 AUTHORS | 383 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 383 insertions(+)
 create mode 100644 AUTHORS

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 000000000..907daef1e
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,383 @@
+Authors
+===============================================================================
+
+Generated with "git log --oneline --pretty="%an" | sort | uniq > AUTHORS
+
+Aaron Broder
+Adnan Zafar
+afolmert
+aisensiy
+Alexander Ross
+Alexandre de Oliveira
+Alexey Shevchenko
+Alex Tan
+Allen.M
+Alvin Chan
+ALX-Liu-Xiao
+Andrea Giardini
+Andreas Krennmair
+Andreas Steinel
+Andrei Cristian Petcu
+Andrej Radovic
+Andre Walker
+Andrey Paskal
+Andy Waite
+Angel Alonso
+Ángel Alonso
+Anne Douwe Bouma
+Anthony Wilson
+Arvind
+ashfinal
+Audrius Kažukauskas
+Austin Wood
+Aydar Khabibullin
+babybeasimple
+Benjamin Nørgaard
+Bernhard Graf
+Bill Casarin
+binaryplease
+Björn
+Björn-Egil Dahlberg
+BlackEagle
+Boone Severson
+bounceme
+Bradlee Speice
+Brandon Dulaney
+Brandon Hilkert
+Brian Hogan
+Brian van Burken
+Bruno Sutic
+Camilo Payan
+carme
+Cézar Antáres
+Chad Paradis
+Chen Zhongzheng
+Ches Martin
+ChickenNuggers
+Chipairon
+Chris Dueck
+Chris Nicola
+Chris Sims
+Christian
+Christian Höltje
+Christian Neumüller
+Christopher Joslyn
+chrisyue
+Ciro Santilli
+Ciro Santilli 六四事件 法轮功
+Claudio Maradonna
+Connor Atherton
+Cooper LeBrun
+Corentin Peuvrel
+Craig Paterson
+Craig P Jolicoeur
+crazymaster
+daa84
+Daeyun Shin
+Dale Roberts
+Daniel Hahler
+Dan Loewenherz
+Danny Navarro
+daoo
+Darrell Hamilton
+David Arvelo
+David Barnett
+David C. Bishop
+David Deryl Downey - AKA Deryl R. Doucette
+David Rodríguez de Dios
+David Sanson
+dengyaolong
+Derek Morey
+dhilipsiva
+djdt
+Dmitry Dementev
+Donny Yang
+DSIW
+dzikie drożdże
+Eduardo Gurgel
+Eli Gundry
+emzap79
+Enric Lluelles
+Enrico Maria De Angelis
+Erich Heine
+Erik Westrup
+Ernest
+Eugene Kalinin
+Eustaquio Rangel
+Eustáquio Rangel
+Fatih Arslan
+Felix Jung
+Filipe Giusti
+Florent Lévigne
+Florian Sattler
+frans
+Fuad Saud
+Gabriel Chavez
+Gaël Chamoulaud
+Gea-Suan Lin
+George Guimarães
+George Lee
+Georgios Samaras
+Gert
+gfixler
+Gilad Peleg
+gk
+goonnow
+Gueunet Charles
+Gui Lin
+guneysus
+Gustavo Chain
+Gustavo Ferreira
+Hans-Guenter
+Harald Wartig
+Henrik Kjelsberg
+HIRAKI Satoru
+Holger Rapp
+Honza
+Honza Pokorny
+hulufei
+Igor Goldvekht
+Ilker Cetinkaya
+indi
+Indra Susila
+Ionică Bizău
+Iuri Fernandes
+Jack Stalnaker
+Jacobo de Vera
+Jacques Kvam
+jake romer
+Jakub Stasiak
+James Turley
+Jan Mollowitz
+Jason S. Jones
+Jean Jordaan
+Jeffrey Tratner
+Jens Hoepken
+jiangyc0
+Jim Deville
+Jinzhu
+Joey Curtin
+Johannes Wienke
+jonasac
+Jonas Bygdén
+Jonathan Martin
+Jorge García
+Jorge López Pérez
+Joseph Lin
+Josh Bode
+Josh Davis
+Josh Matthews
+Josh Vandergrift
+Josh Wainwright
+JuanPablo
+Julian Bennecker
+Julien Deniau
+Julien Pivard
+Julien Stechele
+Julien STECHELE
+Kalinin Eugene
+kenshin54
+Kentaro Imai
+Kevin Koltz
+Kevin Lui
+Kevin Mees
+Kevin Murray
+Kevin Schaul
+Konstantin
+Konstantin Gorodinskiy
+Laas Toom
+Laurent Georget
+laxtiz
+Leandro Moreira
+Leonardo B
+Leonidez Acosta
+linduxed
+Li Xin
+Louis
+Louis Pilfold
+Lucas Hoffmann
+Luis Carlos Cruz
+Luis Carlos Cruz Carballo
+Luiz Gonzaga dos Santos Filho
+majjoha
+mangege
+Marc Camuzat
+Marcelo D Montu
+Marcelo Jacobus
+Marcin Kulik
+Marcus Kammer
+Marc Weber
+Mario de Frutos
+Markus Benning
+marocchino
+Martin Atukunda
+Martin Heuschober
+Martxel Lasa
+Matěj Cepl
+Mathew Attlee
+Mathieu Comandon
+Matthew Barry
+Matthias Viehweger
+Mattia Tezzele
+Matt Rasband
+Matt Stevens
+Mauro Porras P
+Maximiliano Robaina
+Mayeu (Cast)
+Meng Zhuo
+Michael Gehring
+Michael Hinrichs
+Michael Rutter
+Michael Thessel
+Michi Huber
+Mickey
+midchildan
+Mike Foley
+Mike Smullin
+Miki Tebeka
+Minjong Chung
+M. Maxwell Watson
+mMontu
+mockturtl
+m-pilia
+Muhammad Hallaj Subery
+mwcz
+Namit
+Nan Cloudio Jiang
+Nan Zheng
+Nate Mara
+netei
+Ngo The Trung
+Nguyen Le
+Nick Janetakis
+Nicklasos
+Nick Papanastasiou
+Nicolas G. Querol
+Nico Suhl
+No Ducks
+Norman Messtorff
+obaoba
+oddlydrawn
+Oleg Voronkovich
+Ole Hansen
+Oliver Andrich
+Ondrej Slinták
+onemanstartup
+opennota
+Paco Esteban
+Panagiotis Mavrogiorgos
+Paolo Cretaro
+Pascal
+Paulo Romeira
+Pawel Jankowski
+phcerdan
+Philippe Mongeau
+Philipp Jovanovic
+Piotr Jawniak
+Piotr Yordanov
+Pirogov Evgenij
+Pompeu
+Povilas Balzaravicius Pawka
+Procras
+protream
+pydave
+r4d2
+Radosław Szymczyszyn
+Ralph-Wang
+Raül Torralba
+raydeal
+rcolombo
+Rekky
+René
+Rene Vergara
+Renzo Poddighe
+Reyes Yang
+ricardogcolombo
+Ricardo Jesus
+Rich Layte
+Roberto Miranda
+robin
+Robin Grindrod
+Rok Garbas
+Roland Sommer
+Rory McNamara
+rsw0x
+rtorralba
+Ruben Vereecken
+Ryan Bright
+Ryan Pineo
+Ryan Wang
+Sam Shepherd
+Santiago Gallego
+sasidhar-d
+Sathors
+Sebastian Röder
+Sebastian Wiesner
+Sergey Lebedev
+Sergey Zasenko
+Serhiy Oplakanets
+SevereOverfl0w
+Simeon F. Willbanks
+Simeon Willbanks
+Simon Désaulniers
+sirex
+skv
+Sokovikov
+Srijan Choudhary
+Steeve
+stefan
+Stephen Tudor
+Stephen Woods
+Steve Brown
+Steven Humphrey
+Steven Oliver
+Stuart Grimshaw
+Sudar
+¨switch87¨
+Tevin Zhang
+theocrite
+Thiago de Arruda
+Thomas Duerr
+Thomas Szymanski
+tinyladi
+Tobias Witt
+Tobie Warburton
+Tomasz Wisniewski
+Tom Vincent
+Tony
+Tony Narlock
+toogley
+Torbjørn Vatn
+tormaroe
+ToruIwashita
+Travis Holton
+Trevor Sullivan
+troydm
+tUrG0n
+twabiko
+Tyler Ball
+tyronepost
+Tyrone Post
+Vadim Khohlov
+Vincent Hsu
+Vladimir Rybas
+Vladislav Khvostov
+Vorzard
+Vzaa
+Waldecir Santos
+Wildsky Fann
+William Ma
+William Travis Holton
+X4fyr
+xz.zhang
+Yamamoto Yuji
+Yannick Brehon
+yerv000
+Yike Lu
+yuhuanbo
+Yu Huanbo
+Yves Lange
+yvhn
+zauguin
+Zaven Muradyan
+ZPH

From 37edc670de0cf0bb6c2881a1e8e1764e146f2785 Mon Sep 17 00:00:00 2001
From: "Fabian Nick (bromwich)" <fabian.nick@scai.fraunhofer.de>
Date: Wed, 30 Nov 2016 18:14:43 +0100
Subject: [PATCH 0934/1587] Doxygen subroutine documentation snippet for
 fortran.

---
 snippets/fortran.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
index 112a12014..8fecd3307 100644
--- a/snippets/fortran.snippets
+++ b/snippets/fortran.snippets
@@ -26,6 +26,11 @@ snippet doc
 	! Description: $1
 	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 	$0
+snippet dox
+	!> @brief ${1}
+	!> ${2}
+	!> @author `g:snips_author`
+	${0}
 # Variables definitions
 # Boolean
 snippet bool

From 517ce075b087de5c2c322dcf75dd66670f4e7707 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Sat, 10 Dec 2016 15:04:24 +0000
Subject: [PATCH 0935/1587] ES6 snippets for import * and import { member }

---
 snippets/javascript/javascript.es6.snippets | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
index 16e463282..a1adedef4 100644
--- a/snippets/javascript/javascript.es6.snippets
+++ b/snippets/javascript/javascript.es6.snippets
@@ -2,8 +2,12 @@ snippet const
 	const ${1} = ${0};
 snippet let
 	let ${1} = ${0};
-snippet im
-	import ${1} from '${0}';
+snippet im "import xyz from 'xyz'"
+	import ${1} from '${2:$1}';
+snippet imas "import * as xyz from 'xyz'"
+	import * as ${1} from '${2:$1}';
+snippet imm "import { member } from 'xyz'"
+	import { ${1} } from '${2}';
 snippet cla
 	class ${1} {
 		${0}
@@ -18,9 +22,8 @@ snippet clac
 			${0}
 		}
 	}
-# For of loop
-snippet foro
-	for (let ${1:prop} of ${2:object}) {
+snippet foro "for (const prop of object}) { ... }"
+	for (const ${1:prop} of ${2:object}) {
 		${0:$1}
 	}
 # Generator

From 8633db78fbdb7b89ce8a8d530a4615ca771ff089 Mon Sep 17 00:00:00 2001
From: Yang Zongze <yangzongze@gmail.com>
Date: Sun, 18 Dec 2016 17:13:29 +0800
Subject: [PATCH 0936/1587] 1) Add version info. 2) Change sigle backslash to
 double backslash.

---
 snippets/tex.snippets | 295 +++++++++++++++++++++---------------------
 1 file changed, 148 insertions(+), 147 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index c37c138ae..09401066e 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -1,317 +1,318 @@
+version 1
 #PREAMBLE
 #newcommand
 snippet nc \newcommand
-	\newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
+	\\newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
 #usepackage
 snippet up \usepackage
-	\usepackage[${1:options}]{${2:package}} ${0}
+	\\usepackage[${1:options}]{${2:package}} ${0}
 #newunicodechar
 snippet nuc \newunicodechar
-	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${0}
+	\\newunicodechar{${1}}{${2:\\ensuremath}${3:tex-substitute}}} ${0}
 #DeclareMathOperator
 snippet dmo \DeclareMathOperator
-	\DeclareMathOperator{${1}}{${2}} ${0}
+	\\DeclareMathOperator{${1}}{${2}} ${0}
 
 #DOCUMENT
 # \begin{}...\end{}
 snippet begin \begin{} ... \end{} block
-	\begin{${1:env}}
+	\\begin{${1:env}}
 		${0:${VISUAL}}
-	\end{$1}
+	\\end{$1}
 # Tabular
 snippet tab tabular (or arbitrary) environment
-	\begin{${1:tabular}}{${2:c}}
+	\\begin{${1:tabular}}{${2:c}}
 		${0:${VISUAL}}
-	\end{$1}
+	\\end{$1}
 snippet thm thm (or arbitrary) environment with optional argument
-	\begin[${1:author}]{${2:thm}}
+	\\begin[${1:author}]{${2:thm}}
 		${0:${VISUAL}}
-	\end{$2}
+	\\end{$2}
 snippet center center environment
-	\begin{center}
+	\\begin{center}
 		${0:${VISUAL}}
-	\end{center}
+	\\end{center}
 # Align(ed)
 snippet ali align(ed) environment
-	\begin{align${1:ed}}
-		\label{eq:${2}}
+	\\begin{align${1:ed}}
+		\\label{eq:${2}}
 		${0:${VISUAL}}
-	\end{align$1}
+	\\end{align$1}
 # Gather(ed)
 snippet gat gather(ed) environment
-	\begin{gather${1:ed}}
+	\\begin{gather${1:ed}}
 		${0:${VISUAL}}
-	\end{gather$1}
+	\\end{gather$1}
 # Equation
 snippet eq equation environment
-	\begin{equation}
+	\\begin{equation}
 		${0:${VISUAL}}
-	\end{equation}
+	\\end{equation}
 # Equation
 snippet eql Labeled equation environment
-	\begin{equation}
-		\label{eq:${2}}
+	\\begin{equation}
+		\\label{eq:${2}}
 	${0:${VISUAL}}
-	\end{equation}
+	\\end{equation}
 # Equation
 snippet eq* unnumbered equation environment
-	\begin{equation*}
+	\\begin{equation*}
 		${0:${VISUAL}}
-	\end{equation*}
+	\\end{equation*}
 # Unnumbered Equation
 snippet \ unnumbered equation: \[ ... \]
-	\[
+	\\[
 		${0:${VISUAL}}
-	\]
+	\\]
 # Equation array
 snippet eqnarray eqnarray environment
-	\begin{eqnarray}
+	\\begin{eqnarray}
 		${0:${VISUAL}}
-	\end{eqnarray}
+	\\end{eqnarray}
 # Label
 snippet lab \label
-	\label{${1:eq:}${2:fig:}${3:tab:}${0}}
+	\\label{${1:eq:}${2:fig:}${3:tab:}${0}}
 # Enumerate
 snippet enum enumerate environment
-	\begin{enumerate}
-		\item ${0}
-	\end{enumerate}
+	\\begin{enumerate}
+		\\item ${0}
+	\\end{enumerate}
 snippet enuma enumerate environment
-	\begin{enumerate}[(a)]
-		\item ${0}
-	\end{enumerate}
+	\\begin{enumerate}[(a)]
+		\\item ${0}
+	\\end{enumerate}
 snippet enumi enumerate environment
-	\begin{enumerate}[(i)]
-		\item ${0}
-	\end{enumerate}
+	\\begin{enumerate}[(i)]
+		\\item ${0}
+	\\end{enumerate}
 # Itemize
 snippet itemize itemize environment
-	\begin{itemize}
-		\item ${0}
-	\end{itemize}
+	\\begin{itemize}
+		\\item ${0}
+	\\end{itemize}
 snippet item \item
-	\item ${1:${VISUAL}}
+	\\item ${1:${VISUAL}}
 # Description
 snippet desc description environment
-	\begin{description}
-		\item[${1}] ${0}
-	\end{description}
+	\\begin{description}
+		\\item[${1}] ${0}
+	\\end{description}
 # Endless new item
 snippet ]i \item (recursive)
-	\item ${1}
+	\\item ${1}
 		${0:]i}
 # Matrix
 snippet mat smart matrix environment
-	\begin{${1:p/b/v/V/B/small}matrix}
+	\\begin{${1:p/b/v/V/B/small}matrix}
 		${0:${VISUAL}}
-	\end{$1matrix}
+	\\end{$1matrix}
 # Cases
 snippet cas cases environment
-	\begin{cases}
-		${1:equation}, &\text{ if }${2:case}\\
+	\\begin{cases}
+		${1:equation}, &\\text{ if }${2:case}\\
 		${0:${VISUAL}}
-	\end{cases}
+	\\end{cases}
 # Split
 snippet spl split environment
-	\begin{split}
+	\\begin{split}
 		${0:${VISUAL}}
-	\end{split}
+	\\end{split}
 # Part
 snippet part document \part
-	\part{${1:part name}} % (fold)
-	\label{prt:${2:$1}}
+	\\part{${1:part name}} % (fold)
+	\\label{prt:${2:$1}}
 	${0}
 	% part $2 (end)
 # Chapter
 snippet cha \chapter
-	\chapter{${1:chapter name}}
-	\label{cha:${2:$1}}
+	\\chapter{${1:chapter name}}
+	\\label{cha:${2:$1}}
 	${0}
 # Section
 snippet sec \section
-	\section{${1:section name}}
-	\label{sec:${2:$1}}
+	\\section{${1:section name}}
+	\\label{sec:${2:$1}}
 	${0}
 # Section without number
 snippet sec* \section*
-	\section*{${1:section name}}
-	\label{sec:${2:$1}}
+	\\section*{${1:section name}}
+	\\label{sec:${2:$1}}
 	${0}
 # Sub Section
 snippet sub \subsection
-	\subsection{${1:subsection name}}
-	\label{sub:${2:$1}}
+	\\subsection{${1:subsection name}}
+	\\label{sub:${2:$1}}
 	${0}
 # Sub Section without number
 snippet sub* \subsection*
-	\subsection*{${1:subsection name}}
-	\label{sub:${2:$1}}
+	\\subsection*{${1:subsection name}}
+	\\label{sub:${2:$1}}
 	${0}
 # Sub Sub Section
 snippet subs \subsubsection
-	\subsubsection{${1:subsubsection name}}
-	\label{ssub:${2:$1}}
+	\\subsubsection{${1:subsubsection name}}
+	\\label{ssub:${2:$1}}
 	${0}
 # Sub Sub Section without number
 snippet subs* \subsubsection*
-	\subsubsection*{${1:subsubsection name}}
-	\label{ssub:${2:$1}}
+	\\subsubsection*{${1:subsubsection name}}
+	\\label{ssub:${2:$1}}
 	${0}
 # Paragraph
 snippet par \paragraph
-	\paragraph{${1:paragraph name}}
-	\label{par:${2:$1}}
+	\\paragraph{${1:paragraph name}}
+	\\label{par:${2:$1}}
 	${0}
 # Sub Paragraph
 snippet subp \subparagraph
-	\subparagraph{${1:subparagraph name}}
-	\label{subp:${2:$1}}
+	\\subparagraph{${1:subparagraph name}}
+	\\label{subp:${2:$1}}
 	${0}
 snippet ni \noindent
-	\noindent
+	\\noindent
 	${0}
 #References
 snippet itd description \item
-	\item[${1:description}] ${0:item}
+	\\item[${1:description}] ${0:item}
 snippet figure reference to a figure
-	${1:Figure}~\ref{${2:fig:}}
+	${1:Figure}~\\ref{${2:fig:}}
 snippet table reference to a table
-	${1:Table}~\ref{${2:tab:}}
+	${1:Table}~\\ref{${2:tab:}}
 snippet listing reference to a listing
-	${1:Listing}~\ref{${2:list}}
+	${1:Listing}~\\ref{${2:list}}
 snippet section reference to a section
-	${1:Section}~\ref{sec:${2}} ${0}
+	${1:Section}~\\ref{sec:${2}} ${0}
 snippet page reference to a page
-	${1:page}~\pageref{${2}} ${0}
+	${1:page}~\\pageref{${2}} ${0}
 snippet index \index
-	\index{${1:index}} ${0}
+	\\index{${1:index}} ${0}
 #Citations
 snippet citen \citen
-	\citen{${1}} ${0}
+	\\citen{${1}} ${0}
 # natbib citations
 snippet citep \citep
-	\citep{${1}} ${0}
+	\\citep{${1}} ${0}
 snippet citet \citet
-	\citet{${1}} ${0}
+	\\citet{${1}} ${0}
 snippet cite \cite[]{}
-	\cite[${1}]{${2}} ${0}
+	\\cite[${1}]{${2}} ${0}
 snippet citea \citeauthor
-	\citeauthor{${1}} ${0}
+	\\citeauthor{${1}} ${0}
 snippet citey \citeyear
-	\citeyear{${1}} ${0}
+	\\citeyear{${1}} ${0}
 snippet fcite \footcite[]{}
-	\footcite[${1}]{${2}}${0}
+	\\footcite[${1}]{${2}}${0}
 #Formating text: italic, bold, underline, small capital, emphase ..
 snippet it italic text
-	\textit{${0:${VISUAL:text}}}
+	\\textit{${0:${VISUAL:text}}}
 snippet bf bold face text
-	\textbf{${0:${VISUAL:text}}}
+	\\textbf{${0:${VISUAL:text}}}
 snippet under underline text
-	\underline{${0:${VISUAL:text}}}
+	\\underline{${0:${VISUAL:text}}}
 snippet emp emphasize text
-	\emph{${0:${VISUAL:text}}}
+	\\emph{${0:${VISUAL:text}}}
 snippet sc small caps text
-	\textsc{${0:${VISUAL:text}}}
+	\\textsc{${0:${VISUAL:text}}}
 #Choosing font
 snippet sf sans serife text
-	\textsf{${0:${VISUAL:text}}}
+	\\textsf{${0:${VISUAL:text}}}
 snippet rm roman font text
-	\textrm{${0:${VISUAL:text}}}
+	\\textrm{${0:${VISUAL:text}}}
 snippet tt typewriter (monospace) text
-	\texttt{${0:${VISUAL:text}}}
+	\\texttt{${0:${VISUAL:text}}}
 #Math font
 snippet mf mathfrak
-	\mathfrak{${0:${VISUAL:text}}}
+	\\mathfrak{${0:${VISUAL:text}}}
 snippet mc mathcal
-	\mathcal{${0:${VISUAL:text}}}
+	\\mathcal{${0:${VISUAL:text}}}
 snippet ms mathscr
-	\mathscr{${0:${VISUAL:text}}}
+	\\mathscr{${0:${VISUAL:text}}}
 #misc
 snippet ft \footnote
-	\footnote{${0:${VISUAL:text}}}
+	\\footnote{${0:${VISUAL:text}}}
 snippet fig figure environment (includegraphics)
-	\begin{figure}
-	\begin{center}
-		\includegraphics[scale=${1}]{Figures/${2}}
-	\end{center}
-	\caption{${3}}
-	\label{fig:${4}}
-	\end{figure}
+	\\begin{figure}
+	\\begin{center}
+		\\includegraphics[scale=${1}]{Figures/${2}}
+	\\end{center}
+	\\caption{${3}}
+	\\label{fig:${4}}
+	\\end{figure}
 	${0}
 snippet tikz figure environment (tikzpicture)
-	\begin{figure}
-	\begin{center}
-	\begin{tikzpicture}[scale=${1:1}]
+	\\begin{figure}
+	\\begin{center}
+	\\begin{tikzpicture}[scale=${1:1}]
 		${2}
-	\end{tikzpicture}
-	\end{center}
-	\caption{${3}}
-	\label{fig:${4}}
-	\end{figure}
+	\\end{tikzpicture}
+	\\end{center}
+	\\caption{${3}}
+	\\label{fig:${4}}
+	\\end{figure}
 	${0}
 #math
 snippet stackrel \stackrel{}{}
-	\stackrel{${1:above}}{${2:below}} ${0}
+	\\stackrel{${1:above}}{${2:below}} ${0}
 snippet frac \frac{}{}
-	\frac{${1:num}}{${2:denom}} ${0}
+	\\frac{${1:num}}{${2:denom}} ${0}
 snippet sum \sum^{}_{}
-	\sum^{${1:n}}_{${2:i=1}} ${0}
+	\\sum^{${1:n}}_{${2:i=1}} ${0}
 snippet lim \lim_{}
-	\lim_{${1:n \to \infty}} ${0}
+	\\lim_{${1:n \\to \\infty}} ${0}
 snippet frame frame environment
-	\begin{frame}[${1:t}]{${2:title}}
+	\\begin{frame}[${1:t}]{${2:title}}
 		${0:${VISUAL}}
-	\end{frame}
+	\\end{frame}
 snippet block block environment
-	\begin{block}{${1:title}}
+	\\begin{block}{${1:title}}
 		${0:${VISUAL}}
-	\end{block}
+	\\end{block}
 snippet alert alertblock environment
-	\begin{alertblock}{${1:title}}
+	\\begin{alertblock}{${1:title}}
 		${0:${VISUAL}}
-	\end{alertblock}
+	\\end{alertblock}
 snippet example exampleblock environment
-	\begin{exampleblock}{${1:title}}
+	\\begin{exampleblock}{${1:title}}
 		${0:${VISUAL}}
-	\end{exampleblock}
+	\\end{exampleblock}
 snippet col2 two-column environment
-	\begin{columns}
-		\begin{column}{0.5\textwidth}
+	\\begin{columns}
+		\\begin{column}{0.5\\textwidth}
 			${1}
-		\end{column}
-		\begin{column}{0.5\textwidth}
+		\\end{column}
+		\\begin{column}{0.5\\textwidth}
 			${0}
-		\end{column}
-	\end{columns}
-snippet \{ \{ \}
+		\\end{column}
+	\\end{columns}
+snippet brace \{ \}
 	\\{ ${0} \\}
 #delimiter
 snippet lr left right
-	\left${1} ${0} \right$1
+	\\left${1} ${0} \\right$1
 snippet lr( left( right) 
-	\left( ${0} \right)
+	\\left( ${0} \\right)
 snippet lr| left| right| 
-	\left| ${0} \right|
+	\\left| ${0} \\right|
 snippet lr{ left\{ right\} 
-	\left\\{ ${0} \right\\}
+	\\left\\{ ${0} \\right\\}
 snippet lr[ left[ right] 
-	\left[ ${0} \right]
+	\\left[ ${0} \\right]
 snippet lra langle rangle 
-	\langle ${0} \rangle
+	\\langle ${0} \\rangle
 # Code listings
 snippet lst
-	\begin{listing}[language=${1:language}]
+	\\begin{listing}[language=${1:language}]
 		${0:${VISUAL}}
-	\end{listing}
+	\\end{listing}
 snippet lsi
-	\lstinline|${1}| ${0}
+	\\lstinline|${1}| ${0}
 # Hyperlinks
 snippet url
-	\url{${1}} ${0}
+	\\url{${1}} ${0}
 snippet href
-	\href{${1}}{${2}} ${0}
+	\\href{${1}}{${2}} ${0}
 # URL from Clipboard.
 snippet urlc
-	\url{`@+`} ${0}
+	\\url{`@+`} ${0}
 snippet hrefc
-	\href{`@+`}{${1}} ${0}
+	\\href{`@+`}{${1}} ${0}

From 22e5faa06acb531e78760aab624c33ae768078be Mon Sep 17 00:00:00 2001
From: Yang Zongze <yangzongze@gmail.com>
Date: Sun, 18 Dec 2016 17:13:29 +0800
Subject: [PATCH 0937/1587] 1) Add version info. 2) Change sigle backslash to
 double backslash.

---
 snippets/tex.snippets | 295 +++++++++++++++++++++---------------------
 1 file changed, 148 insertions(+), 147 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index c37c138ae..09401066e 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -1,317 +1,318 @@
+version 1
 #PREAMBLE
 #newcommand
 snippet nc \newcommand
-	\newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
+	\\newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
 #usepackage
 snippet up \usepackage
-	\usepackage[${1:options}]{${2:package}} ${0}
+	\\usepackage[${1:options}]{${2:package}} ${0}
 #newunicodechar
 snippet nuc \newunicodechar
-	\newunicodechar{${1}}{${2:\ensuremath}${3:tex-substitute}}} ${0}
+	\\newunicodechar{${1}}{${2:\\ensuremath}${3:tex-substitute}}} ${0}
 #DeclareMathOperator
 snippet dmo \DeclareMathOperator
-	\DeclareMathOperator{${1}}{${2}} ${0}
+	\\DeclareMathOperator{${1}}{${2}} ${0}
 
 #DOCUMENT
 # \begin{}...\end{}
 snippet begin \begin{} ... \end{} block
-	\begin{${1:env}}
+	\\begin{${1:env}}
 		${0:${VISUAL}}
-	\end{$1}
+	\\end{$1}
 # Tabular
 snippet tab tabular (or arbitrary) environment
-	\begin{${1:tabular}}{${2:c}}
+	\\begin{${1:tabular}}{${2:c}}
 		${0:${VISUAL}}
-	\end{$1}
+	\\end{$1}
 snippet thm thm (or arbitrary) environment with optional argument
-	\begin[${1:author}]{${2:thm}}
+	\\begin[${1:author}]{${2:thm}}
 		${0:${VISUAL}}
-	\end{$2}
+	\\end{$2}
 snippet center center environment
-	\begin{center}
+	\\begin{center}
 		${0:${VISUAL}}
-	\end{center}
+	\\end{center}
 # Align(ed)
 snippet ali align(ed) environment
-	\begin{align${1:ed}}
-		\label{eq:${2}}
+	\\begin{align${1:ed}}
+		\\label{eq:${2}}
 		${0:${VISUAL}}
-	\end{align$1}
+	\\end{align$1}
 # Gather(ed)
 snippet gat gather(ed) environment
-	\begin{gather${1:ed}}
+	\\begin{gather${1:ed}}
 		${0:${VISUAL}}
-	\end{gather$1}
+	\\end{gather$1}
 # Equation
 snippet eq equation environment
-	\begin{equation}
+	\\begin{equation}
 		${0:${VISUAL}}
-	\end{equation}
+	\\end{equation}
 # Equation
 snippet eql Labeled equation environment
-	\begin{equation}
-		\label{eq:${2}}
+	\\begin{equation}
+		\\label{eq:${2}}
 	${0:${VISUAL}}
-	\end{equation}
+	\\end{equation}
 # Equation
 snippet eq* unnumbered equation environment
-	\begin{equation*}
+	\\begin{equation*}
 		${0:${VISUAL}}
-	\end{equation*}
+	\\end{equation*}
 # Unnumbered Equation
 snippet \ unnumbered equation: \[ ... \]
-	\[
+	\\[
 		${0:${VISUAL}}
-	\]
+	\\]
 # Equation array
 snippet eqnarray eqnarray environment
-	\begin{eqnarray}
+	\\begin{eqnarray}
 		${0:${VISUAL}}
-	\end{eqnarray}
+	\\end{eqnarray}
 # Label
 snippet lab \label
-	\label{${1:eq:}${2:fig:}${3:tab:}${0}}
+	\\label{${1:eq:}${2:fig:}${3:tab:}${0}}
 # Enumerate
 snippet enum enumerate environment
-	\begin{enumerate}
-		\item ${0}
-	\end{enumerate}
+	\\begin{enumerate}
+		\\item ${0}
+	\\end{enumerate}
 snippet enuma enumerate environment
-	\begin{enumerate}[(a)]
-		\item ${0}
-	\end{enumerate}
+	\\begin{enumerate}[(a)]
+		\\item ${0}
+	\\end{enumerate}
 snippet enumi enumerate environment
-	\begin{enumerate}[(i)]
-		\item ${0}
-	\end{enumerate}
+	\\begin{enumerate}[(i)]
+		\\item ${0}
+	\\end{enumerate}
 # Itemize
 snippet itemize itemize environment
-	\begin{itemize}
-		\item ${0}
-	\end{itemize}
+	\\begin{itemize}
+		\\item ${0}
+	\\end{itemize}
 snippet item \item
-	\item ${1:${VISUAL}}
+	\\item ${1:${VISUAL}}
 # Description
 snippet desc description environment
-	\begin{description}
-		\item[${1}] ${0}
-	\end{description}
+	\\begin{description}
+		\\item[${1}] ${0}
+	\\end{description}
 # Endless new item
 snippet ]i \item (recursive)
-	\item ${1}
+	\\item ${1}
 		${0:]i}
 # Matrix
 snippet mat smart matrix environment
-	\begin{${1:p/b/v/V/B/small}matrix}
+	\\begin{${1:p/b/v/V/B/small}matrix}
 		${0:${VISUAL}}
-	\end{$1matrix}
+	\\end{$1matrix}
 # Cases
 snippet cas cases environment
-	\begin{cases}
-		${1:equation}, &\text{ if }${2:case}\\
+	\\begin{cases}
+		${1:equation}, &\\text{ if }${2:case}\\
 		${0:${VISUAL}}
-	\end{cases}
+	\\end{cases}
 # Split
 snippet spl split environment
-	\begin{split}
+	\\begin{split}
 		${0:${VISUAL}}
-	\end{split}
+	\\end{split}
 # Part
 snippet part document \part
-	\part{${1:part name}} % (fold)
-	\label{prt:${2:$1}}
+	\\part{${1:part name}} % (fold)
+	\\label{prt:${2:$1}}
 	${0}
 	% part $2 (end)
 # Chapter
 snippet cha \chapter
-	\chapter{${1:chapter name}}
-	\label{cha:${2:$1}}
+	\\chapter{${1:chapter name}}
+	\\label{cha:${2:$1}}
 	${0}
 # Section
 snippet sec \section
-	\section{${1:section name}}
-	\label{sec:${2:$1}}
+	\\section{${1:section name}}
+	\\label{sec:${2:$1}}
 	${0}
 # Section without number
 snippet sec* \section*
-	\section*{${1:section name}}
-	\label{sec:${2:$1}}
+	\\section*{${1:section name}}
+	\\label{sec:${2:$1}}
 	${0}
 # Sub Section
 snippet sub \subsection
-	\subsection{${1:subsection name}}
-	\label{sub:${2:$1}}
+	\\subsection{${1:subsection name}}
+	\\label{sub:${2:$1}}
 	${0}
 # Sub Section without number
 snippet sub* \subsection*
-	\subsection*{${1:subsection name}}
-	\label{sub:${2:$1}}
+	\\subsection*{${1:subsection name}}
+	\\label{sub:${2:$1}}
 	${0}
 # Sub Sub Section
 snippet subs \subsubsection
-	\subsubsection{${1:subsubsection name}}
-	\label{ssub:${2:$1}}
+	\\subsubsection{${1:subsubsection name}}
+	\\label{ssub:${2:$1}}
 	${0}
 # Sub Sub Section without number
 snippet subs* \subsubsection*
-	\subsubsection*{${1:subsubsection name}}
-	\label{ssub:${2:$1}}
+	\\subsubsection*{${1:subsubsection name}}
+	\\label{ssub:${2:$1}}
 	${0}
 # Paragraph
 snippet par \paragraph
-	\paragraph{${1:paragraph name}}
-	\label{par:${2:$1}}
+	\\paragraph{${1:paragraph name}}
+	\\label{par:${2:$1}}
 	${0}
 # Sub Paragraph
 snippet subp \subparagraph
-	\subparagraph{${1:subparagraph name}}
-	\label{subp:${2:$1}}
+	\\subparagraph{${1:subparagraph name}}
+	\\label{subp:${2:$1}}
 	${0}
 snippet ni \noindent
-	\noindent
+	\\noindent
 	${0}
 #References
 snippet itd description \item
-	\item[${1:description}] ${0:item}
+	\\item[${1:description}] ${0:item}
 snippet figure reference to a figure
-	${1:Figure}~\ref{${2:fig:}}
+	${1:Figure}~\\ref{${2:fig:}}
 snippet table reference to a table
-	${1:Table}~\ref{${2:tab:}}
+	${1:Table}~\\ref{${2:tab:}}
 snippet listing reference to a listing
-	${1:Listing}~\ref{${2:list}}
+	${1:Listing}~\\ref{${2:list}}
 snippet section reference to a section
-	${1:Section}~\ref{sec:${2}} ${0}
+	${1:Section}~\\ref{sec:${2}} ${0}
 snippet page reference to a page
-	${1:page}~\pageref{${2}} ${0}
+	${1:page}~\\pageref{${2}} ${0}
 snippet index \index
-	\index{${1:index}} ${0}
+	\\index{${1:index}} ${0}
 #Citations
 snippet citen \citen
-	\citen{${1}} ${0}
+	\\citen{${1}} ${0}
 # natbib citations
 snippet citep \citep
-	\citep{${1}} ${0}
+	\\citep{${1}} ${0}
 snippet citet \citet
-	\citet{${1}} ${0}
+	\\citet{${1}} ${0}
 snippet cite \cite[]{}
-	\cite[${1}]{${2}} ${0}
+	\\cite[${1}]{${2}} ${0}
 snippet citea \citeauthor
-	\citeauthor{${1}} ${0}
+	\\citeauthor{${1}} ${0}
 snippet citey \citeyear
-	\citeyear{${1}} ${0}
+	\\citeyear{${1}} ${0}
 snippet fcite \footcite[]{}
-	\footcite[${1}]{${2}}${0}
+	\\footcite[${1}]{${2}}${0}
 #Formating text: italic, bold, underline, small capital, emphase ..
 snippet it italic text
-	\textit{${0:${VISUAL:text}}}
+	\\textit{${0:${VISUAL:text}}}
 snippet bf bold face text
-	\textbf{${0:${VISUAL:text}}}
+	\\textbf{${0:${VISUAL:text}}}
 snippet under underline text
-	\underline{${0:${VISUAL:text}}}
+	\\underline{${0:${VISUAL:text}}}
 snippet emp emphasize text
-	\emph{${0:${VISUAL:text}}}
+	\\emph{${0:${VISUAL:text}}}
 snippet sc small caps text
-	\textsc{${0:${VISUAL:text}}}
+	\\textsc{${0:${VISUAL:text}}}
 #Choosing font
 snippet sf sans serife text
-	\textsf{${0:${VISUAL:text}}}
+	\\textsf{${0:${VISUAL:text}}}
 snippet rm roman font text
-	\textrm{${0:${VISUAL:text}}}
+	\\textrm{${0:${VISUAL:text}}}
 snippet tt typewriter (monospace) text
-	\texttt{${0:${VISUAL:text}}}
+	\\texttt{${0:${VISUAL:text}}}
 #Math font
 snippet mf mathfrak
-	\mathfrak{${0:${VISUAL:text}}}
+	\\mathfrak{${0:${VISUAL:text}}}
 snippet mc mathcal
-	\mathcal{${0:${VISUAL:text}}}
+	\\mathcal{${0:${VISUAL:text}}}
 snippet ms mathscr
-	\mathscr{${0:${VISUAL:text}}}
+	\\mathscr{${0:${VISUAL:text}}}
 #misc
 snippet ft \footnote
-	\footnote{${0:${VISUAL:text}}}
+	\\footnote{${0:${VISUAL:text}}}
 snippet fig figure environment (includegraphics)
-	\begin{figure}
-	\begin{center}
-		\includegraphics[scale=${1}]{Figures/${2}}
-	\end{center}
-	\caption{${3}}
-	\label{fig:${4}}
-	\end{figure}
+	\\begin{figure}
+	\\begin{center}
+		\\includegraphics[scale=${1}]{Figures/${2}}
+	\\end{center}
+	\\caption{${3}}
+	\\label{fig:${4}}
+	\\end{figure}
 	${0}
 snippet tikz figure environment (tikzpicture)
-	\begin{figure}
-	\begin{center}
-	\begin{tikzpicture}[scale=${1:1}]
+	\\begin{figure}
+	\\begin{center}
+	\\begin{tikzpicture}[scale=${1:1}]
 		${2}
-	\end{tikzpicture}
-	\end{center}
-	\caption{${3}}
-	\label{fig:${4}}
-	\end{figure}
+	\\end{tikzpicture}
+	\\end{center}
+	\\caption{${3}}
+	\\label{fig:${4}}
+	\\end{figure}
 	${0}
 #math
 snippet stackrel \stackrel{}{}
-	\stackrel{${1:above}}{${2:below}} ${0}
+	\\stackrel{${1:above}}{${2:below}} ${0}
 snippet frac \frac{}{}
-	\frac{${1:num}}{${2:denom}} ${0}
+	\\frac{${1:num}}{${2:denom}} ${0}
 snippet sum \sum^{}_{}
-	\sum^{${1:n}}_{${2:i=1}} ${0}
+	\\sum^{${1:n}}_{${2:i=1}} ${0}
 snippet lim \lim_{}
-	\lim_{${1:n \to \infty}} ${0}
+	\\lim_{${1:n \\to \\infty}} ${0}
 snippet frame frame environment
-	\begin{frame}[${1:t}]{${2:title}}
+	\\begin{frame}[${1:t}]{${2:title}}
 		${0:${VISUAL}}
-	\end{frame}
+	\\end{frame}
 snippet block block environment
-	\begin{block}{${1:title}}
+	\\begin{block}{${1:title}}
 		${0:${VISUAL}}
-	\end{block}
+	\\end{block}
 snippet alert alertblock environment
-	\begin{alertblock}{${1:title}}
+	\\begin{alertblock}{${1:title}}
 		${0:${VISUAL}}
-	\end{alertblock}
+	\\end{alertblock}
 snippet example exampleblock environment
-	\begin{exampleblock}{${1:title}}
+	\\begin{exampleblock}{${1:title}}
 		${0:${VISUAL}}
-	\end{exampleblock}
+	\\end{exampleblock}
 snippet col2 two-column environment
-	\begin{columns}
-		\begin{column}{0.5\textwidth}
+	\\begin{columns}
+		\\begin{column}{0.5\\textwidth}
 			${1}
-		\end{column}
-		\begin{column}{0.5\textwidth}
+		\\end{column}
+		\\begin{column}{0.5\\textwidth}
 			${0}
-		\end{column}
-	\end{columns}
-snippet \{ \{ \}
+		\\end{column}
+	\\end{columns}
+snippet brace \{ \}
 	\\{ ${0} \\}
 #delimiter
 snippet lr left right
-	\left${1} ${0} \right$1
+	\\left${1} ${0} \\right$1
 snippet lr( left( right) 
-	\left( ${0} \right)
+	\\left( ${0} \\right)
 snippet lr| left| right| 
-	\left| ${0} \right|
+	\\left| ${0} \\right|
 snippet lr{ left\{ right\} 
-	\left\\{ ${0} \right\\}
+	\\left\\{ ${0} \\right\\}
 snippet lr[ left[ right] 
-	\left[ ${0} \right]
+	\\left[ ${0} \\right]
 snippet lra langle rangle 
-	\langle ${0} \rangle
+	\\langle ${0} \\rangle
 # Code listings
 snippet lst
-	\begin{listing}[language=${1:language}]
+	\\begin{listing}[language=${1:language}]
 		${0:${VISUAL}}
-	\end{listing}
+	\\end{listing}
 snippet lsi
-	\lstinline|${1}| ${0}
+	\\lstinline|${1}| ${0}
 # Hyperlinks
 snippet url
-	\url{${1}} ${0}
+	\\url{${1}} ${0}
 snippet href
-	\href{${1}}{${2}} ${0}
+	\\href{${1}}{${2}} ${0}
 # URL from Clipboard.
 snippet urlc
-	\url{`@+`} ${0}
+	\\url{`@+`} ${0}
 snippet hrefc
-	\href{`@+`}{${1}} ${0}
+	\\href{`@+`}{${1}} ${0}

From 413d1cacbb08281b37f79501a8c68ae146603021 Mon Sep 17 00:00:00 2001
From: Yang Zongze <yangzongze@gmail.com>
Date: Sun, 18 Dec 2016 17:42:07 +0800
Subject: [PATCH 0938/1587] chang brace back to \{

---
 snippets/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 09401066e..bf9099bf7 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -284,7 +284,7 @@ snippet col2 two-column environment
 			${0}
 		\\end{column}
 	\\end{columns}
-snippet brace \{ \}
+snippet \{ \{ \}
 	\\{ ${0} \\}
 #delimiter
 snippet lr left right

From df7dab27dc2cab1c0f5f4332e6985652aac03ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Rodr=C3=ADguez?=
 <andres.rodriguez@lithersoft.com>
Date: Mon, 19 Dec 2016 15:43:53 -0300
Subject: [PATCH 0939/1587] Add ISC License snippet

---
 snippets/_.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index 0153a1467..ad0235f1b 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -279,3 +279,11 @@ snippet AGPL
 
 	You should have received a copy of the GNU Affero General Public License
 	along with this program. If not, see <http://www.gnu.org/licenses/>.
+snippet ISC
+	${1:one line to give the program's name and a brief description}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")`, ${2:`g:snips_author`}
+
+	Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+	THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+	${0}

From f817787e1c36bba6983b1862bc335ed4280fcdc8 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 19 Dec 2016 19:25:57 +0000
Subject: [PATCH 0940/1587] Add first Purescript snippets

---
 snippets/purescript.snippets | 52 ++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 snippets/purescript.snippets

diff --git a/snippets/purescript.snippets b/snippets/purescript.snippets
new file mode 100644
index 000000000..06d6b34aa
--- /dev/null
+++ b/snippets/purescript.snippets
@@ -0,0 +1,52 @@
+snippet mod
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')`
+		(
+		) where
+
+		import Prelude
+
+		${0}
+snippet imp
+	import ${0:Data.List}
+snippet impq
+	import ${1:Data.List} as ${0:List}
+snippet fn0
+	${1:name} :: ${2:a}
+	$1 = ${0:undefined}
+snippet fn
+	${1:fn} :: ${2:a} -> ${3:a}
+	$1 ${4}= ${0}
+snippet fn1
+	${1:fn} :: ${2:a} -> ${3:a}
+	$1 ${4}= ${0}
+snippet fn2
+	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a}
+	$1 ${5}= ${0}
+snippet fn3
+	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
+	$1 ${6}= ${0}
+snippet case
+	case ${1} of
+		${2} -> ${0}
+snippet let
+	let
+		${1} = ${2}
+	in
+		${3}
+snippet where
+	where
+		${1} = ${0}
+snippet testunit
+	module Test.Main where
+
+	import Prelude
+	import Test.Unit (suite, test)
+	import Test.Unit.Main (runTest)
+	import Test.Unit.Assert as Assert
+
+	main = runTest do
+		suite "${1}" do
+			test "${2:the tests run}" do
+				Assert.equal
+					"Hello, world!"
+					"Hello, sailor!"

From 316c288a7402c6a40dfab46d8cfc5720c017fef9 Mon Sep 17 00:00:00 2001
From: Yang Zongze <yangzongze@gmail.com>
Date: Tue, 20 Dec 2016 13:06:12 +0800
Subject: [PATCH 0941/1587] comment out version info. fix #838

---
 snippets/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index bf9099bf7..21ea9f635 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -1,4 +1,4 @@
-version 1
+#version 1
 #PREAMBLE
 #newcommand
 snippet nc \newcommand

From b962f27805907b87855312c34e3de21d6518f5fb Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Sun, 25 Dec 2016 14:01:29 +0800
Subject: [PATCH 0942/1587] Corrections to reST snippets; Add new snip ,

---
 UltiSnips/rst.snippets | 20 +++++++++++++++++++-
 snippets/rst.snippets  |  4 ++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 0596eee13..9a2b4c0c4 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -28,7 +28,7 @@ SPECIFIC_ADMONITIONS = ["attention", "caution", "danger",
 #http://docutils.sourceforge.net/docs/ref/rst/directives.html
 DIRECTIVES = ['topic','sidebar','math','epigraph',
 			  'parsed-literal','code','highlights',
-			  'pull-quote','compound','container',
+			  'pull-quote','compound','container','table','csv-table',
 			  'list-table','class','sectnum',
 			  'role','default-role','unicode',
 			  'raw']
@@ -238,6 +238,7 @@ if di == 'im':
 if di == 'fi':
 	content="""
 	:alt: {0}
+
 	{0}""".format(real_name)
 `
 ..`!p snip.rv = " %s" % link if link else ""` $1`!p
@@ -281,6 +282,23 @@ snippet ro "Text Roles" w
 														path))`:\`$2\`\
 endsnippet
 
+snippet eu "Embedded URI" i
+`!p
+if has_cjk(vim.current.line):
+	snip.rv = "\ "`\`${1:${VISUAL:Text}} <${2:URI}>\`_`!p
+if has_cjk(vim.current.line):
+	snip.rv ="\ "
+else:
+	snip.rv = ""
+`$0
+endsnippet
+
+snippet fnt "Footnote or Citation" i
+[${1:Label}]_ $0
+
+.. [$1] ${2:Reference}
+endsnippet
+
 ############
 #  Sphinx  #
 ############
diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index b1852458f..dd47863ed 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -85,9 +85,9 @@ snippet toc:
 
 		${0}
 snippet dow:
-	:download:`${0:text} <${1:path}>`
+	:download:\`${0:text} <${1:path}>\`
 snippet ref:
-	:ref:`${0:text} <${1:path}>`
+	:ref:\`${0:text} <${1:path}>\`
 snippet doc:
 	:doc:`${0:text} <${1:path}>`
 # CJK optimize, CJK has no space between charaters

From a1f7144144296ff4123d244ef4b221fe3d1343f4 Mon Sep 17 00:00:00 2001
From: Grzegorz Bokota <g.bokota@cent.uw.edu.pl>
Date: Sun, 25 Dec 2016 10:56:12 +0100
Subject: [PATCH 0943/1587] modify LaTeX snippets, add transform shape for
 tikzpicture and snippet for subfigure environment

---
 snippets/tex.snippets | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 21ea9f635..05ec852c3 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -240,9 +240,9 @@ snippet fig figure environment (includegraphics)
 	\\end{figure}
 	${0}
 snippet tikz figure environment (tikzpicture)
-	\\begin{figure}
+	\\begin{figure}[htpb]
 	\\begin{center}
-	\\begin{tikzpicture}[scale=${1:1}]
+	\\begin{tikzpicture}[scale=${1:1}, transform shape]
 		${2}
 	\\end{tikzpicture}
 	\\end{center}
@@ -250,6 +250,15 @@ snippet tikz figure environment (tikzpicture)
 	\\label{fig:${4}}
 	\\end{figure}
 	${0}
+snippet subfig subfigure environment
+	\\begin{subfigure}[${1}]{${2:\\textwidth}}
+	\\begin{center}
+		${3}
+	\\end{center}
+	\\caption{${4}}
+	\\label{fig:${5}}
+	\\end{subfigure}
+	${0}
 #math
 snippet stackrel \stackrel{}{}
 	\\stackrel{${1:above}}{${2:below}} ${0}
@@ -289,15 +298,15 @@ snippet \{ \{ \}
 #delimiter
 snippet lr left right
 	\\left${1} ${0} \\right$1
-snippet lr( left( right) 
+snippet lr( left( right)
 	\\left( ${0} \\right)
-snippet lr| left| right| 
+snippet lr| left| right|
 	\\left| ${0} \\right|
-snippet lr{ left\{ right\} 
+snippet lr{ left\{ right\}
 	\\left\\{ ${0} \\right\\}
-snippet lr[ left[ right] 
+snippet lr[ left[ right]
 	\\left[ ${0} \\right]
-snippet lra langle rangle 
+snippet lra langle rangle
 	\\langle ${0} \\rangle
 # Code listings
 snippet lst

From 321f2fadc85536898f9b26a4a72c9487063945f5 Mon Sep 17 00:00:00 2001
From: David le Blanc <david.leblanc@freestyletechnology.com.au>
Date: Tue, 27 Dec 2016 17:08:32 +1100
Subject: [PATCH 0944/1587] Cleaned ${x} from snippet collection

---
 UltiSnips/c.snippets                  |  20 +-
 UltiSnips/coffee-react.snippets       |  24 +--
 UltiSnips/cpp.snippets                |   4 +-
 UltiSnips/cs.snippets                 |   2 +-
 UltiSnips/d.snippets                  | 110 +++++------
 UltiSnips/django.snippets             |  36 ++--
 UltiSnips/eruby.snippets              |  14 +-
 UltiSnips/go.snippets                 |   2 +-
 UltiSnips/html_minimal.snippets       |  12 +-
 UltiSnips/htmldjango.snippets         | 112 +++++------
 UltiSnips/java.snippets               |   6 +-
 UltiSnips/javascript-angular.snippets |  14 +-
 UltiSnips/javascript-node.snippets    |  24 +--
 UltiSnips/javascript-openui5.snippets | 272 +++++++++++++-------------
 UltiSnips/javascript.snippets         |   2 +-
 UltiSnips/php-laravel.snippets        |  18 +-
 UltiSnips/php-phpspec.snippets        |  26 +--
 UltiSnips/php-symfony2.snippets       |  48 ++---
 UltiSnips/php.snippets                |   2 +-
 UltiSnips/proto.snippets              |   6 +-
 UltiSnips/puppet.snippets             |  50 ++---
 UltiSnips/python.snippets             |   2 +-
 UltiSnips/r.snippets                  |  32 +--
 UltiSnips/rails.snippets              |  36 ++--
 UltiSnips/rust.snippets               |  40 ++--
 UltiSnips/supercollider.snippets      |   2 +-
 UltiSnips/tcl.snippets                |  14 +-
 UltiSnips/tex.snippets                |  18 +-
 UltiSnips/vim.snippets                |   4 +-
 29 files changed, 476 insertions(+), 476 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index c98946493..6851a2728 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -5,7 +5,7 @@
 priority -50
 
 snippet def "#define ..."
-#define ${1}
+#define $1
 endsnippet
 
 snippet #ifndef "#ifndef ... #define ... #endif"
@@ -16,7 +16,7 @@ endsnippet
 
 snippet #if "#if #endif" b
 #if ${1:0}
-${VISUAL}${0}
+${VISUAL}$0
 #endif
 endsnippet
 
@@ -32,20 +32,20 @@ endsnippet
 snippet main "main() (main)"
 int main(int argc, char *argv[])
 {
-	${VISUAL}${0}
+	${VISUAL}$0
 	return 0;
 }
 endsnippet
 
 snippet for "for loop (for)"
 for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
-	${VISUAL}${0}
+	${VISUAL}$0
 }
 endsnippet
 
 snippet fori "for int loop (fori)"
 for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
-	${VISUAL}${0}
+	${VISUAL}$0
 }
 endsnippet
 
@@ -60,7 +60,7 @@ else:
 	snip.rv = snip.c`}
 #define $1
 
-${VISUAL}${0}
+${VISUAL}$0
 
 #endif /* end of include guard: $1 */
 endsnippet
@@ -71,7 +71,7 @@ endsnippet
 
 snippet eli "else if .. (eli)"
 else if (${1:/* condition */}) {
-	${VISUAL}${0}
+	${VISUAL}$0
 }
 endsnippet
 
@@ -86,14 +86,14 @@ struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
 endsnippet
 
 snippet fun "function" b
-${1:void} ${2:function_name}(${3})
+${1:void} ${2:function_name}($3)
 {
-	${VISUAL}${0}
+	${VISUAL}$0
 }
 endsnippet
 
 snippet fund "function declaration" b
-${1:void} ${2:function_name}(${3});
+${1:void} ${2:function_name}($3);
 endsnippet
 
 # vim:ft=snippets:
diff --git a/UltiSnips/coffee-react.snippets b/UltiSnips/coffee-react.snippets
index 4cdb40f83..3090c571a 100644
--- a/UltiSnips/coffee-react.snippets
+++ b/UltiSnips/coffee-react.snippets
@@ -12,7 +12,7 @@ snippet createClass "React define Class" b
 ${1:classname}Class = React.createClass
 	displayName: "$1"
 	render: ->
-		${2}
+		$2
 $1 = React.createFactory($1)
 endsnippet
 
@@ -23,58 +23,58 @@ endsnippet
 
 snippet propType "React propType (key/value)" b
 ${1:myVar}: React.PropTypes.${2:type}${3:.isRequired}
-${4}
+$4
 endsnippet
 
 snippet setState "React setState" b
 @setState
 	${1:myvar}: ${2:myvalue}
-	${3}
+	$3
 endsnippet
 
 snippet getInitialState "React define getInitialState" b
 getInitialState: ->
 	${1:myvar}: ${2:myvalue}
-	${3}
+	$3
 endsnippet
 
 snippet getDefaultProps "React define getDefaultProps" b
 getDefaultProps: ->
 	${1:myvar}: ${2:myvalue}
-	${3}
+	$3
 endsnippet
 
 snippet componentWillMount "React define componentWillMount" b
 componentWillMount: ->
-	${1}
+	$1
 endsnippet
 
 snippet componentDidMount "React define componentDidMount" b
 componentDidMount: ->
-	${1}
+	$1
 endsnippet
 
 snippet componentWillReceiveProps "React define componentWillReceiveProps" b
 componentWillReceiveProps: (nextProps) ->
-	${1}
+	$1
 endsnippet
 
 snippet shouldComponentUpdate "React define shouldComponentUpdate" b
 shouldComponentUpdate: (nextProps, nextState) ->
-	${1}
+	$1
 endsnippet
 
 snippet componentWillUpdate "React define componentWillUpdate" b
 componentWillUpdate: (nextProps, nextState) ->
-	${1}
+	$1
 endsnippet
 
 snippet componentDidUpdate "React define componentDidUpdate" b
 componentDidUpdate: (prevProps, prevState) ->
-	${1}
+	$1
 endsnippet
 
 snippet componentWillUnmount "React define componentWillUnmount" b
 componentWillUnmount: ->
-	${1}
+	$1
 endsnippet
diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index f7c2bd830..c83ec6055 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}$0
 }${1/.+/ \/* /m}$1${1/.+/ *\/ /m}
 endsnippet
 
@@ -61,7 +61,7 @@ snippet cla "An entire .h generator" b
 class ${1:`!v substitute(substitute(vim_snippets#Filename('$1','ClassName'),'^.','\u&',''), '_\(\w\)', '\u\1', 'g')`}
 {
 private:
-	${3}
+	$3
 
 public:
 	$1();
diff --git a/UltiSnips/cs.snippets b/UltiSnips/cs.snippets
index aca245e52..89b61ca09 100644
--- a/UltiSnips/cs.snippets
+++ b/UltiSnips/cs.snippets
@@ -259,7 +259,7 @@ finally
 endsnippet
 
 snippet throw "throw"
-throw new ${1}Exception("${2}");
+throw new $1Exception("$2");
 endsnippet
 
 
diff --git a/UltiSnips/d.snippets b/UltiSnips/d.snippets
index 9ce275130..a9d89b844 100644
--- a/UltiSnips/d.snippets
+++ b/UltiSnips/d.snippets
@@ -23,7 +23,7 @@ mixin ${1:/*mixed_in*/} ${2:/*name*/};
 endsnippet
 
 snippet new "new (new)"
-new ${1}(${2});
+new $1($2);
 endsnippet
 
 snippet scpn "@safe const pure nothrow (scpn)"
@@ -98,7 +98,7 @@ endsnippet
 
 snippet enf "enforce (enf)" b
 enforce(${1:/*condition*/},
-	new ${2}Exception(${3:/*args*/}));
+	new $2Exception(${3:/*args*/}));
 endsnippet
 
 # Branches
@@ -106,14 +106,14 @@ endsnippet
 snippet if "if .. (if)"
 if(${1:/*condition*/})
 {
-	${VISUAL}${0}
+	${VISUAL}$0
 }
 endsnippet
 
 snippet ife "if .. else (ife)" b
 if(${1:/*condition*/})
 {
-	${2}
+	$2
 }
 else
 {
@@ -124,14 +124,14 @@ endsnippet
 snippet el "else (el)" b
 else
 {
-	${VISUAL}${1}
+	${VISUAL}$1
 }
 endsnippet
 
 snippet elif "else if (elif)" b
 else if(${1:/*condition*/})
 {
-	${VISUAL}${0}
+	${VISUAL}$0
 }
 endsnippet
 
@@ -139,10 +139,10 @@ snippet sw "switch (sw)"
 switch(${1:/*var*/})
 {
 	case ${2:/*value*/}:
-		${3}
+		$3
 		break;
 	case ${4:/*value*/}:
-		${5}
+		$5
 		break;
 	${7:/*more cases*/}
 	default:
@@ -154,10 +154,10 @@ snippet fsw "final switch (fsw)"
 final switch(${1:/*var*/})
 {
 	case ${2:/*value*/}:
-		${3}
+		$3
 		break;
 	case ${4:/*value*/}:
-		${5}
+		$5
 		break;
 	${7:/*more cases*/}
 }
@@ -165,7 +165,7 @@ endsnippet
 
 snippet case "case (case)" b
 case ${1:/*value*/}:
-	${2}
+	$2
 	break;
 endsnippet
 
@@ -178,42 +178,42 @@ endsnippet
 snippet do "do while (do)" b
 do
 {
-	${VISUAL}${2}
+	${VISUAL}$2
 } while(${1:/*condition*/});
 endsnippet
 
 snippet wh "while (wh)" b
 while(${1:/*condition*/})
 {
-	${VISUAL}${2}
+	${VISUAL}$2
 }
 endsnippet
 
 snippet for "for (for)" b
 for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
-	${VISUAL}${0}
+	${VISUAL}$0
 }
 endsnippet
 
 snippet forever "forever (forever)" b
 for(;;)
 {
-	${VISUAL}${0}
+	${VISUAL}$0
 }
 endsnippet
 
 snippet fore "foreach (fore)"
 foreach(${1:/*elem*/}; ${2:/*range*/})
 {
-	${VISUAL}${3}
+	${VISUAL}$3
 }
 endsnippet
 
 snippet forif "foreach if (forif)" b
 foreach(${1:/*elem*/}; ${2:/*range*/}) if(${3:/*condition*/})
 {
-	${VISUAL}${4}
+	${VISUAL}$4
 }
 endsnippet
 
@@ -222,7 +222,7 @@ snippet in "in contract (in)" b
 in
 {
 	assert(${1:/*condition*/}, "${2:error message}");
-	${3}
+	$3
 }
 body
 endsnippet
@@ -231,7 +231,7 @@ snippet out "out contract (out)" b
 out${1:(result)}
 {
 	assert(${2:/*condition*/}, "${3:error message}");
-	${4}
+	$4
 }
 body
 endsnippet
@@ -240,7 +240,7 @@ snippet inv "invariant (inv)" b
 invariant()
 {
 	assert(${1:/*condition*/}, "${2:error message}");
-	${3}
+	$3
 }
 endsnippet
 
@@ -249,21 +249,21 @@ endsnippet
 snippet fun "function definition (fun)"
 ${1:void} ${2:/*function name*/}(${3:/*args*/}) ${4:@safe pure nothrow}
 {
-	${VISUAL}${5}
+	${VISUAL}$5
 }
 endsnippet
 
 snippet void "void function definition (void)"
 void ${1:/*function name*/}(${2:/*args*/}) ${3:@safe pure nothrow}
 {
-	${VISUAL}${4}
+	${VISUAL}$4
 }
 endsnippet
 
 snippet this "ctor (this)" w
 this(${1:/*args*/})
 {
-	${VISUAL}${2}
+	${VISUAL}$2
 }
 endsnippet
 
@@ -295,16 +295,16 @@ endsnippet
 snippet scope "scope (scope)" b
 scope(${1:exit})
 {
-	${VISUAL}${2}
+	${VISUAL}$2
 }
 endsnippet
 
 # With
 
 snippet with "with (with)"
-with(${1})
+with($1)
 {
-	${VISUAL}${2}
+	${VISUAL}$2
 }
 endsnippet
 
@@ -315,7 +315,7 @@ try
 {
 	${VISUAL}${1:/*code to try*/}
 }
-catch(${2}Exception e)
+catch($2Exception e)
 {
 	${3:/*handle exception*/}
 }
@@ -326,7 +326,7 @@ try
 {
 	${VISUAL}${1:/*code to try*/}
 }
-catch(${2}Exception e)
+catch($2Exception e)
 {
 	${3:/*handle exception*/}
 }
@@ -337,14 +337,14 @@ finally
 endsnippet
 
 snippet catch "catch (catch)" b
-catch(${1}Exception e)
+catch($1Exception e)
 {
 	${2:/*handle exception*/}
 }
 endsnippet
 
 snippet thr "throw (thr)"
-throw new ${1}Exception("${2}");
+throw new $1Exception("$2");
 endsnippet
 
 
@@ -353,35 +353,35 @@ endsnippet
 snippet struct "struct (struct)"
 struct ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-	${2}
+	$2
 }
 endsnippet
 
 snippet union "union (union)"
 union ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-	${2}
+	$2
 }
 endsnippet
 
 snippet class "class (class)"
 class ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-	${2}
+	$2
 }
 endsnippet
 
 snippet inter "interface (inter)"
 interface ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-	${2}
+	$2
 }
 endsnippet
 
 snippet enum "enum (enum)"
 enum ${1:`!p snip.rv = (snip.basename or "name")`}
 {
-	${2}
+	$2
 }
 endsnippet
 
@@ -390,7 +390,7 @@ endsnippet
 
 snippet exc "exception declaration (exc)" b
 /// ${3:/*documentation*/}
-class ${1}Exception : ${2}Exception
+class $1Exception : $2Exception
 {
 	public this(string msg, string file = __FILE__, int line = __LINE__)
 	{
@@ -405,14 +405,14 @@ endsnippet
 snippet version "version (version)" b
 version(${1:/*version name*/})
 {
-	${VISUAL}${2}
+	${VISUAL}$2
 }
 endsnippet
 
 snippet debug "debug" b
 debug
 {
-	${VISUAL}${1}
+	${VISUAL}$1
 }
 endsnippet
 
@@ -422,7 +422,7 @@ endsnippet
 snippet temp "template (temp)" b
 template ${2:/*name*/}(${1:/*args*/})
 {
-	${3}
+	$3
 }
 endsnippet
 
@@ -440,7 +440,7 @@ endsnippet
 snippet unittest "unittest (unittest)" b
 unittest
 {
-	${1}
+	$1
 }
 endsnippet
 
@@ -450,21 +450,21 @@ endsnippet
 snippet opDis "opDispatch (opDis)" b
 ${1:/*return type*/} opDispatch(string s)()
 {
-	${2};
+	$2;
 }
 endsnippet
 
 snippet op= "opAssign (op=)" b
-void opAssign(${1} rhs) ${2:@safe pure nothrow}
+void opAssign($1 rhs) ${2:@safe pure nothrow}
 {
-	${2}
+	$2
 }
 endsnippet
 
 snippet opCmp "opCmp (opCmp)" b
-int opCmp(${1} rhs) @safe const pure nothrow
+int opCmp($1 rhs) @safe const pure nothrow
 {
-	${2}
+	$2
 }
 endsnippet
 
@@ -484,7 +484,7 @@ endsnippet
 snippet toString "toString (toString)" b
 string toString() @safe const pure nothrow
 {
-	${1}
+	$1
 }
 endsnippet
 
@@ -493,7 +493,7 @@ endsnippet
 
 
 snippet todo "TODO (todo)"
-// TODO: ${1}
+// TODO: $1
 endsnippet
 
 
@@ -509,16 +509,16 @@ snippet fdoc "function ddoc block (fdoc)" b
 /// ${1:description}
 ///
 /// ${2:Params:  ${3:param} = ${4:param description}
-///			 ${5}}
+///			 $5}
 ///
 /// ${6:Returns: ${7:return value}}
 ///
-/// ${8:Throws:  ${9}Exception ${10}}
+/// ${8:Throws:  $9Exception $10}
 endsnippet
 
 snippet Par "Params (Par)"
 Params:  ${1:param} = ${2:param description}
-///			${3}
+///			$3
 endsnippet
 
 snippet Ret "Returns (Ret)"
@@ -526,7 +526,7 @@ Returns:  ${1:return value/s}
 endsnippet
 
 snippet Thr "Throws (Thr)"
-Throws:  ${1}Exception ${2}
+Throws:  $1Exception $2
 endsnippet
 
 snippet Example "Examples (Example)"
@@ -556,7 +556,7 @@ snippet gpl "GPL (gpl)" b
 //
 // Copyright (C) ${1:Author}, `!v strftime("%Y")`
 
-${2}
+$2
 endsnippet
 
 snippet boost "Boost (boost)" b
@@ -565,7 +565,7 @@ snippet boost "Boost (boost)" b
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-${2}
+$2
 endsnippet
 
 
@@ -577,8 +577,8 @@ snippet module "New module (module)" b
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-module ${2}.`!v vim_snippets#Filename('$1', 'name')`;
+module $2.`!v vim_snippets#Filename('$1', 'name')`;
 
 
-${3}
+$3
 endsnippet
diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 0ba6c9d59..8f8362882 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -124,7 +124,7 @@ endsnippet
 
 snippet model "Model" b
 class ${1:MODELNAME}(models.Model):
-	${0}
+	$0
 	class Meta:
 		verbose_name = "$1"
 		verbose_name_plural = "$1s"
@@ -275,19 +275,19 @@ endsnippet
 # VIEWS SNIPPETS
 
 snippet adminview "Model Admin View" b
-class ${1}Admin(admin.ModelAdmin):
+class $1Admin(admin.ModelAdmin):
 	'''
-		Admin View for ${1}
+		Admin View for $1
 	'''
-	list_display = ('${2}',)
-	list_filter = ('${3}',)
+	list_display = ('$2',)
+	list_filter = ('$3',)
 	inlines = [
-		${4}Inline,
+		$4Inline,
 	]
-	raw_id_fields = ('${5}',)
-	readonly_fields = ('${6}',)
-	search_fields = ['${7}']
-admin.site.register(${1}, ${1}Admin)
+	raw_id_fields = ('$5',)
+	readonly_fields = ('$6',)
+	search_fields = ['$7']
+admin.site.register($1, $1Admin)
 endsnippet
 
 snippet createview "Generic Create View" b
@@ -315,27 +315,27 @@ class ${1:MODEL_NAME}ListView(ListView):
 endsnippet
 
 snippet stackedinline "Stacked Inline" b
-class ${1}Inline(admin.StackedInline):
+class $1Inline(admin.StackedInline):
 	'''
-	Stacked Inline View for ${1}
+	Stacked Inline View for $1
 	'''
-	model = ${2:${1}}
+	model = ${2:$1}
 	min_num = ${3:3}
 	max_num = ${4:20}
 	extra = ${5:1}
-	raw_id_fields = (${6},)
+	raw_id_fields = ($6,)
 endsnippet
 
 snippet tabularinline "Tabular Inline" b
-class ${1}Inline(admin.TabularInline):
+class $1Inline(admin.TabularInline):
 	'''
-	Tabular Inline View for ${1}
+	Tabular Inline View for $1
 	'''
-	model = ${2:${1}}
+	model = ${2:$1}
 	min_num = ${3:3}
 	max_num = ${4:20}
 	extra = ${5:1}
-	raw_id_fields = (${6},)
+	raw_id_fields = ($6,)
 endsnippet
 
 snippet templateview "Generic Template View" b
diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index fe38c2fcc..ef93be440 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -27,12 +27,12 @@ def textmate_var(var, snip):
 endglobal
 
 
-snippet % "<% ${0} %>" i
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`${0}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
+snippet % "<% $0 %>" i
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`$0`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
 endsnippet
 
-snippet = "<%= ${0} %>" i
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${0}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+snippet = "<%= $0 %>" i
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`$0`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 ###########################################################################
@@ -150,11 +150,11 @@ snippet licai "link_to (controller, action, id)" w
 endsnippet
 
 snippet linpp "link_to (nested path plural)" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${10:parent}_${11:child}_path(${12:@}${13:${10}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${10:parent}_${11:child}_path(${12:@}${13:$10})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet linp "link_to (nested path)" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:parent}_${13:child}_path(${14:@}${15:$12}, ${16:@}${17:$13})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet lipp "link_to (path plural)" w
@@ -162,7 +162,7 @@ snippet lipp "link_to (path plural)" w
 endsnippet
 
 snippet lip "link_to (path)" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:model}_path(${13:@}${14:${12}})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:model}_path(${13:@}${14:$12})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet lim "link_to model" w
diff --git a/UltiSnips/go.snippets b/UltiSnips/go.snippets
index b6891ff0e..35cf9091d 100644
--- a/UltiSnips/go.snippets
+++ b/UltiSnips/go.snippets
@@ -53,7 +53,7 @@ endsnippet
 
 snippet switch "Switch statement" b
 switch ${1:expression}${1/(.+)/ /}{
-case${0}
+case$0
 }
 endsnippet
 
diff --git a/UltiSnips/html_minimal.snippets b/UltiSnips/html_minimal.snippets
index e7ca5e063..5fb75223e 100644
--- a/UltiSnips/html_minimal.snippets
+++ b/UltiSnips/html_minimal.snippets
@@ -4,24 +4,24 @@
 priority -50
 
 snippet id
-id="${1}"${2}
+id="$1"$2
 endsnippet
 
 snippet idn
-id="${1}" name="${2:$1}"
+id="$1" name="${2:$1}"
 endsnippet
 
 snippet label_and_input
-<label for="${2:$1}">${1}</label>
-<input type="${3:text}" name="${4:$2}"${5: id="${6:$2}"} value="${7}" />${8}
+<label for="${2:$1}">$1</label>
+<input type="${3:text}" name="${4:$2}"${5: id="${6:$2}"} value="$7" />$8
 endsnippet
 
 snippet input
-<input type="${1:text}" value="${2}" name="${3}"${4: id="${5:$3}"}/>${7}
+<input type="${1:text}" value="$2" name="$3"${4: id="${5:$3}"}/>$7
 endsnippet
 
 snippet submit
-<input type="submit" value="${2}" ${3}/>${7}
+<input type="submit" value="$2" $3/>$7
 endsnippet
 
 snippet textarea
diff --git a/UltiSnips/htmldjango.snippets b/UltiSnips/htmldjango.snippets
index 37fa85fd0..2ef004e28 100644
--- a/UltiSnips/htmldjango.snippets
+++ b/UltiSnips/htmldjango.snippets
@@ -4,30 +4,30 @@ extends html
 
 # Generic Tags
 snippet % "" bi
-{% ${1} %}${2}
+{% $1 %}$2
 endsnippet
 
 snippet %% "" bi
 {% ${1:tag_name} %}
-	${2}
+	$2
 {% end$1 %}
 endsnippet
 
 snippet { "" bi
-{{ ${1} }}${2}
+{{ $1 }}$2
 endsnippet
 
 # Template Tags
 
 snippet autoescape "" bi
 {% autoescape ${1:off} %}
-	${2}
+	$2
 {% endautoescape %}
 endsnippet
 
 snippet block "" bi
-{% block ${1} %}
-	${2}
+{% block $1 %}
+	$2
 {% endblock $1 %}
 endsnippet
 
@@ -37,12 +37,12 @@ endsnippet
 
 snippet comment "" bi
 {% comment %}
-	${1}
+	$1
 {% endcomment %}
 endsnippet
 
 snippet cycle "" bi
-{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
+{% cycle ${1:val1} ${2:val2} ${3:as $4} %}
 endsnippet
 
 snippet debug "" bi
@@ -54,76 +54,76 @@ snippet extends "" bi
 endsnippet
 
 snippet filter "" bi
-{% filter ${1} %}
-	${2}
+{% filter $1 %}
+	$2
 {% endfilter %}
 endsnippet
 
 snippet firstof "" bi
-{% firstof ${1} %}
+{% firstof $1 %}
 endsnippet
 
 snippet for "" bi
-{% for ${1} in ${2} %}
-	${3}
+{% for $1 in $2 %}
+	$3
 {% endfor %}
 endsnippet
 
 snippet empty "" bi
 {% empty %}
-	${1}
+	$1
 endsnippet
 
 snippet if "" bi
-{% if ${1} %}
-	${2}
+{% if $1 %}
+	$2
 {% endif %}
 endsnippet
 
 snippet iif "" bi
-{% if ${1} %}${2}{% endif %}
+{% if $1 %}$2{% endif %}
 endsnippet
 
 snippet ielse "" bi
-{% else %}${1}
+{% else %}$1
 endsnippet
 
 snippet else "" bi
 {% else %}
-	${1}
+	$1
 endsnippet
 
 snippet ielif "" bi
-{% elif %}${1}
+{% elif %}$1
 endsnippet
 
 snippet elif "" bi
 {% elif %}
-	${1}
+	$1
 endsnippet
 
 snippet ifchanged "" bi
-{% ifchanged %}${1}{% endifchanged %}
+{% ifchanged %}$1{% endifchanged %}
 endsnippet
 
 snippet ifequal "" bi
-{% ifequal ${1} ${2} %}
-	${3}
+{% ifequal $1 $2 %}
+	$3
 {% endifequal %}
 endsnippet
 
 snippet ifnotequal "" bi
-{% ifnotequal ${1} ${2} %}
-	${3}
+{% ifnotequal $1 $2 %}
+	$3
 {% endifnotequal %}
 endsnippet
 
 snippet include "" bi
-{% include "${1}" %}
+{% include "$1" %}
 endsnippet
 
 snippet load "" bi
-{% load ${1} %}
+{% load $1 %}
 endsnippet
 
 snippet now "" bi
@@ -131,15 +131,15 @@ snippet now "" bi
 endsnippet
 
 snippet regroup "" bi
-{% regroup ${1} by ${2} as ${3} %}
+{% regroup $1 by $2 as $3 %}
 endsnippet
 
 snippet spaceless "" bi
-{% spaceless %}${1}{% endspaceless %}
+{% spaceless %}$1{% endspaceless %}
 endsnippet
 
 snippet ssi "" bi
-{% ssi ${1} %}
+{% ssi $1 %}
 endsnippet
 
 snippet trans "" bi
@@ -147,7 +147,7 @@ snippet trans "" bi
 endsnippet
 
 snippet url "" bi
-{% url ${1} as ${2} %}
+{% url $1 as $2 %}
 endsnippet
 
 snippet widthratio "" bi
@@ -155,7 +155,7 @@ snippet widthratio "" bi
 endsnippet
 
 snippet with "" bi
-{% with ${1} as ${2} %}
+{% with $1 as $2 %}
 	${VISUAL}
 {% endwith %}
 endsnippet
@@ -197,7 +197,7 @@ snippet blocktrans "" bi
 endsnippet
 
 snippet lorem "" bi
-{% lorem ${1} %}
+{% lorem $1 %}
 endsnippet
 
 # Template Filters
@@ -209,91 +209,91 @@ endsnippet
 # Note: Template tags that take no arguments are not implemented.
 
 snippet add "" bi
-add:"${1}"
+add:"$1"
 endsnippet
 
 snippet center "" bi
-center:"${1}"
+center:"$1"
 endsnippet
 
 snippet cut "" bi
-cut:"${1}"
+cut:"$1"
 endsnippet
 
 snippet date "" bi
-date:"${1}"
+date:"$1"
 endsnippet
 
 snippet default "" bi
-default:"${1}"
+default:"$1"
 endsnippet
 
 snippet defaultifnone "" bi
-default_if_none:"${1}"
+default_if_none:"$1"
 endsnippet
 
 snippet dictsort "" bi
-dictsort:"${1}"
+dictsort:"$1"
 endsnippet
 
 snippet dictsortrev "" bi
-dictsortreversed:"${1}"
+dictsortreversed:"$1"
 endsnippet
 
 snippet divisibleby "" bi
-divisibleby:"${1}"
+divisibleby:"$1"
 endsnippet
 
 snippet floatformat "" bi
-floatformat:"${1}"
+floatformat:"$1"
 endsnippet
 
 snippet getdigit "" bi
-get_digit:"${1}"
+get_digit:"$1"
 endsnippet
 
 snippet join "" bi
-join:"${1}"
+join:"$1"
 endsnippet
 
 snippet lengthis "" bi
-length_is:"${1}"
+length_is:"$1"
 endsnippet
 
 snippet pluralize "" bi
-pluralize:"${1}"
+pluralize:"$1"
 endsnippet
 
 snippet removetags "" bi
-removetags:"${1}"
+removetags:"$1"
 endsnippet
 
 snippet slice "" bi
-slice:"${1}"
+slice:"$1"
 endsnippet
 
 snippet stringformat "" bi
-stringformat:"${1}"
+stringformat:"$1"
 endsnippet
 
 snippet time "" bi
-time:"${1}"
+time:"$1"
 endsnippet
 
 snippet truncatewords "" bi
-truncatewords:${1}
+truncatewords:$1
 endsnippet
 
 snippet truncatewordshtml "" bi
-truncatewords_html:${1}
+truncatewords_html:$1
 endsnippet
 
 snippet urlizetrunc "" bi
-urlizetrunc:${1}
+urlizetrunc:$1
 endsnippet
 
 snippet wordwrap "" bi
-wordwrap:${1}
+wordwrap:$1
 endsnippet
 
 # vim:ft=snippets:
diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 54d026dfb..55883a365 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -48,7 +48,7 @@ $0
 endsnippet
 
 snippet /o|v/ "new Object or variable" br
-${1:Object} ${2:var} = new $1(${3});
+${1:Object} ${2:var} = new $1($3);
 endsnippet
 
 snippet f "field" b
@@ -310,13 +310,13 @@ try {
 endsnippet
 
 snippet mt "method throws" b
-${1:private} ${2:void} ${3:method}(${4}) ${5:throws $6 }{
+${1:private} ${2:void} ${3:method}($4) ${5:throws $6 }{
 	$0
 }
 endsnippet
 
 snippet m  "method" b
-${1:private} ${2:void} ${3:method}(${4}) {
+${1:private} ${2:void} ${3:method}($4) {
 	$0
 }
 endsnippet
diff --git a/UltiSnips/javascript-angular.snippets b/UltiSnips/javascript-angular.snippets
index 91b593165..c231ece16 100644
--- a/UltiSnips/javascript-angular.snippets
+++ b/UltiSnips/javascript-angular.snippets
@@ -19,7 +19,7 @@ config(function($1) {
 endsnippet
 
 snippet acont "angular controller" i
-controller('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+controller('${1:name}', [$2function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
@@ -31,29 +31,29 @@ controller('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)
 endsnippet
 
 snippet adir "angular directive" i
-directive('${1}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+directive('$1', [$2function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	return {
 		restrict: '${3:EA}',
 		link: function(scope, element, attrs) {
-			${0}
+			$0
 		}
 	};
 }]);
 endsnippet
 
 snippet adirs "angular directive with scope" i
-directive('${1}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+directive('$1', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	return {
 		restrict: '${3:EA}',
 		link: function(scope, element, attrs) {
-			${0}
+			$0
 		}
 	};
 }]);
 endsnippet
 
 snippet afact "angular factory" i
-factory('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+factory('${1:name}', [$2function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
@@ -65,7 +65,7 @@ factory('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$
 endsnippet
 
 snippet aserv "angular service" i
-service('${1:name}', [${2}function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+service('${1:name}', [$2function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
 	$0
 }]);
 endsnippet
diff --git a/UltiSnips/javascript-node.snippets b/UltiSnips/javascript-node.snippets
index 7a14deeb9..e4a64e959 100644
--- a/UltiSnips/javascript-node.snippets
+++ b/UltiSnips/javascript-node.snippets
@@ -5,48 +5,48 @@ snippet #! "shebang"
 endsnippet
 
 snippet vreq "assign a CommonJS-style module to a var"
-var ${0:${1/(.+\/)*(\w+)(-|\b|$)(\..+$)?/\u$2/g}} = require('${1}');
+var ${0:${1/(.+\/)*(\w+)(-|\b|$)(\..+$)?/\u$2/g}} = require('$1');
 endsnippet
 
 snippet ex "module.exports"
-module.exports = ${1};
+module.exports = $1;
 endsnippet
 
 snippet hcs "http.createServer"
-http.createServer(${1}).listen(${2});
+http.createServer($1).listen($2);
 endsnippet
 
 snippet ncs "net.createServer"
 net.createServer(function(${1:socket}){
-	${1}.on('data', function(${3:data}){
-		${4}
+	$1.on('data', function(${3:data}){
+		$4
 	});
-	${1}.on('end', function(){
-		${5}
+	$1.on('end', function(){
+		$5
 	});
 }).listen(${6:8124});
 endsnippet
 
 snippet pipe "pipe"
-pipe(${1:stream})${2}
+pipe(${1:stream})$2
 endsnippet
 
 # Express snippets
 
 snippet eget "express GET"
-${1:app}.get('${2}', ${3});
+${1:app}.get('$2', $3);
 endsnippet
 
 snippet epost "express POST"
-${1:app}.post('${2}', ${3});
+${1:app}.post('$2', $3);
 endsnippet
 
 snippet eput "express PUT"
-${1:app}.put('${2}', ${3});
+${1:app}.put('$2', $3);
 endsnippet
 
 snippet edelete "express DELETE"
-${1:app}.delete('${2}', ${3});
+${1:app}.delete('$2', $3);
 endsnippet
 
 # process snippets
diff --git a/UltiSnips/javascript-openui5.snippets b/UltiSnips/javascript-openui5.snippets
index 5553c79ae..db4481cdc 100644
--- a/UltiSnips/javascript-openui5.snippets
+++ b/UltiSnips/javascript-openui5.snippets
@@ -1,80 +1,80 @@
 snippet sapmlabel
-	var ${1} = new sap.m.Label({ 
-				design : ${2}, 
-				text : ${3}, 
-				visible : ${4}, 
-				textAlign : ${5}, 
-				textDirection : ${6}, 
-				width : ${7}, 
-				required : ${7}
+	var $1 = new sap.m.Label({ 
+				design : $2, 
+				text : $3, 
+				visible : $4, 
+				textAlign : $5, 
+				textDirection : $6, 
+				width : $7, 
+				required : $7
 			});
 
 snippet sapmtext
-	var ${1} = new sap.m.Text({
-				text :${2},
-				textDirection :${3},
-				visible :${4},
-				wrapping : ${5},
-				textAlign : ${6},
-				width :${7},
-				maxLines :${8}
+	var $1 = new sap.m.Text({
+				text :$2,
+				textDirection :$3,
+				visible :$4,
+				wrapping : $5,
+				textAlign : $6,
+				width :$7,
+				maxLines :$8
 			});
 
 snippet sapmbutton
-	var ${1} = new sap.m.Button({
-				text : ${2},
-				type : ${3},
-				width : ${4},
-				enabled :${5},
-				visible :${6},
-				icon : ${7},
-				iconFirst : ${8},
-				activeIcon :${9},
-				iconDensityAware : ${10},
+	var $1 = new sap.m.Button({
+				text : $2,
+				type : $3,
+				width : $4,
+				enabled :$5,
+				visible :$6,
+				icon : $7,
+				iconFirst : $8,
+				activeIcon :$9,
+				iconDensityAware : $10,
 			});
 snippet sapmflexbox
-	var ${1} = new sap.m.FlexBox({
-				visible : ${2},
-				height : ${3},
-				width : ${4},
-				displayInline :${5},
-				direction :${6},
-				fitContainer : ${7},
-				renderType : ${8},
-				justifyContent :${9},
-				alignItems : ${10},
+	var $1 = new sap.m.FlexBox({
+				visible : $2,
+				height : $3,
+				width : $4,
+				displayInline :$5,
+				direction :$6,
+				fitContainer : $7,
+				renderType : $8,
+				justifyContent :$9,
+				alignItems : $10,
 				items:[]
 			});
 snippet sapmhbox
-	var ${1} = new sap.m.HBox({
-				visible : ${2},
-				height : ${3},
-				width : ${4},
-				displayInline :${5},
-				direction :${6},
-				fitContainer : ${7},
-				renderType : ${8},
-				justifyContent :${9},
-				alignItems : ${10},
+	var $1 = new sap.m.HBox({
+				visible : $2,
+				height : $3,
+				width : $4,
+				displayInline :$5,
+				direction :$6,
+				fitContainer : $7,
+				renderType : $8,
+				justifyContent :$9,
+				alignItems : $10,
 				items:[]
 			});
 
 snippet sapmvbox
-	var ${1} = new sap.m.VBox({
-				visible : ${2},
-				height : ${3},
-				width : ${4},
-				displayInline :${5},
-				direction :${6},
-				fitContainer : ${7},
-				renderType : ${8},
-				justifyContent :${9},
-				alignItems : ${10},
+	var $1 = new sap.m.VBox({
+				visible : $2,
+				height : $3,
+				width : $4,
+				displayInline :$5,
+				direction :$6,
+				fitContainer : $7,
+				renderType : $8,
+				justifyContent :$9,
+				alignItems : $10,
 				items:[]
 			});
 
 snippet sapcomponent
-	sap.ui.controller("${1}", {
+	sap.ui.controller("$1", {
 	   onInit: function(){
 	   }, 
 	   onAfterRendering: function() {
@@ -86,120 +86,120 @@ snippet sapcomponent
 	});
 
 snippet sapminput
-	var ${1} = new sap.m.Input({
-		value :${2},
-		width : ${3},
-		enabled :${4},
-		visible :${5},
-		valueState :${6},
-		name : ${7},
-		placeholder : ${8},
-		editable : ${9},
-		type : ${10},
-		maxLength :${11}, 
-		valueStateText :${12}, 
-		showValueStateMessage :${13}, 
-		dateFormat :${14},
-		showValueHelp :${15},
-		showSuggestion :${16},
-		valueHelpOnly :${17},
-		filterSuggests :${18},
-		maxSuggestionWidth :${19},
-		startSuggestion : ${20},
-		showTableSuggestionValueHelp : ${21},
-		description : ${22},
-		fieldWidth : ${23},
-		valueLiveUpdate :${24},
-		suggestionItems  :[${25}],
-		suggestionColumns : [${26}],
-		suggestionRows : [${27}],
-		liveChange : ${28},
-		valueHelpRequest :${29}, 
-		suggest : ${30},
-		suggestionItemSelected : ${31}
+	var $1 = new sap.m.Input({
+		value :$2,
+		width : $3,
+		enabled :$4,
+		visible :$5,
+		valueState :$6,
+		name : $7,
+		placeholder : $8,
+		editable : $9,
+		type : $10,
+		maxLength :$11, 
+		valueStateText :$12, 
+		showValueStateMessage :$13, 
+		dateFormat :$14,
+		showValueHelp :$15,
+		showSuggestion :$16,
+		valueHelpOnly :$17,
+		filterSuggests :$18,
+		maxSuggestionWidth :$19,
+		startSuggestion : $20,
+		showTableSuggestionValueHelp : $21,
+		description : $22,
+		fieldWidth : $23,
+		valueLiveUpdate :$24,
+		suggestionItems  :[$25],
+		suggestionColumns : [$26],
+		suggestionRows : [$27],
+		liveChange : $28,
+		valueHelpRequest :$29, 
+		suggest : $30,
+		suggestionItemSelected : $31
 	});
 snippet _sthis
 	var _self = this;
 
 snippet sapmresponsivepopup
-	var ${1} = new sap.m.ResponsivePopover({
-				placement :${2} ,//sap.m.PlacementType (default: sap.m.PlacementType.Right)
-				showHeader :${3} ,//boolean (default: true)
-				title : ${4},//string
-				icon :${5} ,//sap.ui.core.URI
-				modal :${6} ,// boolean
-				offsetX :${7}, //int
-				offsetY :${8}, //int
-				contentWidth : ${9},//sap.ui.core.CSSSize
-				contentHeight :${10}, //sap.ui.core.CSSSize
-				horizontalScrolling :${11}, //boolean
-				verticalScrolling :${12}, //boolean
-				showCloseButton :${13}, //boolean (default: true)
+	var $1 = new sap.m.ResponsivePopover({
+				placement :$2 ,//sap.m.PlacementType (default: sap.m.PlacementType.Right)
+				showHeader :$3 ,//boolean (default: true)
+				title : $4,//string
+				icon :$5 ,//sap.ui.core.URI
+				modal :$6 ,// boolean
+				offsetX :$7, //int
+				offsetY :$8, //int
+				contentWidth : $9,//sap.ui.core.CSSSize
+				contentHeight :$10, //sap.ui.core.CSSSize
+				horizontalScrolling :$11, //boolean
+				verticalScrolling :$12, //boolean
+				showCloseButton :$13, //boolean (default: true)
 				//Aggregations
-				content :${14},  //sap.ui.core.Control[]
-				customHeader :${15},  //sap.m.IBar
-				subHeader : ${16}, //sap.m.IBar
-				beginButton :${17},  //sap.m.Button
-				endButton : ${18}, //sap.m.Button
+				content :$14,  //sap.ui.core.Control[]
+				customHeader :$15,  //sap.m.IBar
+				subHeader : $16, //sap.m.IBar
+				beginButton :$17,  //sap.m.Button
+				endButton : $18, //sap.m.Button
 				//Associations
-				initialFocus : ${19}, //string | sap.ui.core.Control
+				initialFocus : $19, //string | sap.ui.core.Control
 				//Events
-				beforeOpen :${20},  //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
-				afterOpen : ${21}, //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
-				beforeClose : ${22}, //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
-				afterClose : ${23} //fnList
+				beforeOpen :$20,  //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				afterOpen : $21, //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				beforeClose : $22, //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				afterClose : $23 //fnList
 			});
 
 snippet sapicon
-	var ${1} = new sap.ui.core.Icon({
-					src :${2} , //sap.ui.core.URI
-					size :${3} , //sap.ui.core.CSSSize
-					color :${4} , //sap.ui.core.CSSColor
-					hoverColor : ${5} ,  // sap.ui.core.CSSColor
-					activeColor :${6} , //sap.ui.core.CSSColor
-					width :${7} , //sap.ui.core.CSSSize
-					height : ${8} ,//sap.ui.core.CSSSize
-					backgroundColor :${8} , //sap.ui.core.CSSColor
-					hoverBackgroundColor :${9} , //sap.ui.core.CSSColor
-					activeBackgroundColor :${10} , //sap.ui.core.CSSColor
-					visible :${11} , //boolean (default: true)
-					decorative : ${12} ,//boolean (default: true)
+	var $1 = new sap.ui.core.Icon({
+					src :$2 , //sap.ui.core.URI
+					size :$3 , //sap.ui.core.CSSSize
+					color :$4 , //sap.ui.core.CSSColor
+					hoverColor : $5 ,  // sap.ui.core.CSSColor
+					activeColor :$6 , //sap.ui.core.CSSColor
+					width :$7 , //sap.ui.core.CSSSize
+					height : $8 ,//sap.ui.core.CSSSize
+					backgroundColor :$8 , //sap.ui.core.CSSColor
+					hoverBackgroundColor :$9 , //sap.ui.core.CSSColor
+					activeBackgroundColor :$10 , //sap.ui.core.CSSColor
+					visible :$11 , //boolean (default: true)
+					decorative : $12 ,//boolean (default: true)
 				});
 snippet extendVerticalL 
-	sap.ui.layout.VerticalLayout.extend("${1}", {
+	sap.ui.layout.VerticalLayout.extend("$1", {
 	    metadata: {
 		properties: {
-		  	${2} 
+		  	$2 
 		},
 		aggregations: {
-			${3}	
+			$3	
 		},
 		events: {
-			${4}
+			$4
 		}
 	    },
 	   init: function(){
-		${5}	
+		$5	
 	    },
 	    
-	    renderer: "${6}"
+	    renderer: "$6"
 	});	
 snippet extendHorizontalL 
-	sap.ui.layout.HorizontalLayout.extend("${1}", {
+	sap.ui.layout.HorizontalLayout.extend("$1", {
 	    metadata: {
 		properties: {
-		  	${2} 
+		  	$2 
 		},
 		aggregations: {
-			${3}	
+			$3	
 		},
 		events: {
-			${4}
+			$4
 		}
 	    },
 	   init: function(){
-		${5}	
+		$5	
 	    },
 	    
-	    renderer: "${6}"
+	    renderer: "$6"
 	});	
diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 8821c5caf..336a73756 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -53,7 +53,7 @@ function ${1:function_name}(${2:argument}) {
 endsnippet
 
 snippet vf "Function assigned to var"
-${1:var }${2:function_name} = function $2(${3}) {
+${1:var }${2:function_name} = function $2($3) {
 	${VISUAL}$0
 };
 endsnippet
diff --git a/UltiSnips/php-laravel.snippets b/UltiSnips/php-laravel.snippets
index de2447366..903d8586a 100644
--- a/UltiSnips/php-laravel.snippets
+++ b/UltiSnips/php-laravel.snippets
@@ -53,9 +53,9 @@ use Illuminate\Support\ServiceProvider;
 class ${2:`!v expand('%:t:r')`} extends ServiceProvider {
     
     public function register() {
-        $this->app->bind('${4}Service', function ($app) {
-            return new ${5}(
-                $app->make('Repositories\\${6}Interface')
+        $this->app->bind('$4Service', function ($app) {
+            return new $5(
+                $app->make('Repositories\\$6Interface')
             );
         });
     }
@@ -121,7 +121,7 @@ class ${2:`!v expand('%:t:r')`} extends \Eloquent {
 
     public $timestamps = ${5:false};
 
-    protected $hidden  = [${6}];
+    protected $hidden  = [$6];
 
     protected $guarded = [${7:'id'}];
 }
@@ -208,10 +208,10 @@ snippet l_r "Laravel Repository" b
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-namespace ${1:Repositories\\${2}};
+namespace ${1:Repositories\\$2};
 
-class ${3:`!v expand('%:t:r')`} extends \\${6} implements ${4:$3RepositoryInterface} {
-    ${7}
+class ${3:`!v expand('%:t:r')`} extends \\$6 implements ${4:$3RepositoryInterface} {
+    $7
 }
 endsnippet
 
@@ -227,7 +227,7 @@ snippet l_s "Laravel Service" b
  * \date        `!v strftime('%d-%m-%y')`
  */
 
-namespace Services\\${1};
+namespace Services\\$1;
 
 use ${3:Repositories\\${4:Interface}};
 
@@ -265,6 +265,6 @@ class ${2:`!v expand('%:t:r')`} extends Facade {
      *
      * \return      string
      */
-    protected static function getFacadeAccessor() { return '${4:${3}Service}'; }
+    protected static function getFacadeAccessor() { return '${4:$3Service}'; }
 }
 endsnippet
diff --git a/UltiSnips/php-phpspec.snippets b/UltiSnips/php-phpspec.snippets
index 08d84a053..a85f9bc4f 100644
--- a/UltiSnips/php-phpspec.snippets
+++ b/UltiSnips/php-phpspec.snippets
@@ -23,7 +23,7 @@ class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
 ` extends ObjectBehavior
 {
-	function it_${1}()
+	function it_$1()
 	{
 		$0
 	}
@@ -31,7 +31,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet it "function it_does_something() { ... }"
-function it_${1}()
+function it_$1()
 {
 	${0:${VISUAL}}
 }
@@ -53,7 +53,7 @@ endsnippet
 
 # Object construction
 snippet cw "$this->beConstructedWith($arg)"
-$this->beConstructedWith(${1});
+$this->beConstructedWith($1);
 endsnippet
 
 snippet ct "$this->beConstructedThrough($methodName, [$arg])"
@@ -112,44 +112,44 @@ endsnippet
 
 # Type matchers
 snippet stype "$this->shouldHaveType('Type')"
-$this->shouldHaveType(${1});
+$this->shouldHaveType($1);
 endsnippet
 
 snippet sntype "$this->shouldNotHaveType('Type')"
-$this->shouldNotHaveType(${1});
+$this->shouldNotHaveType($1);
 endsnippet
 
 snippet srinstance "$this->shouldReturnAnInstanceOf('Type')"
-$this->shouldReturnAnInstanceOf(${1});
+$this->shouldReturnAnInstanceOf($1);
 endsnippet
 
 snippet snrinstance "$this->shouldNotReturnAnInstanceOf('Type')"
-$this->shouldNotReturnAnInstanceOf(${1});
+$this->shouldNotReturnAnInstanceOf($1);
 endsnippet
 
 snippet sbinstance "$this->shouldBeAnInstanceOf('Type')"
-$this->shouldBeAnInstanceOf(${1});
+$this->shouldBeAnInstanceOf($1);
 endsnippet
 
 snippet snbinstance "$this->shouldNotBeAnInstanceOf('Type')"
-$this->shouldNotBeAnInstanceOf(${1});
+$this->shouldNotBeAnInstanceOf($1);
 endsnippet
 
 snippet simplement "$this->shouldImplement('Type')"
-$this->shouldImplement(${1});
+$this->shouldImplement($1);
 endsnippet
 
 snippet snimplement "$this->shouldNotImplement('Type')"
-$this->shouldNotImplement(${1});
+$this->shouldNotImplement($1);
 endsnippet
 
 # Object state matchers
 snippet sbstate "$this->shouldBeXYZ()"
-$this->shouldBe${1}();
+$this->shouldBe$1();
 endsnippet
 
 snippet snbstate "$this->shouldNotBeXYZ()"
-$this->shouldNotBe${1}();
+$this->shouldNotBe$1();
 endsnippet
 
 # Count matchers
diff --git a/UltiSnips/php-symfony2.snippets b/UltiSnips/php-symfony2.snippets
index 9bca168c5..7e3d5804a 100644
--- a/UltiSnips/php-symfony2.snippets
+++ b/UltiSnips/php-symfony2.snippets
@@ -67,25 +67,25 @@ endsnippet
 
 snippet act "Symfony2 action" b
 /**
- * @Route("${3}", name="${4}")
+ * @Route("$3", name="$4")
  * @Method({${5:"POST"}})
  * @Template()
  */
-public function ${1}Action(${2})
+public function $1Action($2)
 {
-	${6}
+	$6
 }
 endsnippet
 
 snippet actt "Symfony2 action and template" b
 /**
- * @Route("${3}", name="${4}")
+ * @Route("$3", name="$4")
  * @Method({${5:"GET"}})
  * @Template()
  */
-public function ${1}Action(${2})
+public function $1Action($2)
 {
-	${6}
+	$6
 	return [];
 }`!p
 relpath = os.path.relpath(path)`
@@ -116,8 +116,8 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 {
 	protected function configure()
 	{
-		$this->setName('${1}')
-			->setDescription('${2}')
+		$this->setName('$1')
+			->setDescription('$2')
 			->setDefinition([
 				new InputArgument('', InputArgument::REQUIRED, ''),
 				new InputOption('', null, InputOption::VALUE_NONE, ''),
@@ -186,14 +186,14 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 	/**
 	 * {@inheritDoc}
 	 */
-	public function transform(${1})
+	public function transform($1)
 	{
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function reverseTransform(${2})
+	public function reverseTransform($2)
 	{
 	}
 }
@@ -279,7 +279,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 	 */
 	public function getName()
 	{
-		return '${1}';
+		return '$1';
 	}
 }
 endsnippet
@@ -307,54 +307,54 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 endsnippet
 
 snippet redir "Symfony2 redirect" b
-$this->redirect($this->generateUrl('${1}', ${2}));
+$this->redirect($this->generateUrl('$1', $2));
 endsnippet
 
 snippet usecontroller "Symfony2 use Symfony\..\Controller" b
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;${1}
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;$1
 endsnippet
 
 snippet usereauest "Symfony2 use Symfony\..\Request" b
-use Symfony\Component\HttpFoundation\Request;${1}
+use Symfony\Component\HttpFoundation\Request;$1
 endsnippet
 
 snippet useroute "Symfony2 use Sensio\..\Route" b
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;${1}
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;$1
 endsnippet
 
 snippet useresponse "Symfony2 use Symfony\..\Response" b
-use Symfony\Component\HttpFoundation\Response;${1}
+use Symfony\Component\HttpFoundation\Response;$1
 endsnippet
 
 snippet usefile "Symfony2 use Symfony\..\File" b
-use Symfony\Component\HttpFoundation\File\UploadedFile;${1}
+use Symfony\Component\HttpFoundation\File\UploadedFile;$1
 endsnippet
 
 snippet useassert "Symfony2 use Symfony\..\Constraints as Assert" b
-use Symfony\Component\Validator\Constraints as Assert;${1}
+use Symfony\Component\Validator\Constraints as Assert;$1
 endsnippet
 
 snippet usetemplate "Symfony2 use Sensio\..\Template" b
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;${1}
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;$1
 endsnippet
 
 snippet usecache "Symfony2 use Sensio\..\Cache" b
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;${1}
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;$1
 endsnippet
 
 snippet usemethod "Symfony2 use Sensio\..\Method" b
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;${1}
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;$1
 endsnippet
 
 snippet usearray "Symfony2 use Doctrine\..\ArrayCollection" b
-use Doctrine\Common\Collections\ArrayCollection;${1}
+use Doctrine\Common\Collections\ArrayCollection;$1
 endsnippet
 
 snippet useorm "Symfony2 use Doctrine\..\Mapping as ORM" b
-use Doctrine\ORM\Mapping as ORM;${1}
+use Doctrine\ORM\Mapping as ORM;$1
 endsnippet
 
 snippet usesecure "Symfony2 use JMS\..\Secure" b
-use JMS\SecurityExtraBundle\Annotation\Secure;${1}
+use JMS\SecurityExtraBundle\Annotation\Secure;$1
 endsnippet
 
diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index c7344a592..dde0def92 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -250,7 +250,7 @@ class `!p
 snip.rv = re.match(r'.*(?=\.)', fn).group()
 ` extends \PHPUnit_Framework_TestCase
 {
-	public function test${1}()
+	public function test$1()
 	{
 		${0:${VISUAL}}
 	}
diff --git a/UltiSnips/proto.snippets b/UltiSnips/proto.snippets
index 923be5786..11e901079 100644
--- a/UltiSnips/proto.snippets
+++ b/UltiSnips/proto.snippets
@@ -32,17 +32,17 @@ endsnippet
 
 snippet reqf "Required field" b
 // ${4:TODO(`whoami`): Describe this field.}
-optional ${1}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};  // Required
+optional $1`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};  // Required
 endsnippet
 
 snippet optf "Optional field" b
 // ${4:TODO(`whoami`): Describe this field.}
-optional ${1}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
+optional $1`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
 endsnippet
 
 snippet repf "Repeated field" b
 // ${4:TODO(`whoami`): Describe this field.}
-repeated ${1}`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
+repeated $1`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
 endsnippet
 
 snippet enum "Enumeration" b
diff --git a/UltiSnips/puppet.snippets b/UltiSnips/puppet.snippets
index 1b2cfc574..7b39094c9 100644
--- a/UltiSnips/puppet.snippets
+++ b/UltiSnips/puppet.snippets
@@ -133,103 +133,103 @@ endsnippet
 ########################################################################
 
 snippet alert "Alert Function" b
-alert("${1:message}")${0}
+alert("${1:message}")$0
 endsnippet
 
 snippet crit "Crit Function" b
-crit("${1:message}")${0}
+crit("${1:message}")$0
 endsnippet
 
 snippet debug "Debug Function" b
-debug("${1:message}")${0}
+debug("${1:message}")$0
 endsnippet
 
 snippet defined "Defined Function" b
-defined(${1:Resource}["${2:name}"])${0}
+defined(${1:Resource}["${2:name}"])$0
 endsnippet
 
 snippet emerg "Emerg Function" b
-emerg("${1:message}")${0}
+emerg("${1:message}")$0
 endsnippet
 
 snippet extlookup "Simple Extlookup" b
-$${1:Variable} = extlookup("${2:Lookup}")${0}
+$${1:Variable} = extlookup("${2:Lookup}")$0
 endsnippet
 
 snippet extlookup "Extlookup with defaults" b
-$${1:Variable} = extlookup("${2:Lookup}", ${3:Default})${0}
+$${1:Variable} = extlookup("${2:Lookup}", ${3:Default})$0
 endsnippet
 
 snippet extlookup "Extlookup with defaults and custom data file" b
-$${1:Variable} = extlookup("${2:Lookup}", ${3:Default}, ${4:Data Source})${0}
+$${1:Variable} = extlookup("${2:Lookup}", ${3:Default}, ${4:Data Source})$0
 endsnippet
 
 snippet fail "Fail Function" b
-fail("${1:message}")${0}
+fail("${1:message}")$0
 endsnippet
 
 snippet hiera "Hiera Function" b
-$${1:Variable} = hiera("${2:Lookup}")${0}
+$${1:Variable} = hiera("${2:Lookup}")$0
 endsnippet
 
 snippet hiera "Hiera with defaults" b
-$${1:Variable} = hiera("${2:Lookup}", ${3:Default})${0}
+$${1:Variable} = hiera("${2:Lookup}", ${3:Default})$0
 endsnippet
 
 snippet hiera "Hiera with defaults and override" b
-$${1:Variable} = hiera("${2:Lookup}", ${3:Default}, ${4:Override})${0}
+$${1:Variable} = hiera("${2:Lookup}", ${3:Default}, ${4:Override})$0
 endsnippet
 
 snippet hiera_hash "Hiera Hash Function" b
-$${1:Variable} = hiera_hash("${2:Lookup}")${0}
+$${1:Variable} = hiera_hash("${2:Lookup}")$0
 endsnippet
 
 snippet hiera_hash "Hiera Hash with defaults" b
-$${1:Variable} = hiera_hash("${2:Lookup}", ${3:Default})${0}
+$${1:Variable} = hiera_hash("${2:Lookup}", ${3:Default})$0
 endsnippet
 
 snippet hiera_hash "Hiera Hash with defaults and override" b
-$${1:Variable} = hiera_hash("${2:Lookup}", ${3:Default}, ${4:Override})${0}
+$${1:Variable} = hiera_hash("${2:Lookup}", ${3:Default}, ${4:Override})$0
 endsnippet
 
 snippet hiera_include "Hiera Include Function" b
-hiera_include("${1:Lookup}")${0}
+hiera_include("${1:Lookup}")$0
 endsnippet
 
 snippet include "Include Function" b
-include ${1:classname}${0}
+include ${1:classname}$0
 endsnippet
 
 snippet info "Info Function" b
-info("${1:message}")${0}
+info("${1:message}")$0
 endsnippet
 
 snippet inline_template "Inline Template Function" b
-inline_template("<%= ${1:template} %>")${0}
+inline_template("<%= ${1:template} %>")$0
 endsnippet
 
 snippet notice "Notice Function" b
-notice("${1:message}")${0}
+notice("${1:message}")$0
 endsnippet
 
 snippet realize "Realize Function" b
-realize(${1:Resource}["${2:name}"])${0}
+realize(${1:Resource}["${2:name}"])$0
 endsnippet
 
 snippet regsubst "Regsubst Function" b
-regsubst($${1:Target}, '${2:regexp}', '${3:replacement}')${0}
+regsubst($${1:Target}, '${2:regexp}', '${3:replacement}')$0
 endsnippet
 
 snippet split "Split Function" b
-$${1:Variable} = split($${1:Target}, '${2:regexp}')${0}
+$${1:Variable} = split($${1:Target}, '${2:regexp}')$0
 endsnippet
 
 snippet versioncmp "Version Compare Function" b
-$${1:Variable} = versioncmp('${1:version}', '${2:version}')${0}
+$${1:Variable} = versioncmp('${1:version}', '${2:version}')$0
 endsnippet
 
 snippet warning "Warning Function" b
-warning("${1:message}")${0}
+warning("${1:message}")$0
 endsnippet
 
 # vim:ft=snippets:
diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 5d8e26410..686226e73 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -19,7 +19,7 @@ endsnippet
 snippet with "with" b
 with ${1:expr}`!p snip.rv = " as " if t[2] else ""`${2:var}:
 	${3:${VISUAL:pass}}
-${0}
+$0
 endsnippet
 
 snippet for "for loop" b
diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index 02c4c259d..44624b3be 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -24,11 +24,11 @@ setwd("${1:`!p snip.rv = os.getcwd()`}")
 endsnippet
 
 snippet as "Apply type on variable" w
-as.$1`!p snip.rv = complete(t[1], FIELD_TYPES)`(${2}${VISUAL})
+as.$1`!p snip.rv = complete(t[1], FIELD_TYPES)`($2${VISUAL})
 endsnippet
 
 snippet is "Test type on variable" w
-is.$1`!p snip.rv = complete(t[1], FIELD_TYPES)`(${2}${VISUAL})
+is.$1`!p snip.rv = complete(t[1], FIELD_TYPES)`($2${VISUAL})
 endsnippet
 
 snippet dl "Download and install a package" b
@@ -50,51 +50,51 @@ source('${0:file}')
 endsnippet
 
 snippet if "If statement"
-if (${1}) {
-	${0}
+if ($1) {
+	$0
 }
 endsnippet
 
 snippet eif "Else-If statement"
-else if (${1}) {
-	${0}
+else if ($1) {
+	$0
 }
 endsnippet
 
 snippet el "Else statement"
 else {
-	${0}
+	$0
 }
 endsnippet
 
 snippet ife "if .. else"
-if (${1}) {
-	${2}
+if ($1) {
+	$2
 } else {
-	${3}
+	$3
 }
 endsnippet
 
 snippet wh "while loop"
-while(${1}) {
-	${2}
+while($1) {
+	$2
 }
 endsnippet
 
 snippet for "for loop"
 for (${1:item} in ${2:list}) {
-	${3}
+	$3
 }
 endsnippet
 
 snippet fun "Function definition"
-${1:name} <- function (${2}) {
-	${0}
+${1:name} <- function ($2) {
+	$0
 }
 endsnippet
 
 snippet ret "Return call"
-return(${0})
+return($0)
 endsnippet
 
 snippet df "Data frame"
diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index e7b2757b2..9aefe6675 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -22,7 +22,7 @@ class ${1:Model}Controller < ApplicationController
 	$0
 
 	private
-	def find_${2}
+	def find_$2
 		@$2 = ${3:$1}.find(params[:id]) if params[:id]
 	end
 end
@@ -253,7 +253,7 @@ after_validation_on_update $0
 endsnippet
 
 snippet asg "assert(var = assigns(:var))"
-assert(${1:var} = assigns(:${1}), "Cannot find @${1}")
+assert(${1:var} = assigns(:$1), "Cannot find @$1")
 $0
 endsnippet
 
@@ -270,11 +270,11 @@ end
 endsnippet
 
 snippet artnpp "assert_redirected_to (nested path plural)"
-assert_redirected_to ${10:${2:parent}_${3:child}_path(${4:@}${5:${2}})}
+assert_redirected_to ${10:${2:parent}_${3:child}_path(${4:@}${5:$2})}
 endsnippet
 
 snippet artnp "assert_redirected_to (nested path)"
-assert_redirected_to ${2:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})}
+assert_redirected_to ${2:${12:parent}_${13:child}_path(${14:@}${15:$12}, ${16:@}${17:$13})}
 endsnippet
 
 snippet artpp "assert_redirected_to (path plural)"
@@ -282,7 +282,7 @@ assert_redirected_to ${10:${2:model}s_path}
 endsnippet
 
 snippet artp "assert_redirected_to (path)"
-assert_redirected_to ${2:${12:model}_path(${13:@}${14:${12}})}
+assert_redirected_to ${2:${12:model}_path(${13:@}${14:$12})}
 endsnippet
 
 snippet asrj "assert_rjs"
@@ -324,7 +324,7 @@ before_validation_on_update
 endsnippet
 
 snippet bt "belongs_to (bt)"
-belongs_to :${1:object}${2:, :class_name => "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key => "${4:${1}_id}"}
+belongs_to :${1:object}${2:, :class_name => "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key => "${4:$1_id}"}
 endsnippet
 
 snippet crw "cattr_accessor"
@@ -358,7 +358,7 @@ endsnippet
 snippet deftg "def get request"
 def test_should_get_${1:action}
 	${2:@${3:model} = ${4:$3s}(:${5:fixture_name})
-	}get :${1}${6:, :id => @$3.to_param}
+	}get :$1${6:, :id => @$3.to_param}
 	assert_response :success
 	$0
 end
@@ -367,7 +367,7 @@ endsnippet
 snippet deftp "def post request"
 def test_should_post_${1:action}
 	${3:@$2 = ${4:$2s}(:${5:fixture_name})
-	}post :${1}${6:, :id => @$2.to_param}, :${2:model} => { $0 }
+	}post :$1${6:, :id => @$2.to_param}, :${2:model} => { $0 }
 	assert_response :redirect
 
 end
@@ -400,23 +400,23 @@ end
 endsnippet
 
 snippet habtm "has_and_belongs_to_many (habtm)"
-has_and_belongs_to_many :${1:object}${2:, :join_table => "${3:table_name}", :foreign_key => "${4:${1}_id}"}
+has_and_belongs_to_many :${1:object}${2:, :join_table => "${3:table_name}", :foreign_key => "${4:$1_id}"}
 endsnippet
 
 snippet hm "has_many (hm)"
-has_many :${1:object}s${2:, :class_name => "${1}", :foreign_key => "${4:reference}_id"}
+has_many :${1:object}s${2:, :class_name => "$1", :foreign_key => "${4:reference}_id"}
 endsnippet
 
 snippet hmt "has_many (through)"
-has_many :${1:objects}, :through => :${2:join_association}${3:, :source => :${4:${2}_table_foreign_key_to_${1}_table}}
+has_many :${1:objects}, :through => :${2:join_association}${3:, :source => :${4:$2_table_foreign_key_to_$1_table}}
 endsnippet
 
 snippet hmd "has_many :dependent => :destroy"
-has_many :${1:object}s${2:, :class_name => "${1}", :foreign_key => "${4:reference}_id"}, :dependent => :destroy$0
+has_many :${1:object}s${2:, :class_name => "$1", :foreign_key => "${4:reference}_id"}, :dependent => :destroy$0
 endsnippet
 
 snippet ho "has_one (ho)"
-has_one :${1:object}${2:, :class_name => "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key => "${4:${1}_id}"}
+has_one :${1:object}${2:, :class_name => "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key => "${4:$1_id}"}
 endsnippet
 
 snippet logd "logger.debug"
@@ -514,11 +514,11 @@ redirect_to :controller => "${1:items}", :action => "${2:show}", :id => ${0:@ite
 endsnippet
 
 snippet renpp "redirect_to (nested path plural)"
-redirect_to(${2:${10:parent}_${11:child}_path(${12:@}${13:${10}})})
+redirect_to(${2:${10:parent}_${11:child}_path(${12:@}${13:$10})})
 endsnippet
 
 snippet renp "redirect_to (nested path)"
-redirect_to(${2:${12:parent}_${13:child}_path(${14:@}${15:${12}}, ${16:@}${17:${13}})})
+redirect_to(${2:${12:parent}_${13:child}_path(${14:@}${15:$12}, ${16:@}${17:$13})})
 endsnippet
 
 snippet repp "redirect_to (path plural)"
@@ -526,7 +526,7 @@ redirect_to(${2:${10:model}s_path})
 endsnippet
 
 snippet rep "redirect_to (path)"
-redirect_to(${2:${12:model}_path(${13:@}${14:${12}})})
+redirect_to(${2:${12:model}_path(${13:@}${14:$12})})
 endsnippet
 
 snippet reb "redirect_to :back"
@@ -882,12 +882,12 @@ end
 endsnippet
 
 snippet trans "Translation snippet"
-I18n.t('`!v substitute(substitute(substitute(@%, substitute(getcwd() . "/", "\/", "\\\\/", "g"), "", ""), "\\(\\.\\(html\\|js\\)\\.\\(haml\\|erb\\)\\|\\(_controller\\)\\?\\.rb\\)$", "", ""), "/", ".", "g")`.${2:${1/[^\w]/_/g}}${3}', :default => "${1:some_text}"${4})${5:$0}
+I18n.t('`!v substitute(substitute(substitute(@%, substitute(getcwd() . "/", "\/", "\\\\/", "g"), "", ""), "\\(\\.\\(html\\|js\\)\\.\\(haml\\|erb\\)\\|\\(_controller\\)\\?\\.rb\\)$", "", ""), "/", ".", "g")`.${2:${1/[^\w]/_/g}}$3', :default => "${1:some_text}"$4)${5:$0}
 endsnippet
 
 snippet route_spec
 it 'routes to #${1:action}' do
-	${2:get}('/${3:url}').should route_to('`!v substitute(expand('%:t:r'), '_routing_spec$', '', '')`#$1'${4:, ${5:params}})${6}
+	${2:get}('/${3:url}').should route_to('`!v substitute(expand('%:t:r'), '_routing_spec$', '', '')`#$1'${4:, ${5:params}})$6
 end
 endsnippet
 
diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 40e760557..482f78e46 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -5,22 +5,22 @@
 priority -50
 
 snippet let "let variable declaration" b
-let ${1:name}${2:: ${3:type}} = ${4};
+let ${1:name}${2:: ${3:type}} = $4;
 endsnippet
 
 snippet letm "let mut variable declaration" b
-let mut ${1:name}${2:: ${3:type}} = ${4};
+let mut ${1:name}${2:: ${3:type}} = $4;
 endsnippet
 
 snippet fn "A function, optionally with arguments and return type."
-fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
-	${VISUAL}${0}
+fn ${1:function_name}($2)${3/..*/ -> /}$3 {
+	${VISUAL}$0
 }
 endsnippet
 
 snippet pfn "A public function, optionally with arguments and return type."
-pub fn ${1:function_name}(${2})${3/..*/ -> /}${3} {
-	${VISUAL}${0}
+pub fn ${1:function_name}($2)${3/..*/ -> /}$3 {
+	${VISUAL}$0
 }
 endsnippet
 
@@ -29,44 +29,44 @@ ${1:a}: ${2:T}${3:, arg}
 endsnippet
 
 snippet || "Closure, anonymous function (inline)" i
-${1:move }|${2}| { $3 }
+${1:move }|$2| { $3 }
 endsnippet
 
 snippet |} "Closure, anonymous function (block)" i
-${1:move }|${2}| {
+${1:move }|$2| {
 	$3
 }
 endsnippet
 
 snippet pri "print!(..)" b
-print!("${1}"${2/..*/, /}${2});
+print!("$1"${2/..*/, /}$2);
 endsnippet
 
 snippet pln "println!(..)" b
-println!("${1}"${2/..*/, /}${2});
+println!("$1"${2/..*/, /}$2);
 endsnippet
 
 snippet fmt "format!(..)"
-format!("${1}"${2/..*/, /}${2});
+format!("$1"${2/..*/, /}$2);
 endsnippet
 
 snippet macro "macro_rules!" b
 macro_rules! ${1:name} {
 	(${2:matcher}) => (
-		${3}
+		$3
 	)
 }
 endsnippet
 
 snippet mod "A module" b
 mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
-	${VISUAL}${0}
+	${VISUAL}$0
 }
 endsnippet
 
 snippet for "for .. in .." b
-for ${1:i} in ${2} {
-	${VISUAL}${0}
+for ${1:i} in $2 {
+	${VISUAL}$0
 }
 endsnippet
 
@@ -76,19 +76,19 @@ endsnippet
 
 snippet st "Struct" b
 struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
-	${VISUAL}${0}
+	${VISUAL}$0
 }
 endsnippet
 
 # TODO: fancy dynamic field mirroring like Python slotclass
 snippet stn "Struct with new constructor." b
 pub struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
-	fd${0}
+	fd$0
 }
 
 impl $1 {
-	pub fn new(${2}) -> $1 {
-		$1 { ${3} }
+	pub fn new($2) -> $1 {
+		$1 { $3 }
 	}
 }
 endsnippet
@@ -99,7 +99,7 @@ endsnippet
 
 snippet impl "Struct/Trait implementation" b
 impl ${1:Type/Trait}${2: for ${3:Type}} {
-	${0}
+	$0
 }
 endsnippet
 
diff --git a/UltiSnips/supercollider.snippets b/UltiSnips/supercollider.snippets
index b8538aa91..3fe8e53fa 100644
--- a/UltiSnips/supercollider.snippets
+++ b/UltiSnips/supercollider.snippets
@@ -5,6 +5,6 @@ for (${1:1}, ${2:10}) {${3: |i}|}
 endsnippet
 snippet sdef
 SynthDef(\\${1:synthName}, {${2: |${3:x}|}
-	${0}
+	$0
 }).add;
 endsnippet
diff --git a/UltiSnips/tcl.snippets b/UltiSnips/tcl.snippets
index 658491571..739098bec 100644
--- a/UltiSnips/tcl.snippets
+++ b/UltiSnips/tcl.snippets
@@ -5,21 +5,21 @@ priority -50
 ###########################################################################
 snippet for "for... (for)" b
 for {${1:set i 0}} {${2:\$i < \$n}} {${3:incr i}} {
-	${4}
+	$4
 }
 
 endsnippet
 
 snippet foreach "foreach... (foreach)"
 foreach ${1:var} ${2:\$list} {
-	${3}
+	$3
 }
 
 endsnippet
 
 snippet if "if... (if)" b
 if {${1:condition}} {
-	${2}
+	$2
 }
 
 endsnippet
@@ -27,7 +27,7 @@ endsnippet
 snippet proc "proc... (proc)" b
 proc ${1:name} {${2:args}} \
 {
-	${3}
+	$3
 }
 
 endsnippet
@@ -35,16 +35,16 @@ endsnippet
 snippet switch "switch... (switch)" b
 switch ${1:-exact} -- ${2:\$var} {
 	${3:match} {
-		${4}
+		$4
 	}
-	default {${5}}
+	default {$5}
 }
 
 endsnippet
 
 snippet while "while... (while)" b
 while {${1:condition}} {
-	${2}
+	$2
 }
 
 endsnippet
diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index f43de5ee0..9957b3f74 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -53,7 +53,7 @@ snippet desc "Description" b
 endsnippet
 
 snippet it "Individual item" b
-\item ${1}
+\item $1
 $0
 endsnippet
 
@@ -61,54 +61,54 @@ snippet part "Part" b
 \part{${1:part name}}
 \label{prt:${2:${1/(\w+)|\W+/(?1:\L$0\E:_)/ga}}}
 
-${0}
+$0
 endsnippet
 
 snippet cha "Chapter" b
 \chapter{${1:chapter name}}
 \label{cha:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
-${0}
+$0
 endsnippet
 
 snippet sec "Section" b
 \section{${1:section name}}
 \label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
-${0}
+$0
 endsnippet
 
 snippet sub "Subsection" b
 \subsection{${1:subsection name}}
 \label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
-${0}
+$0
 endsnippet
 
 snippet ssub "Subsubsection" b
 \subsubsection{${1:subsubsection name}}
 \label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
-${0}
+$0
 endsnippet
 
 snippet par "Paragraph" b
 \paragraph{${1:paragraph name}}
 \label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
-${0}
+$0
 endsnippet
 
 snippet subp "Subparagraph" b
 \subparagraph{${1:subparagraph name}}
 \label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
-${0}
+$0
 endsnippet
 
 snippet ni "Non-indented paragraph" b
 \noindent
-${0}
+$0
 endsnippet
 
 snippet pac "Package" b
diff --git a/UltiSnips/vim.snippets b/UltiSnips/vim.snippets
index dbb2396db..65a18973f 100644
--- a/UltiSnips/vim.snippets
+++ b/UltiSnips/vim.snippets
@@ -13,11 +13,11 @@ snippet guard "script reload guard" b
 if exists('${1:did_`!p snip.rv = snip.fn.replace('.','_')`}') || &cp${2: || version < 700}
 	finish
 endif
-let $1 = 1${3}
+let $1 = 1$3
 endsnippet
 
 snippet f "function" b
-fun ${1:function_name}(${2})
+fun ${1:function_name}($2)
 	${3:" code}
 endf
 endsnippet

From 213690b216dfbd7b4b0125ad3e4d67ef5979678b Mon Sep 17 00:00:00 2001
From: iurevych <iurevych@gmail.com>
Date: Tue, 10 Jan 2017 11:51:13 +0200
Subject: [PATCH 0945/1587] Sass snippets based on CSS ones

---
 snippets/sass.snippets | 990 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 986 insertions(+), 4 deletions(-)

diff --git a/snippets/sass.snippets b/snippets/sass.snippets
index 7207360cd..de708ab42 100644
--- a/snippets/sass.snippets
+++ b/snippets/sass.snippets
@@ -1,14 +1,12 @@
-extends css
-
 snippet $
 	$${1:variable}: ${0:value}
 snippet imp
 	@import '${0}'
 snippet mix
-	@mixin ${1:name}(${2})
+	=${1:name}(${2})
 		${0}
 snippet inc
-	@include ${1:mixin}(${2})
+	+${1:mixin}(${2})
 snippet ext
 	@extend ${0}
 snippet fun
@@ -34,3 +32,987 @@ snippet each
 snippet while
 	@while ${1:$i} ${2:>} ${3:0}
 		${0}
+snippet .
+	${1}
+		${0}
+snippet !
+	 !important
+snippet bdi:m+
+	-moz-border-image: url('${1}') ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:m
+	-moz-border-image: ${0}
+snippet bdrz:m
+	-moz-border-radius: ${0}
+snippet bxsh:m+
+	-moz-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000}
+snippet bxsh:m
+	-moz-box-shadow: ${0}
+snippet bdi:w+
+	-webkit-border-image: url('${1}') ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:w
+	-webkit-border-image: ${0}
+snippet bdrz:w
+	-webkit-border-radius: ${0}
+snippet bxsh:w+
+	-webkit-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000}
+snippet bxsh:w
+	-webkit-box-shadow: ${0}
+snippet @f
+	@font-face
+		font-family: ${1}
+		src: url('${0}')
+snippet @i
+	@import url('${0}')
+snippet @m
+	@media ${1:print}
+		${0}
+snippet bg+
+	background: #${1:fff} url('${2}') ${3:0} ${4:0} ${0:no-repeat}
+snippet bga
+	background-attachment: ${0}
+snippet bga:f
+	background-attachment: fixed
+snippet bga:s
+	background-attachment: scroll
+snippet bgbk
+	background-break: ${0}
+snippet bgbk:bb
+	background-break: bounding-box
+snippet bgbk:c
+	background-break: continuous
+snippet bgbk:eb
+	background-break: each-box
+snippet bgcp
+	background-clip: ${0}
+snippet bgcp:bb
+	background-clip: border-box
+snippet bgcp:cb
+	background-clip: content-box
+snippet bgcp:nc
+	background-clip: no-clip
+snippet bgcp:pb
+	background-clip: padding-box
+snippet bgc
+	background-color: #${0:fff}
+snippet bgc:t
+	background-color: transparent
+snippet bgi
+	background-image: url('${0}')
+snippet bgi:n
+	background-image: none
+snippet bgo
+	background-origin: ${0}
+snippet bgo:bb
+	background-origin: border-box
+snippet bgo:cb
+	background-origin: content-box
+snippet bgo:pb
+	background-origin: padding-box
+snippet bgpx
+	background-position-x: ${0}
+snippet bgpy
+	background-position-y: ${0}
+snippet bgp
+	background-position: ${1:0} ${0:0}
+snippet bgr
+	background-repeat: ${0}
+snippet bgr:n
+	background-repeat: no-repeat
+snippet bgr:x
+	background-repeat: repeat-x
+snippet bgr:y
+	background-repeat: repeat-y
+snippet bgr:r
+	background-repeat: repeat
+snippet bgz
+	background-size: ${0}
+snippet bgz:a
+	background-size: auto
+snippet bgz:ct
+	background-size: contain
+snippet bgz:cv
+	background-size: cover
+snippet bg
+	background: ${0}
+snippet bg:ie
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
+snippet bg:n
+	background: none
+snippet bd+
+	border: ${1:1px} ${2:solid} #${0:000}
+snippet bdb+
+	border-bottom: ${1:1px} ${2:solid} #${0:000}
+snippet bdbc
+	border-bottom-color: #${0:000}
+snippet bdbi
+	border-bottom-image: url('${0}')
+snippet bdbi:n
+	border-bottom-image: none
+snippet bdbli
+	border-bottom-left-image: url('${0}')
+snippet bdbli:c
+	border-bottom-left-image: continue
+snippet bdbli:n
+	border-bottom-left-image: none
+snippet bdblrz
+	border-bottom-left-radius: ${0}
+snippet bdbri
+	border-bottom-right-image: url('${0}')
+snippet bdbri:c
+	border-bottom-right-image: continue
+snippet bdbri:n
+	border-bottom-right-image: none
+snippet bdbrrz
+	border-bottom-right-radius: ${0}
+snippet bdbs
+	border-bottom-style: ${0}
+snippet bdbs:n
+	border-bottom-style: none
+snippet bdbw
+	border-bottom-width: ${0}
+snippet bdb
+	border-bottom: ${0}
+snippet bdb:n
+	border-bottom: none
+snippet bdbk
+	border-break: ${0}
+snippet bdbk:c
+	border-break: close
+snippet bdcl
+	border-collapse: ${0}
+snippet bdcl:c
+	border-collapse: collapse
+snippet bdcl:s
+	border-collapse: separate
+snippet bdc
+	border-color: #${0:000}
+snippet bdci
+	border-corner-image: url('${0}')
+snippet bdci:c
+	border-corner-image: continue
+snippet bdci:n
+	border-corner-image: none
+snippet bdf
+	border-fit: ${0}
+snippet bdf:c
+	border-fit: clip
+snippet bdf:of
+	border-fit: overwrite
+snippet bdf:ow
+	border-fit: overwrite
+snippet bdf:r
+	border-fit: repeat
+snippet bdf:sc
+	border-fit: scale
+snippet bdf:sp
+	border-fit: space
+snippet bdf:st
+	border-fit: stretch
+snippet bdi
+	border-image: url('${1}') ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:n
+	border-image: none
+snippet bdl+
+	border-left: ${1:1px} ${2:solid} #${0:000}
+snippet bdlc
+	border-left-color: #${0:000}
+snippet bdli
+	border-left-image: url('${0}')
+snippet bdli:n
+	border-left-image: none
+snippet bdls
+	border-left-style: ${0}
+snippet bdls:n
+	border-left-style: none
+snippet bdlw
+	border-left-width: ${0}
+snippet bdl
+	border-left: ${0}
+snippet bdl:n
+	border-left: none
+snippet bdlt
+	border-length: ${0}
+snippet bdlt:a
+	border-length: auto
+snippet bdrz
+	border-radius: ${0}
+snippet bdr+
+	border-right: ${1:1px} ${2:solid} #${0:000}
+snippet bdrc
+	border-right-color: #${0:000}
+snippet bdri
+	border-right-image: url('${0}')
+snippet bdri:n
+	border-right-image: none
+snippet bdrs
+	border-right-style: ${0}
+snippet bdrs:n
+	border-right-style: none
+snippet bdrw
+	border-right-width: ${0}
+snippet bdr
+	border-right: ${0}
+snippet bdr:n
+	border-right: none
+snippet bdsp
+	border-spacing: ${0}
+snippet bds
+	border-style: ${0}
+snippet bds:ds
+	border-style: dashed
+snippet bds:dtds
+	border-style: dot-dash
+snippet bds:dtdtds
+	border-style: dot-dot-dash
+snippet bds:dt
+	border-style: dotted
+snippet bds:db
+	border-style: double
+snippet bds:g
+	border-style: groove
+snippet bds:h
+	border-style: hidden
+snippet bds:i
+	border-style: inset
+snippet bds:n
+	border-style: none
+snippet bds:o
+	border-style: outset
+snippet bds:r
+	border-style: ridge
+snippet bds:s
+	border-style: solid
+snippet bds:w
+	border-style: wave
+snippet bdt+
+	border-top: ${1:1px} ${2:solid} #${0:000}
+snippet bdtc
+	border-top-color: #${0:000}
+snippet bdti
+	border-top-image: url('${0}')
+snippet bdti:n
+	border-top-image: none
+snippet bdtli
+	border-top-left-image: url('${0}')
+snippet bdtli:c
+	border-corner-image: continue
+snippet bdtli:n
+	border-corner-image: none
+snippet bdtlrz
+	border-top-left-radius: ${0}
+snippet bdtri
+	border-top-right-image: url('${0}')
+snippet bdtri:c
+	border-top-right-image: continue
+snippet bdtri:n
+	border-top-right-image: none
+snippet bdtrrz
+	border-top-right-radius: ${0}
+snippet bdts
+	border-top-style: ${0}
+snippet bdts:n
+	border-top-style: none
+snippet bdtw
+	border-top-width: ${0}
+snippet bdt
+	border-top: ${0}
+snippet bdt:n
+	border-top: none
+snippet bdw
+	border-width: ${0}
+snippet bd
+	border: ${0}
+snippet bd:n
+	border: none
+snippet b
+	bottom: ${0}
+snippet b:a
+	bottom: auto
+snippet bxsh+
+	box-shadow: ${1:0} ${2:0} ${3:0} #${0:000}
+snippet bxsh
+	box-shadow: ${0}
+snippet bxsh:n
+	box-shadow: none
+snippet bxz
+	box-sizing: ${0}
+snippet bxz:bb
+	box-sizing: border-box
+snippet bxz:cb
+	box-sizing: content-box
+snippet cps
+	caption-side: ${0}
+snippet cps:b
+	caption-side: bottom
+snippet cps:t
+	caption-side: top
+snippet cl
+	clear: ${0}
+snippet cl:b
+	clear: both
+snippet cl:l
+	clear: left
+snippet cl:n
+	clear: none
+snippet cl:r
+	clear: right
+snippet cp
+	clip: ${0}
+snippet cp:a
+	clip: auto
+snippet cp:r
+	clip: rect(${1:0} ${2:0} ${3:0} ${0:0})
+snippet c
+	color: #${0:000}
+snippet ct
+	content: ${0}
+snippet ct:a
+	content: attr(${0})
+snippet ct:cq
+	content: close-quote
+snippet ct:c
+	content: counter(${0})
+snippet ct:cs
+	content: counters(${0})
+snippet ct:ncq
+	content: no-close-quote
+snippet ct:noq
+	content: no-open-quote
+snippet ct:n
+	content: normal
+snippet ct:oq
+	content: open-quote
+snippet coi
+	counter-increment: ${0}
+snippet cor
+	counter-reset: ${0}
+snippet cur
+	cursor: ${0}
+snippet cur:a
+	cursor: auto
+snippet cur:c
+	cursor: crosshair
+snippet cur:d
+	cursor: default
+snippet cur:ha
+	cursor: hand
+snippet cur:he
+	cursor: help
+snippet cur:m
+	cursor: move
+snippet cur:p
+	cursor: pointer
+snippet cur:t
+	cursor: text
+snippet d
+	display: ${0}
+snippet d:mib
+	display: -moz-inline-box
+snippet d:mis
+	display: -moz-inline-stack
+snippet d:b
+	display: block
+snippet d:cp
+	display: compact
+snippet d:ib
+	display: inline-block
+snippet d:itb
+	display: inline-table
+snippet d:i
+	display: inline
+snippet d:li
+	display: list-item
+snippet d:n
+	display: none
+snippet d:ri
+	display: run-in
+snippet d:tbcp
+	display: table-caption
+snippet d:tbc
+	display: table-cell
+snippet d:tbclg
+	display: table-column-group
+snippet d:tbcl
+	display: table-column
+snippet d:tbfg
+	display: table-footer-group
+snippet d:tbhg
+	display: table-header-group
+snippet d:tbrg
+	display: table-row-group
+snippet d:tbr
+	display: table-row
+snippet d:tb
+	display: table
+snippet ec
+	empty-cells: ${0}
+snippet ec:h
+	empty-cells: hide
+snippet ec:s
+	empty-cells: show
+snippet exp
+	expression()
+snippet fl
+	float: ${0}
+snippet fl:l
+	float: left
+snippet fl:n
+	float: none
+snippet fl:r
+	float: right
+snippet f+
+	font: ${1:1em} ${2:Arial},${0:sans-serif}
+snippet fef
+	font-effect: ${0}
+snippet fef:eb
+	font-effect: emboss
+snippet fef:eg
+	font-effect: engrave
+snippet fef:n
+	font-effect: none
+snippet fef:o
+	font-effect: outline
+snippet femp
+	font-emphasize-position: ${0}
+snippet femp:a
+	font-emphasize-position: after
+snippet femp:b
+	font-emphasize-position: before
+snippet fems
+	font-emphasize-style: ${0}
+snippet fems:ac
+	font-emphasize-style: accent
+snippet fems:c
+	font-emphasize-style: circle
+snippet fems:ds
+	font-emphasize-style: disc
+snippet fems:dt
+	font-emphasize-style: dot
+snippet fems:n
+	font-emphasize-style: none
+snippet fem
+	font-emphasize: ${0}
+snippet ff
+	font-family: ${0}
+snippet ff:c
+	font-family: ${0:'Monotype Corsiva','Comic Sans MS'},cursive
+snippet ff:f
+	font-family: ${0:Capitals,Impact},fantasy
+snippet ff:m
+	font-family: ${0:Monaco,'Courier New'},monospace
+snippet ff:ss
+	font-family: ${0:Helvetica,Arial},sans-serif
+snippet ff:s
+	font-family: ${0:Georgia,'Times New Roman'},serif
+snippet fza
+	font-size-adjust: ${0}
+snippet fza:n
+	font-size-adjust: none
+snippet fz
+	font-size: ${0}
+snippet fsm
+	font-smooth: ${0}
+snippet fsm:aw
+	font-smooth: always
+snippet fsm:a
+	font-smooth: auto
+snippet fsm:n
+	font-smooth: never
+snippet fst
+	font-stretch: ${0}
+snippet fst:c
+	font-stretch: condensed
+snippet fst:e
+	font-stretch: expanded
+snippet fst:ec
+	font-stretch: extra-condensed
+snippet fst:ee
+	font-stretch: extra-expanded
+snippet fst:n
+	font-stretch: normal
+snippet fst:sc
+	font-stretch: semi-condensed
+snippet fst:se
+	font-stretch: semi-expanded
+snippet fst:uc
+	font-stretch: ultra-condensed
+snippet fst:ue
+	font-stretch: ultra-expanded
+snippet fs
+	font-style: ${0}
+snippet fs:i
+	font-style: italic
+snippet fs:n
+	font-style: normal
+snippet fs:o
+	font-style: oblique
+snippet fv
+	font-variant: ${0}
+snippet fv:n
+	font-variant: normal
+snippet fv:sc
+	font-variant: small-caps
+snippet fw
+	font-weight: ${0}
+snippet fw:b
+	font-weight: bold
+snippet fw:br
+	font-weight: bolder
+snippet fw:lr
+	font-weight: lighter
+snippet fw:n
+	font-weight: normal
+snippet f
+	font: ${0}
+snippet h
+	height: ${0}
+snippet h:a
+	height: auto
+snippet l
+	left: ${0}
+snippet l:a
+	left: auto
+snippet lts
+	letter-spacing: ${0}
+snippet lh
+	line-height: ${0}
+snippet lisi
+	list-style-image: url('${0}')
+snippet lisi:n
+	list-style-image: none
+snippet lisp
+	list-style-position: ${0}
+snippet lisp:i
+	list-style-position: inside
+snippet lisp:o
+	list-style-position: outside
+snippet list
+	list-style-type: ${0}
+snippet list:c
+	list-style-type: circle
+snippet list:dclz
+	list-style-type: decimal-leading-zero
+snippet list:dc
+	list-style-type: decimal
+snippet list:d
+	list-style-type: disc
+snippet list:lr
+	list-style-type: lower-roman
+snippet list:n
+	list-style-type: none
+snippet list:s
+	list-style-type: square
+snippet list:ur
+	list-style-type: upper-roman
+snippet lis
+	list-style: ${0}
+snippet lis:n
+	list-style: none
+snippet mb
+	margin-bottom: ${0}
+snippet mb:a
+	margin-bottom: auto
+snippet ml
+	margin-left: ${0}
+snippet ml:a
+	margin-left: auto
+snippet mr
+	margin-right: ${0}
+snippet mr:a
+	margin-right: auto
+snippet mt
+	margin-top: ${0}
+snippet mt:a
+	margin-top: auto
+snippet m
+	margin: ${0}
+snippet m:4
+	margin: ${1:0} ${2:0} ${3:0} ${0:0}
+snippet m:3
+	margin: ${1:0} ${2:0} ${0:0}
+snippet m:2
+	margin: ${1:0} ${0:0}
+snippet m:0
+	margin: 0
+snippet m:a
+	margin: auto
+snippet mah
+	max-height: ${0}
+snippet mah:n
+	max-height: none
+snippet maw
+	max-width: ${0}
+snippet maw:n
+	max-width: none
+snippet mih
+	min-height: ${0}
+snippet miw
+	min-width: ${0}
+snippet op
+	opacity: ${0}
+snippet op:ie
+	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
+snippet op:ms
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
+snippet orp
+	orphans: ${0}
+snippet o+
+	outline: ${1:1px} ${2:solid} #${0:000}
+snippet oc
+	outline-color: ${0:#000}
+snippet oc:i
+	outline-color: invert
+snippet oo
+	outline-offset: ${0}
+snippet os
+	outline-style: ${0}
+snippet ow
+	outline-width: ${0}
+snippet o
+	outline: ${0}
+snippet o:n
+	outline: none
+snippet ovs
+	overflow-style: ${0}
+snippet ovs:a
+	overflow-style: auto
+snippet ovs:mq
+	overflow-style: marquee
+snippet ovs:mv
+	overflow-style: move
+snippet ovs:p
+	overflow-style: panner
+snippet ovs:s
+	overflow-style: scrollbar
+snippet ovx
+	overflow-x: ${0}
+snippet ovx:a
+	overflow-x: auto
+snippet ovx:h
+	overflow-x: hidden
+snippet ovx:s
+	overflow-x: scroll
+snippet ovx:v
+	overflow-x: visible
+snippet ovy
+	overflow-y: ${0}
+snippet ovy:a
+	overflow-y: auto
+snippet ovy:h
+	overflow-y: hidden
+snippet ovy:s
+	overflow-y: scroll
+snippet ovy:v
+	overflow-y: visible
+snippet ov
+	overflow: ${0}
+snippet ov:a
+	overflow: auto
+snippet ov:h
+	overflow: hidden
+snippet ov:s
+	overflow: scroll
+snippet ov:v
+	overflow: visible
+snippet pb
+	padding-bottom: ${0}
+snippet pl
+	padding-left: ${0}
+snippet pr
+	padding-right: ${0}
+snippet pt
+	padding-top: ${0}
+snippet p
+	padding: ${0}
+snippet p:4
+	padding: ${1:0} ${2:0} ${3:0} ${0:0}
+snippet p:3
+	padding: ${1:0} ${2:0} ${0:0}
+snippet p:2
+	padding: ${1:0} ${0:0}
+snippet p:0
+	padding: 0
+snippet pgba
+	page-break-after: ${0}
+snippet pgba:aw
+	page-break-after: always
+snippet pgba:a
+	page-break-after: auto
+snippet pgba:l
+	page-break-after: left
+snippet pgba:r
+	page-break-after: right
+snippet pgbb
+	page-break-before: ${0}
+snippet pgbb:aw
+	page-break-before: always
+snippet pgbb:a
+	page-break-before: auto
+snippet pgbb:l
+	page-break-before: left
+snippet pgbb:r
+	page-break-before: right
+snippet pgbi
+	page-break-inside: ${0}
+snippet pgbi:a
+	page-break-inside: auto
+snippet pgbi:av
+	page-break-inside: avoid
+snippet pos
+	position: ${0}
+snippet pos:a
+	position: absolute
+snippet pos:f
+	position: fixed
+snippet pos:r
+	position: relative
+snippet pos:s
+	position: static
+snippet q
+	quotes: ${0}
+snippet q:en
+	quotes: '\201C' '\201D' '\2018' '\2019'
+snippet q:n
+	quotes: none
+snippet q:ru
+	quotes: '\00AB' '\00BB' '\201E' '\201C'
+snippet rz
+	resize: ${0}
+snippet rz:b
+	resize: both
+snippet rz:h
+	resize: horizontal
+snippet rz:n
+	resize: none
+snippet rz:v
+	resize: vertical
+snippet r
+	right: ${0}
+snippet r:a
+	right: auto
+snippet tbl
+	table-layout: ${0}
+snippet tbl:a
+	table-layout: auto
+snippet tbl:f
+	table-layout: fixed
+snippet tal
+	text-align-last: ${0}
+snippet tal:a
+	text-align-last: auto
+snippet tal:c
+	text-align-last: center
+snippet tal:l
+	text-align-last: left
+snippet tal:r
+	text-align-last: right
+snippet ta
+	text-align: ${0}
+snippet ta:c
+	text-align: center
+snippet ta:l
+	text-align: left
+snippet ta:r
+	text-align: right
+snippet td
+	text-decoration: ${0}
+snippet td:l
+	text-decoration: line-through
+snippet td:n
+	text-decoration: none
+snippet td:o
+	text-decoration: overline
+snippet td:u
+	text-decoration: underline
+snippet te
+	text-emphasis: ${0}
+snippet te:ac
+	text-emphasis: accent
+snippet te:a
+	text-emphasis: after
+snippet te:b
+	text-emphasis: before
+snippet te:c
+	text-emphasis: circle
+snippet te:ds
+	text-emphasis: disc
+snippet te:dt
+	text-emphasis: dot
+snippet te:n
+	text-emphasis: none
+snippet th
+	text-height: ${0}
+snippet th:a
+	text-height: auto
+snippet th:f
+	text-height: font-size
+snippet th:m
+	text-height: max-size
+snippet th:t
+	text-height: text-size
+snippet ti
+	text-indent: ${0}
+snippet ti:-
+	text-indent: -9999px
+snippet tj
+	text-justify: ${0}
+snippet tj:a
+	text-justify: auto
+snippet tj:d
+	text-justify: distribute
+snippet tj:ic
+	text-justify: inter-cluster
+snippet tj:ii
+	text-justify: inter-ideograph
+snippet tj:iw
+	text-justify: inter-word
+snippet tj:k
+	text-justify: kashida
+snippet tj:t
+	text-justify: tibetan
+snippet to+
+	text-outline: ${1:0} ${2:0} #${0:000}
+snippet to
+	text-outline: ${0}
+snippet to:n
+	text-outline: none
+snippet tr
+	text-replace: ${0}
+snippet tr:n
+	text-replace: none
+snippet tsh+
+	text-shadow: ${1:0} ${2:0} ${3:0} #${0:000}
+snippet tsh
+	text-shadow: ${0}
+snippet tsh:n
+	text-shadow: none
+snippet tt
+	text-transform: ${0}
+snippet tt:c
+	text-transform: capitalize
+snippet tt:l
+	text-transform: lowercase
+snippet tt:n
+	text-transform: none
+snippet tt:u
+	text-transform: uppercase
+snippet tw
+	text-wrap: ${0}
+snippet tw:no
+	text-wrap: none
+snippet tw:n
+	text-wrap: normal
+snippet tw:s
+	text-wrap: suppress
+snippet tw:u
+	text-wrap: unrestricted
+snippet t
+	top: ${0}
+snippet t:a
+	top: auto
+snippet va
+	vertical-align: ${0}
+snippet va:bl
+	vertical-align: baseline
+snippet va:b
+	vertical-align: bottom
+snippet va:m
+	vertical-align: middle
+snippet va:sub
+	vertical-align: sub
+snippet va:sup
+	vertical-align: super
+snippet va:tb
+	vertical-align: text-bottom
+snippet va:tt
+	vertical-align: text-top
+snippet va:t
+	vertical-align: top
+snippet v
+	visibility: ${0}
+snippet v:c
+	visibility: collapse
+snippet v:h
+	visibility: hidden
+snippet v:v
+	visibility: visible
+snippet whsc
+	white-space-collapse: ${0}
+snippet whsc:ba
+	white-space-collapse: break-all
+snippet whsc:bs
+	white-space-collapse: break-strict
+snippet whsc:k
+	white-space-collapse: keep-all
+snippet whsc:l
+	white-space-collapse: loose
+snippet whsc:n
+	white-space-collapse: normal
+snippet whs
+	white-space: ${0}
+snippet whs:n
+	white-space: normal
+snippet whs:nw
+	white-space: nowrap
+snippet whs:pl
+	white-space: pre-line
+snippet whs:pw
+	white-space: pre-wrap
+snippet whs:p
+	white-space: pre
+snippet wid
+	widows: ${0}
+snippet w
+	width: ${0}
+snippet w:a
+	width: auto
+snippet wob
+	word-break: ${0}
+snippet wob:ba
+	word-break: break-all
+snippet wob:bs
+	word-break: break-strict
+snippet wob:k
+	word-break: keep-all
+snippet wob:l
+	word-break: loose
+snippet wob:n
+	word-break: normal
+snippet wos
+	word-spacing: ${0}
+snippet wow
+	word-wrap: ${0}
+snippet wow:no
+	word-wrap: none
+snippet wow:n
+	word-wrap: normal
+snippet wow:s
+	word-wrap: suppress
+snippet wow:u
+	word-wrap: unrestricted
+snippet z
+	z-index: ${0}
+snippet z:a
+	z-index: auto
+snippet zoo
+	zoom: 1
+snippet :h
+	:hover
+snippet :fc
+	:first-child
+snippet :lc
+	:last-child
+snippet :nc
+	:nth-child(${0})
+snippet :nlc
+	:nth-last-child(${0})
+snippet :oc
+	:only-child
+snippet :a
+	:after
+snippet :b
+	:before
+snippet ::a
+	::after
+snippet ::b
+	::before

From 0fa1bae7c77b2766597360bcb063d7f54c9bb30f Mon Sep 17 00:00:00 2001
From: iurevych <iurevych@gmail.com>
Date: Wed, 11 Jan 2017 00:40:30 +0200
Subject: [PATCH 0946/1587] Remove . snippet for no need in Sass

---
 snippets/sass.snippets | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/snippets/sass.snippets b/snippets/sass.snippets
index de708ab42..9eff6a3cd 100644
--- a/snippets/sass.snippets
+++ b/snippets/sass.snippets
@@ -32,9 +32,6 @@ snippet each
 snippet while
 	@while ${1:$i} ${2:>} ${3:0}
 		${0}
-snippet .
-	${1}
-		${0}
 snippet !
 	 !important
 snippet bdi:m+

From 8f5a51ac2581a4b81e5be79f9c330fa204a3759a Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 11 Jan 2017 10:59:36 +0000
Subject: [PATCH 0947/1587] Add Crystal lang snippets

---
 UltiSnips/crystal.snippets | 13 ++++++
 snippets/crystal.snippets  | 82 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 UltiSnips/crystal.snippets
 create mode 100644 snippets/crystal.snippets

diff --git a/UltiSnips/crystal.snippets b/UltiSnips/crystal.snippets
new file mode 100644
index 000000000..5fe4ce8e5
--- /dev/null
+++ b/UltiSnips/crystal.snippets
@@ -0,0 +1,13 @@
+priority -50
+
+snippet "\b(de)?f" "def <name>..." r
+def ${1:method_name}${2:(${3:*args})}
+	$0
+end
+endsnippet
+
+snippet "\b(de)?f" "private def <name>..." r
+private def ${1:method_name}${2:(${3:*args})}
+	$0
+end
+endsnippet
diff --git a/snippets/crystal.snippets b/snippets/crystal.snippets
new file mode 100644
index 000000000..06692c73f
--- /dev/null
+++ b/snippets/crystal.snippets
@@ -0,0 +1,82 @@
+snippet req require
+	require "${1}"
+snippet case
+	case ${1:object}
+	when ${2:condition}
+		${0}
+	end
+snippet when
+	when ${1:condition}
+		${0}
+snippet def
+	def ${1:method_name}
+		${0}
+	end
+snippet pdef
+	private def ${1:method_name}
+		${0}
+	end
+snippet if
+	if ${1:condition}
+		${0}
+	end
+snippet ife
+	if ${1:condition}
+		${2}
+	else
+		${0}
+	end
+snippet wh
+	while ${1:condition}
+		${0}
+	end
+snippet cla class .. end
+	class ${1:`substitute(vim_snippets#Filename(), "\(_\|^\)\(.\)", "\u\2", "g")`}
+		${0}
+	end
+snippet mod class .. end
+	module ${1:`substitute(vim_snippets#Filename(), "\(_\|^\)\(.\)", "\u\2", "g")`}
+		${0}
+	end
+snippet r
+	getter ${0:name}
+snippet r!
+	getter! ${0:name}
+snippet r?
+	getter? ${0:name}
+snippet w
+	setter ${0:name}
+snippet w!
+	setter! ${0:name}
+snippet w?
+	setter? ${0:name}
+snippet rw
+	property ${0:name}
+snippet rw!
+	property! ${0:name}
+snippet rw?
+	property? ${0:name}
+snippet defs
+	def self.${1:class_method_name}
+		${0}
+	end
+snippet defi
+	def initialize(${1})
+		${0}
+	end
+snippet do
+	do
+		${0}
+	end
+snippet dov
+	do |${1:v}|
+		${2}
+	end
+snippet desc
+	describe ${1:`substitute(substitute(vim_snippets#Filename(), "_spec$", "", ""), "\(_\|^\)\(.\)", "\u\2", "g")`} do
+		${0}
+	end
+snippet it
+	it "${1}" do
+		${0}
+	end

From 2675bf91d4666cd0a78be559186ea9448a17010c Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Wed, 18 Jan 2017 19:44:18 +0000
Subject: [PATCH 0948/1587] Mocha snippets for before, beforeEach, after, and
 afterEach

---
 snippets/javascript-mocha.snippets | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/snippets/javascript-mocha.snippets b/snippets/javascript-mocha.snippets
index cabfd401d..158ecbe58 100644
--- a/snippets/javascript-mocha.snippets
+++ b/snippets/javascript-mocha.snippets
@@ -1,18 +1,34 @@
-snippet des "Describe" b
+snippet des "describe('thing', () => { ... })" b
 	describe('${1:}', () => {
 		${0}
 	});
-snippet it "it" b
+snippet it "it('should do', () => { ... })" b
 	it('${1:}', () => {
 		${0}
 	});
-snippet xit "xit" b
+snippet xit "xit('should do', () => { ... })" b
 	xit('${1:}', () => {
 		${0}
 	});
-snippet exp "expect" b
+snippet bef "before(() => { ... })" b
+	before(() => {
+		${0}
+	});
+snippet befe "beforeEach(() => { ... })" b
+	beforeEach(() => {
+		${0}
+	});
+snippet aft "after(() => { ... })" b
+	after(() => {
+		${0}
+	});
+snippet afte "afterEach(() => { ... })" b
+	afterEach(() => {
+		${0}
+	});
+snippet exp "expect(...)" b
 	expect(${1:})${0};
-snippet expe "expect" b
+snippet expe "expect(...).to.equal(...)" b
 	expect(${1:}).to.equal(${0});
-snippet expd "expect" b
+snippet expd "expect(...).to.deep.equal(...)" b
 	expect(${1:}).to.deep.equal(${0});

From ff5019746af5ab1f0ae96475db33b7921ef6d3ab Mon Sep 17 00:00:00 2001
From: Raghu <raghu.rajagopalan@gmail.com>
Date: Fri, 20 Jan 2017 00:36:06 +0530
Subject: [PATCH 0949/1587] all.snippets - Use vimscript for datetime snippets

On windows, these system date command does not support formatting. vimscript works better
---
 UltiSnips/all.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 215487ec6..49a9c80e8 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -77,23 +77,23 @@ endsnippet
 # DATES #
 #########
 snippet date "YYYY-MM-DD" w
-`date +%Y-%m-%d`
+`!v strftime("%F")`
 endsnippet
 
 snippet ddate "Month DD, YYYY" w
-`date +%B\ %d,\ %Y`
+`!v strftime("%b %d, %Y")`
 endsnippet
 
 snippet diso "ISO format datetime" w
-`date +%Y-%m-%dT%H:%M:%S%:z`
+`!v strftime("%F %H:%M:%S%z")`
 endsnippet
 
 snippet time "hh:mm" w
-`date +%H:%M`
+`!v strftime("%H:%M")`
 endsnippet
 
 snippet datetime "YYYY-MM-DD hh:mm" w
-`date +%Y-%m-%d\ %H:%M`
+`!v strftime("%Y-%m-%d %H:%M")`
 endsnippet
 
 # vim:ft=snippets:

From 40ca4aec34d457d29e4e731b14cc3328c9f27009 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Fri, 20 Jan 2017 18:26:37 +0000
Subject: [PATCH 0950/1587] PHPUnit assertions

---
 snippets/php.snippets | 56 ++++++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 2d9f51524..bfe60f86c 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -590,28 +590,46 @@ snippet CSVIterator
 	
 	} // end class
 # phpunit
-snippet ase "$this->assertEquals()"
-	$this->assertEquals(${1:expected}, ${2:actual});
-snippet asne "$this->assertNotEquals()"
-	$this->assertNotEquals(${1:expected}, ${2:actual});
-snippet asf "$this->assertFalse()"
+snippet ase "$this->assertEquals($a, $b)"
+	$this->assertEquals(${1:$expected}, ${2:$actual});
+snippet asne "$this->assertNotEquals($a, $b)"
+	$this->assertNotEquals(${1:$expected}, ${2:$actual});
+snippet asf "$this->assertFalse($a)"
 	$this->assertFalse(${1});
-snippet ast "$this->assertTrue()"
+snippet ast "$this->assertTrue($a)"
 	$this->assertTrue(${1});
-snippet asfex "$this->assertFileExists()"
+snippet asfex "$this->assertFileExists('path/to/file')"
 	$this->assertFileExists(${1:'path/to/file'});
-snippet asfnex "$this->assertFileNotExists()"
+snippet asfnex "$this->assertFileNotExists('path/to/file')"
 	$this->assertFileNotExists(${1:'path/to/file'});
-snippet ascon "$this->assertContains()"
+snippet ascon "$this->assertContains($needle, $haystack)"
 	$this->assertContains(${1:$needle}, ${2:$haystack});
-snippet ashk "$this->assertArrayHasKey()"
+snippet asncon "$this->assertNotContains($needle, $haystack)"
+	$this->assertNotContains(${1:$needle}, ${2:$haystack});
+snippet ascono "$this->assertContainsOnly($needle, $haystack)"
+	$this->assertContainsOnly(${1:$needle}, ${2:$haystack});
+snippet asconoi "$this->assertContainsOnlyInstancesOf(Example::class, $haystack)"
+	$this->assertContainsOnlyInstancesOf(${1:Example}::class, ${2:$haystack});
+snippet ashk "$this->assertArrayHasKey($key, $array)"
 	$this->assertArrayHasKey(${1:$key}, ${2:$array});
-snippet asnhk "$this->assertArrayNotHasKey()"
+snippet asnhk "$this->assertArrayNotHasKey($key, $array)"
 	this->assertArrayNotHasKey(${1:$key}, ${2:$array});
-snippet ascha "$this->assertClassHasAttribute()"
-	$this->assertClassHasAttribute(${1:$attributeName}, '${2:$className}');
-snippet asi "$this->assertInstanceOf(...)"
-	$this->assertInstanceOf(${1:expected}, ${2:actual});
+snippet ascha "$this->assertClassHasAttribute($name, Example::class)"
+	$this->assertClassHasAttribute(${1:$attributeName}, ${2:Example}::class);
+snippet asi "$this->assertInstanceOf(Example::class, $actual)"
+	$this->assertInstanceOf(${1:Example}::class, ${2:$actual});
+snippet ast "$this->assertInternalType('string', $actual)"
+	$this->assertInternalType(${1:'string'}, ${2:actual});
+snippet asco "$this->assertCount($count, $haystack)"
+	$this->assertCount(${1:$expectedCount}, ${2:$haystack});
+snippet asnco "$this->assertNotCount($count, $haystack)"
+	$this->assertNotCount(${1:$count}, ${2:$haystack});
+snippet assub "$this->assertArraySubset($subset, $array)"
+	$this->assertArraySubset(${1:$subset}, ${2:$array});
+snippet asnu "$this->assertNull($a)"
+	$this->assertNull(${1});
+snippet asnnu "$this->assertNotNull($a)"
+	$this->assertNotNull(${1});
 snippet test "public function testXYZ() { ... }"
 	public function test${1}()
 	{
@@ -627,11 +645,15 @@ snippet teardown "protected function tearDown() { ... }"
 	{
 		${0}
 	}
+snippet proph "$observer = $this->prophesize(SomeClass::class);"
+	$${1:observer} = $this->prophesize(${2:SomeClass}::class);
+snippet mock "$mock = $this->createMock(SomeClass::class);"
+	$${1:mock} = $this->createMock(${2:SomeClass}::class);
 snippet exp "phpunit expects"
 	expects($this->${1:once}())
 		->method('${2}')
-		->with($this->equalTo(${3})${4})
-		->will($this->returnValue(${5}));
+		->with(${3})
+		->willReturn(${4});
 snippet testcmt "phpunit comment with group"
 	/**
 	* @group ${1}

From 35be5b620202a67ec6d96f3246ed79d650f93876 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 22 Jan 2017 11:32:51 +0000
Subject: [PATCH 0951/1587] Correct Crystal pdef trigger

---
 UltiSnips/crystal.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/crystal.snippets b/UltiSnips/crystal.snippets
index 5fe4ce8e5..cab946f46 100644
--- a/UltiSnips/crystal.snippets
+++ b/UltiSnips/crystal.snippets
@@ -6,7 +6,7 @@ def ${1:method_name}${2:(${3:*args})}
 end
 endsnippet
 
-snippet "\b(de)?f" "private def <name>..." r
+snippet "\b(pde)?f" "private def <name>..." r
 private def ${1:method_name}${2:(${3:*args})}
 	$0
 end

From acfd5938d623b81145f65cd0b42861a49c05cc4e Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 22 Jan 2017 11:37:23 +0000
Subject: [PATCH 0952/1587] Remove extra space from Rust let

---
 snippets/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 20532f735..935dae4a9 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -32,7 +32,7 @@ snippet main "Main function"
 		${0}
 	}
 snippet let "let variable declaration with type inference"
-	let ${1}  = ${2};
+	let ${1} = ${2};
 snippet lett "let variable declaration with explicit type annotation"
 	let ${1}: ${2}  = ${3};
 snippet letm "let mut variable declaration with type inference"

From f1952f546c2e3d8074cdb4ac5a93aa687d29173e Mon Sep 17 00:00:00 2001
From: Florian Heiderich <florian@heiderich.org>
Date: Tue, 24 Jan 2017 00:28:57 +0100
Subject: [PATCH 0953/1587] add tikzcd

---
 snippets/tex.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 05ec852c3..0b9caf893 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -259,6 +259,13 @@ snippet subfig subfigure environment
 	\\label{fig:${5}}
 	\\end{subfigure}
 	${0}
+snippet tikzcd tikzcd environment
+	\begin{equation}
+	\begin{tikzcd}
+		${1}
+	\end{tikzcd}
+	\end{equation}
+	${0}
 #math
 snippet stackrel \stackrel{}{}
 	\\stackrel{${1:above}}{${2:below}} ${0}

From 6a4247e7ca2a4d5522df40c42357dd7df38ad8ee Mon Sep 17 00:00:00 2001
From: kiryph <kiryph@users.noreply.github.com>
Date: Tue, 24 Jan 2017 11:09:30 +0100
Subject: [PATCH 0954/1587] Sync tex trigger word for itemize and item

for Ultisnips and snipmate:
trigger word for itemize env.: item
trigger word for \item: it (or itd or ]i)
---
 snippets/tex.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 0b9caf893..c095b5a4e 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -86,11 +86,11 @@ snippet enumi enumerate environment
 		\\item ${0}
 	\\end{enumerate}
 # Itemize
-snippet itemize itemize environment
+snippet item itemize environment
 	\\begin{itemize}
 		\\item ${0}
 	\\end{itemize}
-snippet item \item
+snippet it \item
 	\\item ${1:${VISUAL}}
 # Description
 snippet desc description environment

From 83917d5f0f326289c75bbb57cb415d1c8adb203e Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Thu, 26 Jan 2017 20:12:14 +0100
Subject: [PATCH 0955/1587] Remove old HTML snippets

---
 UltiSnips/html.snippets | 90 +++--------------------------------------
 1 file changed, 5 insertions(+), 85 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 026985cba..5b0113a03 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -12,33 +12,6 @@ def x(snip):
 		snip.rv = ""
 endglobal
 
-############
-# Doctypes #
-############
-snippet doctype "DocType XHTML 1.0 Strict" b
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-endsnippet
-
-snippet doctype "DocType XHTML 1.0 Transitional" b
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-endsnippet
-
-snippet doctype "DocType XHTML 1.1" b
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-endsnippet
-
-snippet doctype "HTML - 4.0 Transitional (doctype)" b
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-	"http://www.w3.org/TR/html4/loose.dtd">
-
-endsnippet
-
 snippet doctype "HTML - 5.0 (doctype)" b
 <!DOCTYPE html>
 
@@ -83,45 +56,6 @@ snippet left "Left (left)"
 &#x2190;
 endsnippet
 
-snippet option "Option (option)"
-&#x2325;
-endsnippet
-
-#######################
-# Conditional inserts #
-#######################
-snippet ! "IE Conditional Comment: Internet Explorer 5_0 only"
-<!--[if IE 5.0]>${1:IE Conditional Comment: Internet Explorer 5.0 only }<![endif]-->$0
-endsnippet
-
-snippet ! "IE Conditional Comment: Internet Explorer 5_5 only"
-<!--[if IE 5.5000]>${1:IE Conditional Comment: Internet Explorer 5.5 only }<![endif]-->$0
-endsnippet
-
-snippet ! "IE Conditional Comment: Internet Explorer 5_x"
-<!--[if lt IE 6]>${1:IE Conditional Comment: Internet Explorer 5.x      }<![endif]-->$0
-endsnippet
-
-snippet ! "IE Conditional Comment: Internet Explorer 6 and below"
-<!--[if lte IE 6]>${1:IE Conditional Comment: Internet Explorer 6 and below }<![endif]-->$0
-endsnippet
-
-snippet ! "IE Conditional Comment: Internet Explorer 6 only"
-<!--[if IE 6]>${1:IE Conditional Comment: Internet Explorer 6 only   }<![endif]-->$0
-endsnippet
-
-snippet ! "IE Conditional Comment: Internet Explorer 7+"
-<!--[if gte IE 7]>${1:IE Conditional Comment: Internet Explorer 7 and above }<![endif]-->$0
-endsnippet
-
-snippet ! "IE Conditional Comment: Internet Explorer"
-<!--[if IE]>${1:       IE Conditional Comment: Internet Explorer          }<![endif]-->$0
-endsnippet
-
-snippet ! "IE Conditional Comment: NOT Internet Explorer"
-<!--[if !IE]><!-->${1:  IE Conditional Comment: NOT Internet Explorer      }<!-- <![endif]-->$0
-endsnippet
-
 #############
 # HTML TAGS #
 #############
@@ -129,12 +63,12 @@ snippet input "Input with Label" w
 <label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}">$1</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="$5"${6: id="${7:$2}"}`!p x(snip)`>
 endsnippet
 
-snippet input "XHTML   <input>" w
+snippet input "HTML   <input>" w
 <input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}`!p x(snip)`>
 endsnippet
 
 
-snippet opt "Option" w
+snippet option "Option" w
 <option${1: value="${2:option}"}>${3:$2}</option>
 endsnippet
 
@@ -145,15 +79,15 @@ snippet select "Select Box" w
 endsnippet
 
 
-snippet textarea "XHTML   <textarea>" w
+snippet textarea "HTML   <textarea>" w
 <textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">$0</textarea>
 endsnippet
 
-snippet mailto "XHTML <a mailto: >" w
+snippet mailto "HTML <a mailto: >" w
 <a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
 endsnippet
 
-snippet base "XHTML <base>" w
+snippet base "HTML <base>" w
 <base href="$1"${2: target="$3"}`!p x(snip)`>
 endsnippet
 
@@ -304,20 +238,6 @@ snippet fieldset "Fieldset" w
 </fieldset>
 endsnippet
 
-snippet movie "Embed QT movie (movie)" b
-<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab">
-	<param name="src" value="$1"`!p x(snip)`>
-	<param name="controller" value="$4"`!p x(snip)`>
-	<param name="autoplay" value="$5"`!p x(snip)`>
-	<embed src="${1:movie.mov}"
-		width="${2:320}" height="${3:240}"
-		controller="${4:true}" autoplay="${5:true}"
-		scale="tofit" cache="true"
-		pluginspage="http://www.apple.com/quicktime/download/"
-	`!p x(snip)`>
-</object>
-endsnippet
-
 snippet viewport "Responsive viewport meta" w
 <meta name="viewport" content="width=device-width, initial-scale=1">
 endsnippet

From 09b42ecabf5691ebb15109d30be98b12354985ef Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Fri, 27 Jan 2017 12:00:06 +0000
Subject: [PATCH 0956/1587] Tidied JS console snippets, removing duplicates

---
 UltiSnips/javascript.snippets           | 74 -------------------------
 snippets/javascript/javascript.snippets | 51 ++++++++++-------
 2 files changed, 32 insertions(+), 93 deletions(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 336a73756..d96610cd8 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -84,78 +84,4 @@ for (${1:prop} in ${2:obj}){
 }
 endsnippet
 
-# Snippets for Console Debug Output
-
-snippet ca "console.assert" b
-console.assert(${1:assertion}, ${2:"${3:message}"});
-endsnippet
-
-snippet cclear "console.clear" b
-console.clear();
-endsnippet
-
-snippet cdir "console.dir" b
-console.dir(${1:object});
-endsnippet
-
-snippet cdirx "console.dirxml" b
-console.dirxml(${1:object});
-endsnippet
-
-snippet ce "console.error" b
-console.error(${1:"${2:value}"});
-endsnippet
-
-snippet cgroup "console.group" b
-console.group("${1:label}");
-${VISUAL}$0
-console.groupEnd();
-endsnippet
-
-snippet cgroupc "console.groupCollapsed" b
-console.groupCollapsed("${1:label}");
-${VISUAL}$0
-console.groupEnd();
-endsnippet
-
-snippet ci "console.info" b
-console.info(${1:"${2:value}"});
-endsnippet
-
-snippet cl "console.log" b
-console.log(${1:"${2:value}"});
-endsnippet
-
-snippet cd "console.debug" b
-console.debug(${1:"${2:value}"});
-endsnippet
-
-snippet cprof "console.profile" b
-console.profile("${1:label}");
-${VISUAL}$0
-console.profileEnd();
-endsnippet
-
-snippet ctable "console.table" b
-console.table(${1:"${2:value}"});
-endsnippet
-
-snippet ctime "console.time" b
-console.time("${1:label}");
-${VISUAL}$0
-console.timeEnd("$1");
-endsnippet
-
-snippet ctimestamp "console.timeStamp" b
-console.timeStamp("${1:label}");
-endsnippet
-
-snippet ctrace "console.trace" b
-console.trace();
-endsnippet
-
-snippet cw "console.warn" b
-console.warn(${1:"${2:value}"});
-endsnippet
-
 # vim:ft=snippets:
diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 0ac0bfb46..8d39f975d 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -240,33 +240,46 @@ snippet qsa
 # Debugging
 snippet de
 	debugger;
-# console.log
-snippet cl
+snippet cl "console.log"
 	console.log(${0});
-# console.debug
-snippet cd
+snippet cd "console.debug"
 	console.debug(${0});
-# console.error
-snippet ce
+snippet ce "console.error"
 	console.error(${0});
-# console.warn
-snippet cw
+snippet cw "console.warn"
 	console.warn(${0});
-# console.info
-snippet ci
+snippet ci "console.info"
 	console.info(${0});
-# console.trace
-snippet ct
+snippet ct "console.trace"
 	console.trace(${0:label});
-# console.time
-snippet ctime
-	console.time(${0:label});
-# console.assert
-snippet ca
+snippet ctime "console.time ... console.timeEnd"
+	console.time("${1:label}");
+	${0:${VISUAL}}
+	console.timeEnd("$1");
+snippet ctimestamp "console.timeStamp"
+	console.timeStamp("${1:label}");
+snippet ca "console.assert"
 	console.assert(${1:expression}, ${0:obj});
-# console.dir
-snippet cdir
+snippet cclear "console.clear"
+	console.clear();
+snippet cdir "console.dir"
 	console.dir(${0:obj});
+snippet cdirx "console.dirxml"
+	console.dirxml(${1:object});
+snippet cgroup "console.group"
+	console.group("${1:label}");
+	${0:${VISUAL}}
+	console.groupEnd();
+snippet cgroupc "console.groupCollapsed"
+	console.groupCollapsed("${1:label}");
+	${0:${VISUAL}}
+	console.groupEnd();
+snippet cprof "console.profile"
+	console.profile("${1:label}");
+	${0:${VISUAL}}
+	console.profileEnd();
+snippet ctable "console.table"
+	console.table(${1:"${2:value}"});
 # Misc
 # 'use strict';
 snippet us

From 59693b69b8080ed092e0f4fc00422f5a7d27feb6 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 30 Jan 2017 22:25:31 +0000
Subject: [PATCH 0957/1587] Update make help snippet to support imports

---
 snippets/make.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index 332d6fc9d..06e8c0a22 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -46,5 +46,5 @@ snippet default
 # help target for self-documented Makefile
 snippet help
 	help: ## Prints help for targets with comments
-		@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $\$1, $\$2}'
+		@echo $(MAKEFILE_LIST) | xargs cat | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 	${0}

From 0885cedfc962e09dd748557077bac15d09aca954 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 30 Jan 2017 22:29:40 +0000
Subject: [PATCH 0958/1587] Remove sort from make help snippet

---
 snippets/make.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index 06e8c0a22..ff3897531 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -46,5 +46,5 @@ snippet default
 # help target for self-documented Makefile
 snippet help
 	help: ## Prints help for targets with comments
-		@echo $(MAKEFILE_LIST) | xargs cat | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+		@echo $(MAKEFILE_LIST) | xargs cat | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 	${0}

From 7f3141082c28b2d74b7c5d37b6857a4ea0cb4f49 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 30 Jan 2017 22:31:03 +0000
Subject: [PATCH 0959/1587] Simplify make help snippet

---
 snippets/make.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index ff3897531..d24f7c183 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -46,5 +46,5 @@ snippet default
 # help target for self-documented Makefile
 snippet help
 	help: ## Prints help for targets with comments
-		@echo $(MAKEFILE_LIST) | xargs cat | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+		@cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 	${0}

From 436f1373c5a92876881b3640cd893e6e4d7fb4cf Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 30 Jan 2017 22:35:51 +0000
Subject: [PATCH 0960/1587] Escape $ in make snippets

Keep messing up this tiny edit. Doh. Serves me right for not testing appropriately.
---
 snippets/make.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/make.snippets b/snippets/make.snippets
index d24f7c183..a1d56abad 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -46,5 +46,5 @@ snippet default
 # help target for self-documented Makefile
 snippet help
 	help: ## Prints help for targets with comments
-		@cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+		@cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $\$1, $\$2}'
 	${0}

From 1fd6d97e64932191b9c3f3095497bef8fd191f65 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Fri, 27 Jan 2017 19:05:13 +0000
Subject: [PATCH 0961/1587] Updated JS snippets to make use of VISUAL

---
 UltiSnips/javascript.snippets               | 12 ----
 snippets/javascript-mocha.snippets          | 14 ++--
 snippets/javascript.es6.react.snippets      |  2 +-
 snippets/javascript/javascript.es6.snippets | 16 ++---
 snippets/javascript/javascript.snippets     | 76 +++++++++------------
 5 files changed, 50 insertions(+), 70 deletions(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index d96610cd8..29bf9ed16 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -34,18 +34,6 @@ ${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {
 
 endsnippet
 
-snippet for "for (...) {...} (counting up)" b
-for (var ${1:i} = 0, ${2:len} = ${3:Things.length}; $1 < $2; $1++) {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet ford "for (...) {...} (counting down, faster)" b
-for (var ${2:i} = ${1:Things.length} - 1; $2 >= 0; $2--) {
-	${VISUAL}$0
-}
-endsnippet
-
 snippet fun "function (fun)" w
 function ${1:function_name}(${2:argument}) {
 	${VISUAL}$0
diff --git a/snippets/javascript-mocha.snippets b/snippets/javascript-mocha.snippets
index 158ecbe58..eb5c381d1 100644
--- a/snippets/javascript-mocha.snippets
+++ b/snippets/javascript-mocha.snippets
@@ -1,30 +1,30 @@
 snippet des "describe('thing', () => { ... })" b
 	describe('${1:}', () => {
-		${0}
+		${0:${VISUAL}}
 	});
 snippet it "it('should do', () => { ... })" b
 	it('${1:}', () => {
-		${0}
+		${0:${VISUAL}}
 	});
 snippet xit "xit('should do', () => { ... })" b
 	xit('${1:}', () => {
-		${0}
+		${0:${VISUAL}}
 	});
 snippet bef "before(() => { ... })" b
 	before(() => {
-		${0}
+		${0:${VISUAL}}
 	});
 snippet befe "beforeEach(() => { ... })" b
 	beforeEach(() => {
-		${0}
+		${0:${VISUAL}}
 	});
 snippet aft "after(() => { ... })" b
 	after(() => {
-		${0}
+		${0:${VISUAL}}
 	});
 snippet afte "afterEach(() => { ... })" b
 	afterEach(() => {
-		${0}
+		${0:${VISUAL}}
 	});
 snippet exp "expect(...)" b
 	expect(${1:})${0};
diff --git a/snippets/javascript.es6.react.snippets b/snippets/javascript.es6.react.snippets
index 0762eb6bd..2894ac5d7 100644
--- a/snippets/javascript.es6.react.snippets
+++ b/snippets/javascript.es6.react.snippets
@@ -61,7 +61,7 @@ snippet rdp
 # Lifecycle Methods
 snippet rcdm
 	componentDidMount() {
-		${0}
+		${0:${VISUAL}}
 	}
 
 # State
diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
index a1adedef4..7e885e6e8 100644
--- a/snippets/javascript/javascript.es6.snippets
+++ b/snippets/javascript/javascript.es6.snippets
@@ -10,16 +10,16 @@ snippet imm "import { member } from 'xyz'"
 	import { ${1} } from '${2}';
 snippet cla
 	class ${1} {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet clax
 	class ${1} extends ${2} {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet clac
 	class ${1} {
 		constructor(${2}) {
-			${0}
+			${0:${VISUAL}}
 		}
 	}
 snippet foro "for (const prop of object}) { ... }"
@@ -29,23 +29,23 @@ snippet foro "for (const prop of object}) { ... }"
 # Generator
 snippet fun*
 	function* ${1:function_name}(${2}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet c=>
 	const ${1:function_name} = (${2}) => {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet caf
 	const ${1:function_name} = (${2}) => {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet =>
 	(${1}) => {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet af
 	(${1}) => {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet sym
 	const ${1} = Symbol('${0}');
diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 8d39f975d..df0669bdb 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -2,37 +2,37 @@
 # prototype
 snippet proto
 	${1:class_name}.prototype.${2:method_name} = function(${3}) {
-		${0}
+		${0:${VISUAL}}
 	};
 # Function
 snippet fun
 	function ${1:function_name}(${2}) {
-		${0}
+		${0:${VISUAL}}
 	}
 # Anonymous Function
 snippet f "" w
 	function(${1}) {
-		${0}
+		${0:${VISUAL}}
 	}
 # Anonymous Function assigned to variable
 snippet vaf
 	var ${1:function_name} = function(${2}) {
-		${0}
+		${0:${VISUAL}}
 	};
 # Function assigned to variable
 snippet vf
 	var ${1:function_name} = function $1(${2}) {
-		${0}
+		${0:${VISUAL}}
 	};
 # Immediate function
 snippet (f
 	(function(${1}) {
-		${0}
+		${0:${VISUAL}}
 	}(${2}));
 # Minify safe iife
 snippet ;fe
 	;(function(${1}) {
-		${0}
+		${0:${VISUAL}}
 	}(${2}))
 # self-defining function
 snippet sdf
@@ -40,21 +40,21 @@ snippet sdf
 		${3}
 
 		$1 = function ($2) {
-			${0}
+			${0:${VISUAL}}
 		};
 	};
 # Flow control
 # if
-snippet if
+snippet if "if (condition) { ... }"
 	if (${1:true}) {
-		${0}
+		${0:${VISUAL}}
 	}
 # if ... else
-snippet ife
+snippet ife "if (condition) { ... } else { ... }"
 	if (${1:true}) {
-		${2}
+		${0:${VISUAL}}
 	} else {
-		${0}
+		${2}
 	}
 # tertiary conditional
 snippet ter
@@ -69,25 +69,21 @@ snippet switch
 		default:
 			${2}
 	}
-# case
-snippet case
+snippet case "case 'xyz': ... break"
 	case '${1:case}':
-		${2}
+		${0:${VISUAL}}
 		break;
-	${0}
-# try
-snippet try
+snippet try "try { ... } catch(e) { ... }"
 	try {
-		${1}
-	} catch (${2:e}) {
-		${0:/* handle error */}
+		${0:${VISUAL}}
+	} catch (${1:e}) {
+		${2:/* handle error */}
 	}
-# try finally
-snippet tryf
+snippet tryf "try { ... } catch(e) { ... } finally { ... }"
 	try {
-		${1}
-	} catch (${2:e}) {
-		${0:/* handle error */}
+		${0:${VISUAL}}
+	} catch (${1:e}) {
+		${2:/* handle error */}
 	} finally {
 		${3:/* be executed regardless of the try / catch result*/}
 	}
@@ -97,25 +93,21 @@ snippet terr
 # return
 snippet ret
 	return ${0:result};
-# for loop
-snippet for
-	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2++) {
-		var ${3:v} = $1[$2];${0:}
+snippet for "for (...) {...}"
+	for (var ${1:i} = 0, ${2:len} = ${3:Things.length}; $1 < $2; $1++) {
+		${0:${VISUAL}}
 	}
-# Reversed for loop
-snippet forr
-	for (var ${2:i} = ${1:arr}.length - 1; $2 >= 0; $2--) {
-		var ${3:v} = $1[$2];${0:}
+snippet forr "reversed for (...) {...}"
+	for (var ${2:i} = ${1:Things.length} - 1; $2 >= 0; $2--) {
+		${0:${VISUAL}}
 	}
-# While loop
-snippet wh
+snippet wh "(condition) { ... }"
 	while (${1:/* condition */}) {
-		${0}
+		${0:${VISUAL}}
 	}
-# Do while loop
-snippet do
+snippet do "do { ... } while (condition)"
 	do {
-		${0}
+		${0:${VISUAL}}
 	} while (${1:/* condition */});
 # For in loop
 snippet fori
@@ -126,7 +118,7 @@ snippet fori
 # Object Method
 snippet :f
 	${1:method_name}: function (${2:attribute}) {
-		${3}
+		${0:${VISUAL}}
 	},
 # hasOwnProperty
 snippet has

From 83f17828ac4046d25f8073a89478e4c42fdee9d9 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Tue, 31 Jan 2017 12:22:21 +0000
Subject: [PATCH 0962/1587] Updated PHP snippets to make use of VISUAL

---
 UltiSnips/php-phpspec.snippets |  2 +-
 snippets/php.snippets          | 67 +++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/UltiSnips/php-phpspec.snippets b/UltiSnips/php-phpspec.snippets
index a85f9bc4f..a0acfc3ae 100644
--- a/UltiSnips/php-phpspec.snippets
+++ b/UltiSnips/php-phpspec.snippets
@@ -25,7 +25,7 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 {
 	function it_$1()
 	{
-		$0
+		${0:${VISUAL}}
 	}
 }
 endsnippet
diff --git a/snippets/php.snippets b/snippets/php.snippets
index bfe60f86c..52572da91 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -1,7 +1,7 @@
 snippet <?
 	<?php
 
-	${0}
+	${0:${VISUAL}}
 snippet dst "declare(strict_types=1)"
 	declare(strict_types=${1:1});
 snippet ec
@@ -17,37 +17,38 @@ snippet ?
 	<?php ${0} ?>
 snippet ?f
 	<?php foreach ($${1:vars} as $${2:$var}): ?>
-		${0}
+		${0:${VISUAL}}
 	<?php endforeach ?>
 snippet ?i
 	<?php if ($${1:var}): ?>
-		${0}
+		${0:${VISUAL}}
 	<?php endif ?>
 snippet ns
 	namespace ${1:Foo\Bar\Baz};
-	${0}
+	
+	${0:${VISUAL}}
 snippet c
 	class ${1:`vim_snippets#Filename()`}
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet i
 	interface ${1:`vim_snippets#Filename()`}
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet t.
 	$this->
 snippet f
 	function ${1}(${3})
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 # method
 snippet m
 	${1:protected} function ${2:foo}()
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet sm "PHP Class Setter"
 	/**
@@ -158,7 +159,7 @@ snippet doc_c
 	 */
 	${1:}class ${2:}
 	{
-		${0}
+		${0:${VISUAL}}
 	} // END $1class $2
 # Constant Definition - post doc
 snippet doc_dp
@@ -232,7 +233,7 @@ snippet interface
 	 */
 	interface ${1:`vim_snippets#Filename()`}
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 # Trait
 snippet trait
@@ -244,7 +245,7 @@ snippet trait
 	 */
 	trait ${1:`vim_snippets#Filename()`}
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 # class ...
 snippet class
@@ -267,7 +268,7 @@ snippet nc
 
 	${2:abstract }class ${3:`vim_snippets#Filename()`}
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 # define(...)
 snippet def "define('VARIABLE_NAME', 'definition')"
@@ -277,45 +278,43 @@ snippet def?
 	${1}defined('${2}')
 snippet wh "while (condition) { ... }"
 	while (${1:/* condition */}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet do "do { ... } while (condition)"
 	do {
-		${0}
+		${0:${VISUAL}}
 	} while (${1});
 snippet if "if (condition) { ... }"
 	if (${1}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet ifn "if (!condition) { ... }"
 	if (!${1}) {
-		${2}
+		${0:${VISUAL}}
 	}
 snippet ifil "<?php if (condition): ?> ... <?php endif; ?>"
 	<?php if (${1}): ?>
-		${0}
+		${0:${VISUAL}}
 	<?php endif; ?>
 snippet ife "if (cond) { ... } else { ... }"
 	if (${1}) {
-		${2}
+		${0:${VISUAL}}
 	} else {
-		${3}
+		${2}
 	}
-	${0}
 snippet ifeil "<?php if (condition): ?> ... <?php else: ?> ... <?php endif; ?>"
 	<?php if (${1}): ?>
-		${2}
+		${0:${VISUAL}}
 	<?php else: ?>
-		${3}
+		${2}
 	<?php endif; ?>
-	${0}
 snippet el "else { ... }"
 	else {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet eif "elseif(condition) { ... }"
 	elseif (${1}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet switch "switch($var) { case 'xyz': ... default: .... }"
 	switch ($${1:variable}) {
@@ -329,23 +328,23 @@ snippet switch "switch($var) { case 'xyz': ... default: .... }"
 	}
 snippet case "case 'value': ... break"
 	case '${1:value}':
-		${2}
+		${0:${VISUAL}}
 		break;
 snippet for "for ($i = 0; $i < $count; $i++) { ... }"
 	for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet foreach "foreach ($var as $value) { .. }"
 	foreach ($${1:variable} as $${2:value}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet foreachil "<?php foreach ($var as $value): ?>  ... <?php endforeach; ?>"
 	<?php foreach ($${1:variable} as $${2:value}): ?>
-		${0}
+		${0:${VISUAL}}
 	<?php endforeach; ?>
 snippet foreachk "foreach ($var as $key => $value) { .. }"
 	foreach ($${1:variable} as $${2:key} => $${3:value}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet foreachkil "<?php foreach ($var as $key => $value): ?>  ... <?php endforeach; ?>"
 	<?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
@@ -355,7 +354,7 @@ snippet array "$... = ['' => ]"
 	$${1:arrayName} = ['${2}' => ${3}];
 snippet try "try { ... } catch (Exception $e) { ... }"
 	try {
-		${0}
+		${0:${VISUAL}}
 	} catch (${1:Exception} $e) {
 	}
 # lambda with closure
@@ -633,17 +632,17 @@ snippet asnnu "$this->assertNotNull($a)"
 snippet test "public function testXYZ() { ... }"
 	public function test${1}()
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet setup "protected function setUp() { ... }"
 	protected function setUp()
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet teardown "protected function tearDown() { ... }"
 	protected function tearDown()
 	{
-		${0}
+		${0:${VISUAL}}
 	}
 snippet proph "$observer = $this->prophesize(SomeClass::class);"
 	$${1:observer} = $this->prophesize(${2:SomeClass}::class);

From 036e588771ea18744632c7f5cfeeea5a8327c796 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Tue, 31 Jan 2017 12:46:45 +0000
Subject: [PATCH 0963/1587] Update snippets for things like if, wh, try to
 leverage ${VISUAL}

---
 README.md                       |  6 ++++--
 snippets/actionscript.snippets  |  6 +++---
 snippets/ada.snippets           | 10 +++++-----
 snippets/apache.snippets        |  8 ++++----
 snippets/arduino.snippets       |  2 +-
 snippets/awk.snippets           |  4 ++--
 snippets/c.snippets             | 14 +++++++-------
 snippets/coffee/coffee.snippets |  8 ++++----
 snippets/crystal.snippets       |  8 ++++----
 snippets/cs.snippets            | 14 +++++++-------
 snippets/d.snippets             |  6 +++---
 snippets/dart.snippets          |  4 ++--
 snippets/eelixir.snippets       |  4 ++--
 snippets/elixir.snippets        | 14 +++++++-------
 snippets/elm.snippets           |  2 +-
 snippets/erlang.snippets        |  2 +-
 snippets/eruby.snippets         |  2 +-
 snippets/go.snippets            | 27 +++++++++------------------
 snippets/haml.snippets          |  4 ++--
 snippets/handlebars.snippets    |  6 +++---
 snippets/htmltornado.snippets   |  2 +-
 snippets/java.snippets          |  4 ++--
 snippets/julia.snippets         |  2 +-
 snippets/ls.snippets            |  2 +-
 snippets/make.snippets          |  6 +++---
 snippets/mako.snippets          |  2 +-
 snippets/mustache.snippets      |  6 +++---
 snippets/processing.snippets    |  4 ++--
 snippets/python.snippets        | 18 +++++++++---------
 snippets/ruby.snippets          | 14 +++++++-------
 snippets/rust.snippets          | 12 ++++++------
 snippets/sass.snippets          |  8 ++++----
 snippets/scala.snippets         | 16 ++++++++--------
 snippets/sh.snippets            | 12 ++++++------
 snippets/twig.snippets          |  8 ++++----
 snippets/vim.snippets           | 10 +++++-----
 snippets/zsh.snippets           | 20 ++++++++++----------
 37 files changed, 145 insertions(+), 152 deletions(-)

diff --git a/README.md b/README.md
index d4e83c335..5567c5d98 100644
--- a/README.md
+++ b/README.md
@@ -131,14 +131,14 @@ Don't add useless placeholder default texts like:
 
 ```
 if (${1:condition}){
-  ${2:some code here}
+  ${0:some code here}
 }
 ```
 instead use:
 
 ```
 if (${1}){
-  ${2}
+  ${0:${VISUAL}}
 }
 ```
 
@@ -148,6 +148,8 @@ get vim-dev plugin which has function completion
 
 Thus for conditions (while, if ..) and block bodies just use ${N} - Thanks
 
+When the snippet can be used to wrap existing code leverage `${VISUAL}`
+
 Open questions:
 What about one line if ee then .. else .. vs if \n .. then \n ... \n else \n .. ?
 Which additional policies to add?
diff --git a/snippets/actionscript.snippets b/snippets/actionscript.snippets
index b7aa7cb33..5d7443902 100644
--- a/snippets/actionscript.snippets
+++ b/snippets/actionscript.snippets
@@ -96,7 +96,7 @@ snippet interface
 	}
 snippet try
 	try {
-		${1}
+		${1:${VISUAL}}
 	} catch (error:ErrorType) {
 		${2}
 	} finally {
@@ -115,11 +115,11 @@ snippet forr
 # If Condition
 snippet if
 	if (${1:/* condition */}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet el
 	else {
-		${0}
+		${0:${VISUAL}}
 	}
 # Ternary conditional
 snippet t
diff --git a/snippets/ada.snippets b/snippets/ada.snippets
index 1039946fc..c0ed2801b 100644
--- a/snippets/ada.snippets
+++ b/snippets/ada.snippets
@@ -90,19 +90,19 @@ snippet fors for some
 
 snippet if if
 	if ${1} then
-		${0}
+		${0:${VISUAL}}
 	end if;
 
 snippet ife if ... else
 	if ${1} then
-		${2}
+		${2:${VISUAL}}
 	else
 		${0}
 	end if;
 
 snippet el else
 	else
-		${0}
+		${0:${VISUAL}}
 
 snippet eif elsif
 	elsif ${1} then
@@ -110,13 +110,13 @@ snippet eif elsif
 
 snippet wh while
 	while ${1} loop
-		${0}
+		${0:${VISUAL}}
 	end loop;
 
 snippet nwh named while
 	${1}:
 	while ${2} loop
-		${0}
+		${0:${VISUAL}}
 	end loop $1;
 
 snippet for for
diff --git a/snippets/apache.snippets b/snippets/apache.snippets
index db3256e95..de5672c2d 100644
--- a/snippets/apache.snippets
+++ b/snippets/apache.snippets
@@ -9,22 +9,22 @@ snippet dir
 # <FilesMatch>
 snippet filesmatch
 	<FilesMatch "${1:regex}">
-		${0}
+		${0:${VISUAL}}
 	</FilesMatch>
 # <IfModule>
 snippet ifmodule
 	<IfModule ${1:mod_example.c}>
-		${0}
+		${0:${VISUAL}}
 	</IfModule>
 # <LimitExcept>
 snippet limitexcept
 	<LimitExcept ${1:POST GET}>
-		${0}
+		${0:${VISUAL}}
 	</LimitExcept>
 # <Proxy>
 snippet proxy
 	<Proxy ${1:*}>
-		${0}
+		${0:${VISUAL}}
 	</Proxy>
 # <VirtualHost>
 snippet virtualhost
diff --git a/snippets/arduino.snippets b/snippets/arduino.snippets
index 6f7f41372..a2732a5e9 100644
--- a/snippets/arduino.snippets
+++ b/snippets/arduino.snippets
@@ -20,7 +20,7 @@ snippet def
 # if
 snippet if
 	if (${1:/* condition */}) {
-		${2}
+		${0:${VISUAL}}
 	}
 # else
 snippet el
diff --git a/snippets/awk.snippets b/snippets/awk.snippets
index 32e56f2f4..5c94734a4 100644
--- a/snippets/awk.snippets
+++ b/snippets/awk.snippets
@@ -43,12 +43,12 @@ snippet ign IGNORECASE
 
 snippet if if {...}
 	if (${1}) {
-		${0}
+		${0:${VISUAL}}
 	}
 
 snippet ife if ... else ...
 	if (${1}) {
-		${2}
+		${2:${VISUAL}}
 	} else {
 		${0}
 	}
diff --git a/snippets/c.snippets b/snippets/c.snippets
index 524b5b866..ea744d547 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -37,7 +37,7 @@ snippet ifdef
 # if
 snippet #if
 	#if ${1:FOO}
-		${0}
+		${0:${VISUAL}}
 	#endif
 # header include guard
 snippet once
@@ -53,23 +53,23 @@ snippet once
 # if
 snippet if
 	if (${1:true}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet ife
 	if (${1:true}) {
-		${2}
+		${2:${VISUAL}}
 	} else {
 		${0}
 	}
 # else
 snippet el
 	else {
-		${0}
+		${0:${VISUAL}}
 	}
 # else if
 snippet elif
 	else if (${1:true}) {
-		${0}
+		${0:${VISUAL}}
 	}
 # ifi
 snippet ifi
@@ -115,12 +115,12 @@ snippet forr
 # while
 snippet wh
 	while (${1:/* condition */}) {
-		${2}
+		${0:${VISUAL}}
 	}
 # do... while
 snippet do
 	do {
-		${2}
+		${0:${VISUAL}}
 	} while (${1:/* condition */});
 ##
 ## Functions
diff --git a/snippets/coffee/coffee.snippets b/snippets/coffee/coffee.snippets
index bb964346f..f23156cc8 100644
--- a/snippets/coffee/coffee.snippets
+++ b/snippets/coffee/coffee.snippets
@@ -55,17 +55,17 @@ snippet cla class .. extends .. constructor: ..
 # If
 snippet if
 	if ${1:condition}
-		${0:# body...}
+		${0:${VISUAL}}
 # If __ Else
 snippet ife
 	if ${1:condition}
-		${2:# body...}
+		${2:${VISUAL}}
 	else
 		${0:# body...}
 # Else if
 snippet eif
 	else if ${1:condition}
-		${0:# body...}
+		${0:${VISUAL}}
 # Ternary If
 snippet ifte
 	if ${1:condition} then ${2:value} else ${0:other}
@@ -84,7 +84,7 @@ snippet log
 # Try __ Catch
 snippet try
 	try
-		${1}
+		${1:${VISUAL}}
 	catch ${2:error}
 		${0}
 # Require
diff --git a/snippets/crystal.snippets b/snippets/crystal.snippets
index 06692c73f..34d254065 100644
--- a/snippets/crystal.snippets
+++ b/snippets/crystal.snippets
@@ -18,17 +18,17 @@ snippet pdef
 	end
 snippet if
 	if ${1:condition}
-		${0}
+		${0:${VISUAL}}
 	end
 snippet ife
 	if ${1:condition}
-		${2}
+		${2:${VISUAL}}
 	else
 		${0}
 	end
 snippet wh
 	while ${1:condition}
-		${0}
+		${0:${VISUAL}}
 	end
 snippet cla class .. end
 	class ${1:`substitute(vim_snippets#Filename(), "\(_\|^\)\(.\)", "\u\2", "g")`}
@@ -66,7 +66,7 @@ snippet defi
 	end
 snippet do
 	do
-		${0}
+		${0:${VISUAL}}
 	end
 snippet dov
 	do |${1:v}|
diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 40e9c8f9e..391984bb6 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -76,15 +76,15 @@ snippet svm
 # if condition
 snippet if
 	if (${1:true}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet el
 	else {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet ifs
 	if (${1})
-		${0}
+		${0:${VISUAL}}
 # ternary conditional
 snippet t
 	${1} ? ${2} : ${0}
@@ -93,12 +93,12 @@ snippet ?
 # do while loop
 snippet do
 	do {
-		${0}
+		${0:${VISUAL}}
 	} while (${1:true});
 # while loop
 snippet wh
 	while (${1:true}) {
-		${0}
+		${0:${VISUAL}}
 	}
 # for loop
 snippet for
@@ -451,14 +451,14 @@ snippet switch
 # try
 snippet try
 	try {
-			${0}
+			${0:${VISUAL}}
 	}
 	catch (${1:System.Exception}) {
 			throw;
 	}
 snippet tryf
 	try {
-		${0}
+		${0:${VISUAL}}
 	}
 	finally {
 		${1}
diff --git a/snippets/d.snippets b/snippets/d.snippets
index 216a4d892..e32a29988 100644
--- a/snippets/d.snippets
+++ b/snippets/d.snippets
@@ -88,13 +88,13 @@ snippet fsw
 	}
 snippet try
 	try {
-		${1}
+		${1:${VISUAL}}
 	} catch(${2:Exception} ${3:e}) {
 		${4}
 	}
 snippet tcf
 	try {
-		${0}
+		${0:${VISUAL}}
 	} catch(${1:Exception} ${2:e}) {
 		${3}
 	} finally {
@@ -102,7 +102,7 @@ snippet tcf
 	}
 snippet wh
 	while(${1:cond}) {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet dowh
 	do {
diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index 0093f2bfb..78625c6c8 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -71,12 +71,12 @@ snippet as
 	assert(${0:/* condition */});
 snippet try
 	try {
-	  ${0}
+	  ${0:${VISUAL}}
 	} catch (${1:Exception e}) {
 	}
 snippet tryf
 	try {
-	  ${0}
+	  ${0:${VISUAL}}
 	} catch (${1:Exception e}) {
 	} finally {
 	}
diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 3d6e33d43..6286cee41 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -12,11 +12,11 @@ snippet for
 	<% end %>
 snippet if
 	<%= if ${1} do %>
-		${0}
+		${0:${VISUAL}}
 	<% end %>
 snippet ife
 	<%= if ${1} do %>
-		${2}
+		${2:${VISUAL}}
 	<%= else %>
 		${0}
 	<% end %>
diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 058f986c5..ccc5fb730 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -1,16 +1,16 @@
 snippet do
 	do
-		${0}
+		${0:${VISUAL}}
 	end
 snippet if if .. do .. end
 	if ${1} do
-		${0}
+		${0:${VISUAL}}
 	end
 snippet if: if .. do: ..
 	if ${1:condition}, do: ${0}
 snippet ife if .. do .. else .. end
 	if ${1:condition} do
-		${2}
+		${2:${VISUAL}}
 	else
 		${0}
 	end
@@ -18,13 +18,13 @@ snippet ife: if .. do: .. else:
 	if ${1:condition}, do: ${2}, else: ${0}
 snippet unless unless .. do .. end
 	unless ${1} do
-		${0}
+		${0:${VISUAL}}
 	end
 snippet unless: unless .. do: ..
 	unless ${1:condition}, do: ${0}
 snippet unlesse unless .. do .. else .. end
 	unless ${1:condition} do
-		${2}
+		${2:${VISUAL}}
 	else
 		${0}
 	end
@@ -33,7 +33,7 @@ snippet unlesse: unless .. do: .. else:
 snippet cond
 	cond do
 		${1} ->
-			${0}
+		${0:${VISUAL}}
 	end
 snippet case
 	case ${1} do
@@ -143,7 +143,7 @@ snippet exunit
 	end
 snippet try try .. rescue .. end
 	try do
-		${1}
+		${1:${VISUAL}}
 	rescue
 		${2} -> ${0}
 	end
diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index 6a15c83a4..7898d5f36 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -39,7 +39,7 @@ snippet let
 		${0}
 snippet if
 	if ${1} then
-		${2}
+		${2:${VISUAL}}
 	else
 		${0}
 snippet ty
diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index 5440d7c46..bd379f3df 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -46,7 +46,7 @@ snippet fun
 # try...catch
 snippet try
 	try
-	    ${1}
+	    ${1:${VISUAL}}
 	catch
 	    ${2:_:_} -> ${0:got_some_exception}
 	end
diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index 64f79ef32..b8879c5c5 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -120,7 +120,7 @@ snippet sslt
 	<%= stylesheet_link_tag "${0}" %>
 snippet if
 	<% if ${1} %>
-		${0}
+		${0:${VISUAL}}
 	<% end %>
 snippet ife
 	<% if ${1} %>
diff --git a/snippets/go.snippets b/snippets/go.snippets
index b2bdc9e02..05d80c9b6 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -30,7 +30,7 @@ snippet ch
 # case
 snippet cs
 	case ${1:value}:
-		${0}
+		${0:${VISUAL}}
 # const
 snippet c
 	const ${1:NAME} = ${0:0}
@@ -50,7 +50,7 @@ snippet df
 snippet dfr
 	defer func() {
 		if err := recover(); err != nil {
-			${0}
+			${0:${VISUAL}}
 		}
 	}()
 # int
@@ -72,18 +72,18 @@ snippet inf
 # if condition
 snippet if
 	if ${1:/* condition */} {
-		${2}
+		${2:${VISUAL}}
 	}
 snippet ife
 	if ${1:/* condition */} {
-		${2}
+		${2:${VISUAL}}
 	} else {
 		${0}
 	}
 # else snippet
 snippet el
 	else {
-		${1}
+		${0:${VISUAL}}
 	}
 # error snippet
 snippet ir
@@ -106,28 +106,20 @@ snippet f3
 # float64
 snippet f6
 	float64
-# if else
-snippet ie
-	if ${1:/* condition */} {
-		${2}
-	} else {
-		${3}
-	}
-	${0}
 # for int loop
 snippet for
 	for ${1}{
-		${0}
+		${0:${VISUAL}}
 	}
 # for int loop
 snippet fori
 	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
-		${0}
+		${0:${VISUAL}}
 	}
 # for range loop
 snippet forr
 	for ${1:e} := range ${2:collection} {
-		${0}
+		${0:${VISUAL}}
 	}
 # function simple
 snippet fun
@@ -225,9 +217,8 @@ snippet ga
 	}(${0})
 snippet test test function
 	func Test${1:name}(t *testing.T) {
-		${2}
+		${0:${VISUAL}}
 	}
-	${0}
 snippet bench benchmark function
 	func Benchmark${1:name}(b *testing.B) {
 		for i := 0; i < b.N; i++ {
diff --git a/snippets/haml.snippets b/snippets/haml.snippets
index 09217c6c4..b8a74e27b 100644
--- a/snippets/haml.snippets
+++ b/snippets/haml.snippets
@@ -27,11 +27,11 @@ snippet mts
 	= mail_to ${1:email_address}, ${2:name}, :subject => ${3}, :body => ${4}
 snippet ife
 	- if ${1:condition}
-		${2}
+		${2:${VISUAL}}
 	- else
 		${0}
 snippet ifp
 	- if ${1:condition}.presence?
-		${0}
+		${0:${VISUAL}}
 snippet ntc
 	= number_to_currency(${1})
diff --git a/snippets/handlebars.snippets b/snippets/handlebars.snippets
index d1ab0f036..401dfbddb 100644
--- a/snippets/handlebars.snippets
+++ b/snippets/handlebars.snippets
@@ -1,14 +1,14 @@
 snippet if # {{#if value}} ... {{/if}}
 	{{#if ${1:value}}}
-	${0}
+	${0:${VISUAL}}
 	{{/if}}
 snippet ifn # {{#unless value}} ... {{/unless}}
 	{{#unless ${1:value}}}
-	${0}
+	${0:${VISUAL}}
 	{{/unless}}
 snippet ife # {{#if value}} ... {{else}} .. {{/if}}
 	{{#if ${1:value}}}
-	${2}
+	${2:${VISUAL}}
 	{{else}}
 	${3}
 	{{/if}}
diff --git a/snippets/htmltornado.snippets b/snippets/htmltornado.snippets
index 46f5dab4c..1620e11da 100644
--- a/snippets/htmltornado.snippets
+++ b/snippets/htmltornado.snippets
@@ -43,7 +43,7 @@ snippet set
 	{% set ${1:x} = ${0:y} %}
 snippet try
 	{% try %}
-	  ${1}
+	  ${1:${VISUAL}}
 	{% except %}
 	  ${2}
 	{% finallly %}
diff --git a/snippets/java.snippets b/snippets/java.snippets
index 39cc850ad..66821c16b 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -163,12 +163,12 @@ snippet ths
 	throws ${0}
 snippet try
 	try {
-		${0}
+		${0:${VISUAL}}
 	} catch(${1:Exception} ${2:e}) {
 	}
 snippet tryf
 	try {
-		${0}
+		${0:${VISUAL}}
 	} catch(${1:Exception} ${2:e}) {
 	} finally {
 	}
diff --git a/snippets/julia.snippets b/snippets/julia.snippets
index 1876ed848..490d050d3 100644
--- a/snippets/julia.snippets
+++ b/snippets/julia.snippets
@@ -75,7 +75,7 @@ snippet tern ternary operator
 # Exceptions
 snippet try try catch
 	try
-		${1}
+		${1:${VISUAL}}
 	catch ${2}
 		${0}
 	end
diff --git a/snippets/ls.snippets b/snippets/ls.snippets
index 909b35ee6..7c924e64d 100644
--- a/snippets/ls.snippets
+++ b/snippets/ls.snippets
@@ -93,7 +93,7 @@ snippet str
 # Try __ Catch
 snippet try
 	try
-		${1}
+		${1:${VISUAL}}
 	catch ${2:error}
 		${3}
 # Require
diff --git a/snippets/make.snippets b/snippets/make.snippets
index a1d56abad..9104804d7 100644
--- a/snippets/make.snippets
+++ b/snippets/make.snippets
@@ -27,19 +27,19 @@ snippet print
 # ifeq
 snippet if
 	ifeq (${1:cond0}, ${2:cond1})
-		${0}
+		${0:${VISUAL}}
 	endif
 # ifeq ... else ... endif
 snippet ife
 	ifeq (${1:cond0}, ${2:cond1})
-		${3}
+		${3:${VISUAL}}
 	else
 		${0}
 	endif
 # else ...
 snippet el
 	else
-		${0}
+		${0:${VISUAL}}
 # .DEFAULT_GOAL := target
 snippet default
 	.DEFAULT_GOAL := ${1}
diff --git a/snippets/mako.snippets b/snippets/mako.snippets
index 2264eac62..659caf77d 100644
--- a/snippets/mako.snippets
+++ b/snippets/mako.snippets
@@ -30,7 +30,7 @@ snippet ife if/else
 	% endif
 snippet try
 	% try:
-		${1:}
+		${1:${VISUAL}}
 	% except${2:}:
 		${0:pass}
 	% endtry
diff --git a/snippets/mustache.snippets b/snippets/mustache.snippets
index ad8723eda..cf5894063 100644
--- a/snippets/mustache.snippets
+++ b/snippets/mustache.snippets
@@ -1,14 +1,14 @@
 snippet if # {{#value}} ... {{/value}}
 	{{#${1:value}}}
-	${0}
+	${0:${VISUAL}}
 	{{/$1}}
 snippet ifn # {{^value}} ... {{/value}}
 	{{^${1:value}}}
-	${0}
+	${0:${VISUAL}}
 	{{/$1}}
 snippet ife # {{#value}} ... {{/value}} {{^value}} ... {{/value}}
 	{{#${1:value}}}
-	${2}
+	${2:${VISUAL}}
 	{{/$1}}
 	{{^$1}}
 	${3}
diff --git a/snippets/processing.snippets b/snippets/processing.snippets
index 015af4a5f..798e54583 100755
--- a/snippets/processing.snippets
+++ b/snippets/processing.snippets
@@ -93,13 +93,13 @@ snippet switch
 #try
 snippet try
 	try {
-		${0}
+		${0:${VISUAL}}
 	} catch(${1:Exception} ${2:e}) {
 	}
 #try catch finally
 snippet tryf
 	try {
-		${0}
+		${0:${VISUAL}}
 	} catch(${1:Exception} ${2:e}) {
 	} finally {
 	}
diff --git a/snippets/python.snippets b/snippets/python.snippets
index 0f68acbd4..1e21e8d96 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -23,7 +23,7 @@ snippet docs
 
 snippet wh
 	while ${1:condition}:
-		${0}
+		${0:${VISUAL}}
 # dowh - does the same as do...while in other languages
 snippet dowh
 	while True:
@@ -32,7 +32,7 @@ snippet dowh
 			break
 snippet with
 	with ${1:expr} as ${2:var}:
-		${0}
+		${0:${VISUAL}}
 # New Class
 snippet cl
 	class ${1:ClassName}(${2:object}):
@@ -68,13 +68,13 @@ snippet property
 # Ifs
 snippet if
 	if ${1:condition}:
-		${0}
+		${0:${VISUAL}}
 snippet el
 	else:
-		${0}
+		${0:${VISUAL}}
 snippet ei
 	elif ${1:condition}:
-		${0}
+		${0:${VISUAL}}
 # For
 snippet for
 	for ${1:item} in ${2:items}:
@@ -93,26 +93,26 @@ snippet .
 	self.
 snippet try Try/Except
 	try:
-		${1}
+		${1:${VISUAL}}
 	except ${2:Exception}, ${3:e}:
 		${0:raise $3}
 snippet try Try/Except/Else
 	try:
-		${1}
+		${1:${VISUAL}}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	else:
 		${0}
 snippet try Try/Except/Finally
 	try:
-		${1}
+		${1:${VISUAL}}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	finally:
 		${0}
 snippet try Try/Except/Else/Finally
 	try:
-		${1}
+		${1:${VISUAL}}
 	except ${2:Exception}, ${3:e}:
 		${4:raise $3}
 	else:
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 772f46440..9dc984fd5 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -39,7 +39,7 @@ snippet case
 	end
 snippet when
 	when ${1:condition}
-		${0}
+		${0:${VISUAL}}
 snippet def
 	def ${1:method_name}
 		${0}
@@ -56,17 +56,17 @@ snippet descendants
 	end
 snippet if
 	if ${1:condition}
-		${0}
+		${0:${VISUAL}}
 	end
 snippet ife
 	if ${1:condition}
-		${2}
+		${2:${VISUAL}}
 	else
 		${0}
 	end
 snippet eif
 	elsif ${1:condition}
-		${0}
+		${0:${VISUAL}}
 snippet ifee
 	if ${1:condition}
 		$2
@@ -77,7 +77,7 @@ snippet ifee
 	end
 snippet unless
 	unless ${1:condition}
-		${0}
+		${0:${VISUAL}}
 	end
 snippet unlesse
 	unless ${1:condition}
@@ -95,7 +95,7 @@ snippet unlesee
 	end
 snippet wh
 	while ${1:condition}
-		${0}
+		${0:${VISUAL}}
 	end
 snippet for
 	for ${1:e} in ${2:c}
@@ -103,7 +103,7 @@ snippet for
 	end
 snippet until
 	until ${1:condition}
-		${0}
+		${0:${VISUAL}}
 	end
 snippet cla class .. end
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 935dae4a9..2a353e499 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -88,21 +88,21 @@ snippet res "Result<T, E>"
 # Control structures
 snippet if
 	if ${1} {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet ife "if / else"
 	if ${1} {
-		${2}
+		${2:${VISUAL}}
 	} else {
 		${0}
 	}
 snippet el "else"
 	else {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet eli "else if"
 	else if ${1} {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet mat "match pattern"
 	match ${1} {
@@ -112,11 +112,11 @@ snippet case "Case clause of pattern match"
 	${1:_} => ${2:expression}
 snippet loop "loop {}" b
 	loop {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet wh "while loop"
 	while ${1:condition} {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet for "for ... in ... loop"
 	for ${1:i} in ${2} {
diff --git a/snippets/sass.snippets b/snippets/sass.snippets
index 9eff6a3cd..3e84c20ed 100644
--- a/snippets/sass.snippets
+++ b/snippets/sass.snippets
@@ -14,15 +14,15 @@ snippet fun
 		${0}
 snippet if
 	@if ${1:condition}
-		${0}
+		${0:${VISUAL}}
 snippet ife
 	@if ${1:condition}
-		${2}
+		${2:${VISUAL}}
 	@else
 		${0}
 snippet eif
 	@else if ${1:condition}
-		${0}
+		${0:${VISUAL}}
 snippet for
 	@for ${1:$i} from ${2:1} through ${3:3}
 		${0}
@@ -31,7 +31,7 @@ snippet each
 		${0}
 snippet while
 	@while ${1:$i} ${2:>} ${3:0}
-		${0}
+		${0:${VISUAL}}
 snippet !
 	 !important
 snippet bdi:m+
diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index 003081ef1..a6c3f3c7b 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -7,30 +7,30 @@
 #if
 snippet if
 	if (${1})
-		${0}
+		${0:${VISUAL}}
 #if not
 snippet ifn
 	if (!${1})
-		${0}
+		${0:${VISUAL}}
 #if-else
 snippet ife
 	if (${1})
-		${2}
+		${2:${VISUAL}}
 	else
 		${0}
 #if-else-if
 snippet ifelif
 	if (${1})
-		${2}
+		${2:${VISUAL}}
 	else if (${3})
-		${0}
+		${0:${VISUAL}}
 snippet eif
 	else if (${3})
-		${0}
+		${0:${VISUAL}}
 #while loop
 snippet wh
 	while (${1:obj}) {
-		${0}
+		${0:${VISUAL}}
 	}
 #for loop(classic)
 snippet for
@@ -50,7 +50,7 @@ snippet fory
 #exceptions
 snippet try
 	try {
-		${1}
+		${1:${VISUAL}}
 	} catch {
 		case e: FileNotFoundException => ${2}
 		case e: IOException => ${3}
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index e470a2ab8..12f8115ac 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -12,26 +12,26 @@ snippet sbash
 
 snippet if
 	if [[ ${1:condition} ]]; then
-		${0:#statements}
+		${0:${VISUAL}}
 	fi
 snippet elif
 	elif [[ ${1:condition} ]]; then
-		${0:#statements}
+		${0:${VISUAL}}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
-		${0:#statements}
+		${0:${VISUAL}}
 	done
 snippet fori
 	for ${1:needle} in ${2:haystack} ; do
-		${0:#statements}
+		${0:${VISUAL}}
 	done
 snippet wh
 	while [[ ${1:condition} ]]; do
-		${0:#statements}
+		${0:${VISUAL}}
 	done
 snippet until
 	until [[ ${1:condition} ]]; do
-		${0:#statements}
+		${0:${VISUAL}}
 	done
 snippet case
 	case ${1:word} in
diff --git a/snippets/twig.snippets b/snippets/twig.snippets
index 47997c3b2..d0d7e1c9c 100644
--- a/snippets/twig.snippets
+++ b/snippets/twig.snippets
@@ -1,6 +1,6 @@
 snippet bl "{% block xyz %} .. {% endblock xyz %}"
 	{% block ${1} %}
-	${2}
+	${2:${VISUAL}}
 	{% endblock $1 %}
 snippet js "{% javascripts 'xyz' %} .. {% endjavascripts %}"
 	{% javascripts '${1}' %}
@@ -12,17 +12,17 @@ snippet css "{% stylesheets 'xyz' %} .. {% endstylesheets %}"
 	{% endstylesheets %}
 snippet if "{% if %} .. {% endif %}"
 	{% if ${1} %}
-	${2}
+	${2:${VISUAL}}
 	{% endif %}
 snippet ife "{% if %} .. {% else %} .. {% endif %}"
 	{% if ${1} %}
-	${2}
+	${2:${VISUAL}}
 	{% else %}
 	${0}
 	{% endif %}
 snippet el "{% else %}"
 	{% else %}
-	${0}
+	${0:${VISUAL}}
 snippet eif "{% elseif %}"
 	{% elseif ${1} %}
 	${0}
diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index b299f5121..c604d9a6a 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -14,13 +14,13 @@ snippet f function
 	endf
 snippet t try ... catch statement
 	try
-		${1}
+		${1:${VISUAL}}
 	catch ${2}
 		${0}
 	endtry
 snippet for for ... in loop
 	for ${1} in ${2}
-		${0}
+		${0:${VISUAL}}
 	endfor
 snippet forkv for [key, value] in loop
 	for [${1},${2}] in items(${3})
@@ -29,15 +29,15 @@ snippet forkv for [key, value] in loop
 	endfor
 snippet wh while loop
 	while ${1}
-		${0}
+		${0:${VISUAL}}
 	endw
 snippet if if statement
 	if ${1}
-		${0}
+		${0:${VISUAL}}
 	endif
 snippet ife if ... else statement
 	if ${1}
-		${2}
+		${2:${VISUAL}}
 	else
 		${0}
 	endif
diff --git a/snippets/zsh.snippets b/snippets/zsh.snippets
index fc1c8374a..a8173c268 100644
--- a/snippets/zsh.snippets
+++ b/snippets/zsh.snippets
@@ -4,40 +4,40 @@ snippet #!
 
 snippet if
 	if ${1:condition}; then
-		${0:# statements}
+		${0:${VISUAL}}
 	fi
 snippet ife
 	if ${1:condition}; then
-		${2:# statements}
+		${2:${VISUAL}}
 	else
 		${0:# statements}
 	fi
 snippet eif
 	elif ${1:condition}; then
-		${0:# statements}
+		${0:${VISUAL}}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
-		${0:# statements}
+		${0:${VISUAL}}
 	done
 snippet fori
 	for ${1:needle} in ${2:haystack}; do
-		${0:#statements}
+		${0:${VISUAL}}
 	done
 snippet fore
 	for ${1:item} in ${2:list}; do
-		${0:# statements}
+		${0:${VISUAL}}
 	done
 snippet wh
 	while ${1:condition}; do
-		${0:# statements}
+		${0:${VISUAL}}
 	done
 snippet until
 	until ${1:condition}; do
-		${0:# statements}
+		${0:${VISUAL}}
 	done
 snippet repeat
 	repeat ${1:integer}; do
-		${0:# statements}
+		${0:${VISUAL}}
 	done
 snippet case
 	case ${1:word} in
@@ -46,7 +46,7 @@ snippet case
 	esac
 snippet select
 	select ${1:answer} in ${2:choices}; do
-		${0:# statements}
+		${0:${VISUAL}}
 	done
 snippet (
 	( ${0:#statements} )

From 5fd6051e74b04cb4bac9d0d8a284ba96f0b529b9 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Tue, 31 Jan 2017 19:08:09 +0000
Subject: [PATCH 0964/1587] Removed duplicate CSS snippet for selector

---
 UltiSnips/css.snippets |  6 ------
 snippets/css.snippets  | 10 +++++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/UltiSnips/css.snippets b/UltiSnips/css.snippets
index ff2650935..f5ccd2ffa 100644
--- a/UltiSnips/css.snippets
+++ b/UltiSnips/css.snippets
@@ -1,11 +1,5 @@
 priority -50
 
-snippet . "selector { }"
-$1 {
-	$0
-}
-endsnippet
-
 snippet p "padding"
 padding: ${1:0};$0
 endsnippet
diff --git a/snippets/css.snippets b/snippets/css.snippets
index c4a74dec9..08b6cdf34 100644
--- a/snippets/css.snippets
+++ b/snippets/css.snippets
@@ -1,8 +1,8 @@
-snippet .
+snippet . "selector { }"
 	${1} {
-		${0}
+		${0:${VISUAL}}
 	}
-snippet !
+snippet ! "!important"
 	 !important
 snippet bdi:m+
 	-moz-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
@@ -31,9 +31,9 @@ snippet @f
 	}
 snippet @i
 	@import url(${0});
-snippet @m
+snippet @m "@media mediatype { }"
 	@media ${1:print} {
-		${0}
+		${0:${VISUAL}}
 	}
 snippet bg+
 	background: #${1:FFF} url(${2}) ${3:0} ${4:0} ${0:no-repeat};

From 48b81d36e87043f6cf2d102af99836344a897c25 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Thu, 2 Feb 2017 19:53:30 +0100
Subject: [PATCH 0965/1587] HTML snippets. Remove redundant 'type' attributes

---
 UltiSnips/html.snippets | 8 ++++----
 snippets/html.snippets  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 5b0113a03..6d98cb1c2 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -163,12 +163,12 @@ snippet meta "XHTML <meta>" w
 <meta name="${1:name}" content="${2:content}"`!p x(snip)`>
 endsnippet
 
-snippet scriptsrc "XHTML <script src...>" w
-<script src="$1" type="text/javascript" charset="${3:utf-8}"></script>
+snippet scriptsrc "HTML <script src...>" w
+<script src="$1" charset="${3:utf-8}"></script>
 endsnippet
 
-snippet script "XHTML <script>" w
-<script type="text/javascript" charset="utf-8">
+snippet script "HTML <script>" w
+<script charset="utf-8">
 	${0:${VISUAL}}
 </script>
 endsnippet
diff --git a/snippets/html.snippets b/snippets/html.snippets
index 85d0e526c..e91b07169 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -733,7 +733,7 @@ snippet samp
 		${0}
 	</samp>
 snippet script
-	<script type="text/javascript" charset="utf-8">
+	<script charset="utf-8">
 		${0}
 	</script>
 snippet scripts
@@ -743,7 +743,7 @@ snippet scriptt
 		${0}
 	</script>
 snippet scriptsrc
-	<script src="${0}.js" type="text/javascript" charset="utf-8"></script>
+	<script src="${0}.js" charset="utf-8"></script>
 snippet section
 	<section>
 		${0}

From b8c340daf084f243a487f8853a0984504909dfda Mon Sep 17 00:00:00 2001
From: sedrubal <dev@sedrubal.de>
Date: Tue, 7 Feb 2017 16:58:32 +0100
Subject: [PATCH 0966/1587] Make python try except snippets py2 and py3
 compatible

---
 snippets/python.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 1e21e8d96..b32ef0a89 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -94,26 +94,26 @@ snippet .
 snippet try Try/Except
 	try:
 		${1:${VISUAL}}
-	except ${2:Exception}, ${3:e}:
+	except ${2:Exception} as ${3:e}:
 		${0:raise $3}
 snippet try Try/Except/Else
 	try:
 		${1:${VISUAL}}
-	except ${2:Exception}, ${3:e}:
+	except ${2:Exception} as ${3:e}:
 		${4:raise $3}
 	else:
 		${0}
 snippet try Try/Except/Finally
 	try:
 		${1:${VISUAL}}
-	except ${2:Exception}, ${3:e}:
+	except ${2:Exception} as ${3:e}:
 		${4:raise $3}
 	finally:
 		${0}
 snippet try Try/Except/Else/Finally
 	try:
 		${1:${VISUAL}}
-	except ${2:Exception}, ${3:e}:
+	except ${2:Exception} as ${3:e}:
 		${4:raise $3}
 	else:
 		${5}

From e367a38af335d6c1665739886b165dd70279b0e5 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <mail@saschagrunert.de>
Date: Thu, 16 Feb 2017 11:55:29 +0100
Subject: [PATCH 0967/1587] Changed `stn` snippet to use `Self`

---
 snippets/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 2a353e499..25effe6e6 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -142,7 +142,7 @@ snippet stn "Struct with new constructor"
 	}
 
 	impl $1 {
-		pub fn new(${2}) -> $1 {
+		pub fn new(${2}) -> Self {
 			$1 { ${3} }
 		}
 	}

From 60b736b4be089fcb5c90a9ed7943bd4ea8629247 Mon Sep 17 00:00:00 2001
From: David Szkiba <david.szkiba@univie.ac.at>
Date: Wed, 15 Feb 2017 21:44:47 +0100
Subject: [PATCH 0968/1587] Add a TODO comment snippet.

---
 UltiSnips/all.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 49a9c80e8..6d77cc590 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -96,4 +96,8 @@ snippet datetime "YYYY-MM-DD hh:mm" w
 `!v strftime("%Y-%m-%d %H:%M")`
 endsnippet
 
+snippet todo "TODO comment" bw
+`!p snip.rv=get_comment_format()[0]` ${2:TODO}: $0${3: <${4:`!v strftime('%d-%m-%y')`}${5:, `!v g:snips_author`}>} `!p snip.rv=get_comment_format()[2]`
+endsnippet
+
 # vim:ft=snippets:

From 219d772f4f8a1c43967bc61fbda7bfd97fd0fbfa Mon Sep 17 00:00:00 2001
From: Vital Kudzelka <vital.kudzelka@gmail.com>
Date: Tue, 21 Feb 2017 11:06:03 +0300
Subject: [PATCH 0969/1587] Add opts to control semi and space-before-paren in
 js snippets

---
 UltiSnips/javascript.snippets  | 89 +++++++++++++++++++++++++++++-----
 pythonx/javascript_snippets.py | 36 ++++++++++++++
 2 files changed, 113 insertions(+), 12 deletions(-)
 create mode 100644 pythonx/javascript_snippets.py

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 29bf9ed16..bb02b6905 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -1,5 +1,19 @@
 priority -50
 
+############
+#  COMMON  #
+############
+
+# The smart snippets use a global options called
+# "g:ultisnips_javascript.{option}" which can control the format
+# of trailing semicolon, space before function paren, etc.
+
+global !p
+from javascript_snippets import (
+	semi, space_before_function_paren
+)
+endglobal
+
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
@@ -8,13 +22,13 @@ getElement${1/(T)|.*/(?1:s)/}By${1:T}${1/(T)|(I)|.*/(?1:agName)(?2:d)/}('$2')
 endsnippet
 
 snippet '':f "object method string"
-'${1:${2:#thing}:${3:click}}': function(element) {
+'${1:${2:#thing}:${3:click}}': function`!p snip.rv = space_before_function_paren(snip)`(element) {
 	${VISUAL}$0
 }${10:,}
 endsnippet
 
 snippet :f "Object Method"
-${1:method_name}: function(${3:attribute}) {
+${1:method_name}: function`!p snip.rv = space_before_function_paren(snip)`(${3:attribute}) {
 	${VISUAL}$0
 }${10:,}
 endsnippet
@@ -28,40 +42,46 @@ ${1:key}: ${2:"${3:value}"}${4:, }
 endsnippet
 
 snippet proto "Prototype (proto)"
-${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {
+${1:class_name}.prototype.${2:method_name} = function`!p snip.rv = space_before_function_paren(snip)`(${3:first_argument}) {
 	${VISUAL}$0
-};
+}`!p snip.rv = semi(snip)`
 
 endsnippet
 
 snippet fun "function (fun)" w
-function ${1:function_name}(${2:argument}) {
+function ${1:function_name}`!p snip.rv = space_before_function_paren(snip)`(${2:argument}) {
 	${VISUAL}$0
 }
 endsnippet
 
 snippet vf "Function assigned to var"
-${1:var }${2:function_name} = function $2($3) {
+${1:var }${2:function_name} = function $2`!p snip.rv = space_before_function_paren(snip)`($3) {
 	${VISUAL}$0
-};
+}`!p snip.rv = semi(snip)`
 endsnippet
 
 snippet af "Anonymous Function" i
-function($1) {
+function`!p snip.rv = space_before_function_paren(snip)`($1) {
 	${VISUAL}$0
 }
 endsnippet
 
 snippet iife "Immediately-Invoked Function Expression (iife)"
-(function(${1:window}) {
+(function`!p snip.rv = space_before_function_paren(snip)`(${1:window}) {
 	${VISUAL}$0
-}(${2:$1}));
+}(${2:$1}))`!p snip.rv = semi(snip)`
+endsnippet
+
+snippet ;fe "Minify safe iife"
+;(function`!p snip.rv = space_before_function_paren(snip)`(${1}) {
+	${VISUAL}$0
+}(${2}))
 endsnippet
 
 snippet timeout "setTimeout function"
-setTimeout(function() {
+setTimeout(function`!p snip.rv = space_before_function_paren(snip)`() {
 	${VISUAL}$0
-}${2:.bind(${3:this})}, ${1:10});
+}${2:.bind(${3:this})}, ${1:10})`!p snip.rv = semi(snip)`
 endsnippet
 
 snippet fi "for prop in obj using hasOwnProperty" b
@@ -72,4 +92,49 @@ for (${1:prop} in ${2:obj}){
 }
 endsnippet
 
+snippet if "if (condition) { ... }"
+if (${1:true}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet ife "if (condition) { ... } else { ... }"
+if (${1:true}) {
+	${VISUAL}$0
+} else {
+	${2}
+}
+endsnippet
+
+snippet switch
+switch (${VISUAL}${1:expression}) {
+	case '${VISUAL}${3:case}':
+		${4}
+		break`!p snip.rv = semi(snip)`
+	${0}
+	default:
+		${2}
+}
+endsnippet
+
+snippet case "case 'xyz': ... break"
+case '${VISUAL}${1:case}':
+	${VISUAL}$0
+	break`!p snip.rv = semi(snip)`
+endsnippet
+
+snippet do "do { ... } while (condition)"
+do {
+	${VISUAL}$0
+} while (${1:/* condition */})`!p snip.rv = semi(snip)`
+endsnippet
+
+snippet ret "Return statement"
+return ${VISUAL}$0`!p snip.rv = semi(snip)`
+endsnippet
+
+snippet us
+'use strict'`!p snip.rv = semi(snip)`
+endsnippet
+
 # vim:ft=snippets:
diff --git a/pythonx/javascript_snippets.py b/pythonx/javascript_snippets.py
new file mode 100644
index 000000000..ae30dfda2
--- /dev/null
+++ b/pythonx/javascript_snippets.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Helper utilities to format javascript snippets.
+"""
+
+ALWAYS = 'always'
+NEVER = 'never'
+
+
+def get_option(snip, option, default=None):
+    return snip.opt('g:ultisnips_javascript["{}"]'.format(option), default)
+
+
+def semi(snip):
+    option = get_option(snip, 'semi', ALWAYS)
+
+    if option == NEVER:
+        ret = ''
+    elif option == ALWAYS:
+        ret = ';'
+    else:
+        ret = ';'
+    return ret
+
+
+def space_before_function_paren(snip):
+    option = get_option(snip, 'space-before-function-paren', NEVER)
+
+    if option == NEVER:
+        ret = ''
+    elif option == ALWAYS:
+        ret = ' '
+    else:
+        ret = ''
+    return ret

From 0146680e2bca83da2f0c08c43ab06a8e54f53392 Mon Sep 17 00:00:00 2001
From: Vital Kudzelka <vital.kudzelka@gmail.com>
Date: Tue, 21 Feb 2017 11:22:29 +0300
Subject: [PATCH 0970/1587] Add option to control keyword-spacing

---
 UltiSnips/javascript.snippets  | 20 ++++++++++----------
 pythonx/javascript_snippets.py | 12 ++++++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index bb02b6905..652dd707e 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -10,7 +10,7 @@ priority -50
 
 global !p
 from javascript_snippets import (
-	semi, space_before_function_paren
+	semi, space_before_function_paren, keyword_spacing
 )
 endglobal
 
@@ -85,29 +85,29 @@ setTimeout(function`!p snip.rv = space_before_function_paren(snip)`() {
 endsnippet
 
 snippet fi "for prop in obj using hasOwnProperty" b
-for (${1:prop} in ${2:obj}){
-	if ($2.hasOwnProperty($1)) {
+for`!p snip.rv = keyword_spacing(snip)`(${1:prop} in ${2:obj}){
+	if`!p snip.rv = keyword_spacing(snip)`($2.hasOwnProperty($1)) {
 		${VISUAL}$0
 	}
 }
 endsnippet
 
 snippet if "if (condition) { ... }"
-if (${1:true}) {
+if`!p snip.rv = keyword_spacing(snip)`(${1:true}) {
 	${VISUAL}$0
 }
 endsnippet
 
 snippet ife "if (condition) { ... } else { ... }"
-if (${1:true}) {
+if`!p snip.rv = keyword_spacing(snip)`(${1:true}) {
 	${VISUAL}$0
-} else {
+}`!p snip.rv = keyword_spacing(snip)`else`!p snip.rv = keyword_spacing(snip)`{
 	${2}
 }
 endsnippet
 
 snippet switch
-switch (${VISUAL}${1:expression}) {
+switch`!p snip.rv = keyword_spacing(snip)`(${VISUAL}${1:expression}) {
 	case '${VISUAL}${3:case}':
 		${4}
 		break`!p snip.rv = semi(snip)`
@@ -118,15 +118,15 @@ switch (${VISUAL}${1:expression}) {
 endsnippet
 
 snippet case "case 'xyz': ... break"
-case '${VISUAL}${1:case}':
+case`!p snip.rv = keyword_spacing(snip)`'${VISUAL}${1:case}':
 	${VISUAL}$0
 	break`!p snip.rv = semi(snip)`
 endsnippet
 
 snippet do "do { ... } while (condition)"
-do {
+do`!p snip.rv = keyword_spacing(snip)`{
 	${VISUAL}$0
-} while (${1:/* condition */})`!p snip.rv = semi(snip)`
+}`!p snip.rv = keyword_spacing(snip)`while`!p snip.rv = keyword_spacing(snip)`(${1:/* condition */})`!p snip.rv = semi(snip)`
 endsnippet
 
 snippet ret "Return statement"
diff --git a/pythonx/javascript_snippets.py b/pythonx/javascript_snippets.py
index ae30dfda2..8757d49be 100644
--- a/pythonx/javascript_snippets.py
+++ b/pythonx/javascript_snippets.py
@@ -34,3 +34,15 @@ def space_before_function_paren(snip):
     else:
         ret = ''
     return ret
+
+
+def keyword_spacing(snip):
+    option = get_option(snip, 'keyword-spacing', ALWAYS)
+
+    if option == NEVER:
+        ret = ''
+    elif option == ALWAYS:
+        ret = ' '
+    else:
+        ret = ''
+    return ret

From f897848438414feaccbd33a0cb4abf7dd17f1723 Mon Sep 17 00:00:00 2001
From: teleivo <mrteleivo@gmail.com>
Date: Tue, 21 Feb 2017 15:40:38 +0100
Subject: [PATCH 0971/1587] fix notg syntax error in javascript-jasmine

removed extra '.' in the javascript-jasmine.snippets
'notg' snippet which leads to a

SyntaxError: Unexpected token .

        expect(6)..not.toBeGreaterThan(7);
                  ^

if not removed
---
 UltiSnips/javascript-jasmine.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/javascript-jasmine.snippets b/UltiSnips/javascript-jasmine.snippets
index 77aec7736..b9c8654fc 100644
--- a/UltiSnips/javascript-jasmine.snippets
+++ b/UltiSnips/javascript-jasmine.snippets
@@ -145,7 +145,7 @@ expect(${1:target}).not.toBeLessThan(${2:value});
 endsnippet
 
 snippet notg "expect to not be greater than (js)" b
-expect(${1:target})..not.toBeGreaterThan(${2:value});
+expect(${1:target}).not.toBeGreaterThan(${2:value});
 endsnippet
 
 snippet notm "expect not to match (js)" b

From b1663df5cc84ce91b1dc1adde85b507f71f6680f Mon Sep 17 00:00:00 2001
From: teleivo <mrteleivo@gmail.com>
Date: Wed, 22 Feb 2017 11:35:44 +0100
Subject: [PATCH 0972/1587] added javascript-jasmine error snippets

for

* toTrow
* toTrowError

and their not.xxx counterparts
---
 UltiSnips/javascript-jasmine.snippets | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/UltiSnips/javascript-jasmine.snippets b/UltiSnips/javascript-jasmine.snippets
index b9c8654fc..2efbf2663 100644
--- a/UltiSnips/javascript-jasmine.snippets
+++ b/UltiSnips/javascript-jasmine.snippets
@@ -132,6 +132,14 @@ snippet eh "expect to be hidden (js)" b
 expect(${1:target}).toBeHidden();
 endsnippet
 
+snippet eth "expect to throw (js)" b
+expect(${1:target}).toThrow(${2:value});
+endsnippet
+
+snippet ethe "expect to throw error (js)" b
+expect(${1:target}).toThrowError(${2:value});
+endsnippet
+
 snippet notx "expect not (js)" b
 expect(${1:target}).not$0;
 endsnippet
@@ -184,6 +192,14 @@ snippet noth "expect not to be hidden (js)" b
 expect(${1:target}).not.toBeHidden();
 endsnippet
 
+snippet notth "expect not to throw (js)" b
+expect(${1:target}).not.toThrow(${2:value});
+endsnippet
+
+snippet notthe "expect not to throw error (js)" b
+expect(${1:target}).not.toThrowError(${2:value});
+endsnippet
+
 snippet s "spy on (js)" b
 spyOn(${1:object}, '${2:method}')$0;
 endsnippet

From 8fe91f303c33a3df5add646caa2b4dc179b79db3 Mon Sep 17 00:00:00 2001
From: dohsimpson <mydohsimpson@gmail.com>
Date: Wed, 22 Feb 2017 10:11:26 -0500
Subject: [PATCH 0973/1587] Fix jinja trans snippet

See issue #873
---
 snippets/jinja.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/jinja.snippets b/snippets/jinja.snippets
index 7d14ca833..a6f274ab2 100644
--- a/snippets/jinja.snippets
+++ b/snippets/jinja.snippets
@@ -78,7 +78,7 @@ snippet spaceless
 snippet ssi
 	{% ssi ${0} %}
 snippet trans
-	{% trans "${0:string}" %}
+	{% trans %}${0}{% endtrans %}
 snippet url
 	{% url ${1} as ${0} %}
 snippet widthratio

From 4fb78b3a8c7a7d527f2b26ef46aed06882a10f4e Mon Sep 17 00:00:00 2001
From: m-pilia <martino.pilia@gmail.com>
Date: Thu, 23 Feb 2017 12:31:36 +0100
Subject: [PATCH 0974/1587] add MATLAB snippets

---
 UltiSnips/matlab.snippets | 24 +++++++++++++++
 snippets/matlab.snippets  | 64 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 UltiSnips/matlab.snippets
 create mode 100755 snippets/matlab.snippets

diff --git a/UltiSnips/matlab.snippets b/UltiSnips/matlab.snippets
new file mode 100644
index 000000000..4dc332bde
--- /dev/null
+++ b/UltiSnips/matlab.snippets
@@ -0,0 +1,24 @@
+priority -50
+
+snippet switch "switch ... otherwise"
+switch ${1:n}
+	case ${2:0}
+		${3}${4:
+	otherwise
+		${5}}
+end
+endsnippet
+
+snippet clc "class with constructor" b
+classdef ${1:`!p
+snip.rv = snip.basename or "class_name"`} 
+	properties
+		${2}
+	end
+	methods
+		function obj = $1(${3})
+			${4}
+		end${0}
+	end
+end
+endsnippet
diff --git a/snippets/matlab.snippets b/snippets/matlab.snippets
new file mode 100755
index 000000000..1342ca0b2
--- /dev/null
+++ b/snippets/matlab.snippets
@@ -0,0 +1,64 @@
+snippet if if
+	if ${1}
+		${0}
+	end
+
+snippet ife if ... else
+	if ${1}
+		${2}
+	else
+		${0}
+	end
+
+snippet el else
+	else
+		${0}
+
+snippet eif elsif
+	elseif ${1}
+		${0}
+
+snippet wh while
+	while ${1}
+		${0}
+	end
+
+snippet for for
+	for ${1:i} = ${2:1:n}
+		${0}
+	end
+
+snippet parfor parfor
+	parfor ${1:i} = ${2:1:n}
+		${0}
+	end
+
+snippet fun function
+	function [${3:out}] ${1:`vim_snippets#Filename("$1", "fun_name")`}(${2}) 
+	${0}
+
+snippet try try ... catch
+	try
+		${1}
+	catch ${2:err}
+		${0}
+	end
+
+snippet switch switch
+	switch ${1:n}
+		case ${2:0}
+			${0}
+	end
+
+snippet @ anonymous function
+	@(${1:x}) ${0:x*x}
+
+snippet cl class 
+	classdef ${1:`vim_snippets#Filename("$1", "class_name")`}
+	   properties
+		  ${2}
+	   end
+	   methods
+		  ${0}
+	   end
+	end

From 2d538b6f188d1844a03713330d8f22ee942bbce1 Mon Sep 17 00:00:00 2001
From: m-pilia <martino.pilia@gmail.com>
Date: Thu, 23 Feb 2017 12:44:19 +0100
Subject: [PATCH 0975/1587] fix

---
 snippets/matlab.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/matlab.snippets b/snippets/matlab.snippets
index 1342ca0b2..19b6fe879 100755
--- a/snippets/matlab.snippets
+++ b/snippets/matlab.snippets
@@ -34,7 +34,7 @@ snippet parfor parfor
 	end
 
 snippet fun function
-	function [${3:out}] ${1:`vim_snippets#Filename("$1", "fun_name")`}(${2}) 
+	function [${3:out}] = ${1:`vim_snippets#Filename("$1", "fun_name")`}(${2}) 
 	${0}
 
 snippet try try ... catch

From cd7ae563de7ea572863d5dbbded7c216a91e8600 Mon Sep 17 00:00:00 2001
From: Fabian Nick <fabian.nick@scai.fraunhofer.de>
Date: Fri, 24 Feb 2017 13:26:19 +0100
Subject: [PATCH 0976/1587] Empty comment line after brief docu of subroutine

---
 snippets/fortran.snippets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
index 8fecd3307..9485e21c5 100644
--- a/snippets/fortran.snippets
+++ b/snippets/fortran.snippets
@@ -28,6 +28,7 @@ snippet doc
 	$0
 snippet dox
 	!> @brief ${1}
+	!!
 	!> ${2}
 	!> @author `g:snips_author`
 	${0}

From 28e9b45896cd600ff10a0565f1cbb55720611976 Mon Sep 17 00:00:00 2001
From: Fabian Nick <fabian.nick@scai.fraunhofer.de>
Date: Fri, 24 Feb 2017 13:32:33 +0100
Subject: [PATCH 0977/1587] Snippet for Doxygen parameter tag.

---
 snippets/fortran.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
index 9485e21c5..b2625b060 100644
--- a/snippets/fortran.snippets
+++ b/snippets/fortran.snippets
@@ -32,6 +32,9 @@ snippet dox
 	!> ${2}
 	!> @author `g:snips_author`
 	${0}
+snippet doxp
+	!> @param[${1}]${2}
+	${0}
 # Variables definitions
 # Boolean
 snippet bool

From 7ebdf0559849cfac76ea2db0b00cdbbcfa85de65 Mon Sep 17 00:00:00 2001
From: Fabian Nick <fp.nick@gmail.com>
Date: Sat, 25 Feb 2017 18:50:21 +0100
Subject: [PATCH 0978/1587] Doxygen and Fortran again (#878)

* Empty comment line after brief docu of subroutine

* Snippet for Doxygen parameter tag.

* No new line after Doxygen @param.
---
 snippets/fortran.snippets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
index b2625b060..e61d3fb5a 100644
--- a/snippets/fortran.snippets
+++ b/snippets/fortran.snippets
@@ -33,8 +33,7 @@ snippet dox
 	!> @author `g:snips_author`
 	${0}
 snippet doxp
-	!> @param[${1}]${2}
-	${0}
+	!> @param[${1}]${0}
 # Variables definitions
 # Boolean
 snippet bool

From d0ce08a980852d0c60959453e0fcf2828a8a5ae6 Mon Sep 17 00:00:00 2001
From: Pavlo Solntsev <PavloSolntsev@users.noreply.github.com>
Date: Sun, 26 Feb 2017 13:33:55 -0600
Subject: [PATCH 0979/1587] Doxygen snippets were added for C/C++ files (#829)

* Doxygen snippets were added for C/C++ files

* Doxygen snippets were added for C/C++ files
---
 snippets/c.snippets   | 109 ++++++++++++++++++++++++++++++++++++++++--
 snippets/cpp.snippets |  57 ++++++++++++++++++++--
 2 files changed, 159 insertions(+), 7 deletions(-)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index ea744d547..6e8fb0a5e 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -130,6 +130,84 @@ snippet fun
 	{
 		${4}
 	}
+# function definition with zero parameters
+snippet fun0
+	${1:void} ${2:function_name}()
+	{
+		${3}
+	}
+# function definition with Doxygen documentation
+snippet dfun0
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 * 
+	 * \return ${3:Return parameter description}
+	 */
+	${4:void} ${5:function_name}()
+	{
+		${6}
+	}
+# function definition with one parameter
+snippet fun1
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter})
+	{
+		${5}
+	}
+# function definition with one parameter with  Doxygen documentation
+snippet dfun1
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 * 
+	 * \param $3 ${4:Parameter description}
+	 * \return ${5:Return parameter description}
+	 */
+	${6:void} ${7:function_name}(${8:Type} ${3:Parameter})
+	{
+		${9}
+	}
+# function definition with two parameters
+snippet fun2
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter}, ${5:Type} ${6:Parameter})
+	{
+		${7}
+	}
+# function definition with two parameters with  Doxygen documentation
+snippet dfun2
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 * 
+	 * \param $3 ${4:Parameter description}
+	 * \param $5 ${6:Parameter description}
+	 * \return ${7:Return parameter description}
+	 */
+	${8:void} ${9:function_name}(${10:Type} ${3:Parameter}, ${11:Type} ${5:Parameter})
+	{
+		${12}
+	}
+# function definition with two parameters
+snippet fun3
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter}, ${5:Type} ${6:Parameter}, ${7:Type} ${8:Parameter})
+	{
+		${9}
+	}
+# function definition with two parameters with  Doxygen documentation
+snippet dfun3
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 * 
+	 * \param $3 ${4:Parameter description}
+	 * \param $5 ${6:Parameter description}
+	 * \param $7 ${8:Parameter description}
+	 * \return ${9:Return parameter description}
+	 */
+	${10:void} ${11:function_name}(${12:Type} ${3:Parameter}, ${13:Type} ${5:Parameter}, ${14:Type} ${7:Parameter})
+	{
+		${15}
+	}
 # function declaration
 snippet fund
 	${1:void} ${2:function_name}(${3});
@@ -140,21 +218,39 @@ snippet td
 	typedef ${1:int} ${2:MyCustomType};
 # struct
 snippet st
+	/*! \struct $1 
+	 *  \brief ${3:Brief struct description}
+	 * 
+	 *  ${4:Detailed description} 	
+	 */
 	struct ${1:`vim_snippets#Filename('$1_t', 'name')`} {
-		${2:/* data */}
-	}${3: /* optional variable list */};
+		${2:Data} /*!< ${4:Description} */
+	}${5: /* optional variable list */};
 # typedef struct
 snippet tds
+	/*! \struct $2 
+	 *  \brief ${5:Brief struct description}
+	 * 
+	 *  ${6:Detailed description} 	
+	 */
 	typedef struct ${2:_$1 }{
-		${3:/* data */}
+		m_${3:Data} /*!< ${4:Description} */
 	} ${1:`vim_snippets#Filename('$1_t', 'name')`};
 
 snippet enum
+	/*! \enum $1
+	 * 
+	 *  ${2:Detailed description} 	
+	 */
 	enum ${1:name} { ${0} };
 # typedef enum
 snippet tde
+	/*! \enum $2
+	 * 
+	 *  ${4:Detailed description} 	
+	 */
 	typedef enum {
-		${1:/* data */}
+		${1:Data} /*!< ${3:Description} */
 	} ${2:foo};
 ##
 ## Input/Output
@@ -228,6 +324,11 @@ snippet getopt
 		}
 	}
 ##
+# TODO section
+snippet todo
+	/*! TODO: ${1:Todo description here}
+	 *  \todo $1
+	 */
 ## Miscellaneous
 # This is kind of convenient
 snippet .
diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 42c373413..7a55b95ee 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -78,20 +78,61 @@ snippet mu
 ## Class
 # class
 snippet cl
+	/*! \class $1 
+	 *  \brief ${3:Brief class description}
+	 * 
+	 *  ${4:Detailed description} 	
+	 */
 	class ${1:`vim_snippets#Filename('$1', 'name')`}
 	{
 	public:
 		$1(${2});
-		~$1();
+		virtual ~$1();
 
-	private:
-		${0:/* data */}
+	protected:
+		m_${5}; /*!< ${6:Member description} */
 	};
 # member function implementation
 snippet mfun
 	${4:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
 		${0}
 	}
+# member function implementation without parameters
+snippet dmfun0
+	/*! \brief ${4:Brief function description here}
+	 *
+	 *  ${5:Detailed description}
+	 * 
+	 * \return ${6:Return parameter description}
+	 */
+	${3:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}() {
+		${0}
+	}
+# member function implementation with one parameter
+snippet dmfun1
+	/*! \brief ${6:Brief function description here}
+	 *
+	 *  ${7:Detailed description}
+	 * 
+	 * \param $4 ${8:Parameter description}
+	 * \return ${9:Return parameter description}
+	 */
+	${5:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}(${3:Type} ${4:Parameter}) {
+		${0}
+	}
+# member function implementation with two parameter
+snippet dmfun2
+	/*! \brief ${8:Brief function description here}
+	 *
+	 *  ${9:Detailed description}
+	 * 
+	 * \param $4 ${10:Parameter description}
+	 * \param $6 ${11:Parameter description}
+	 * \return ${12:Return parameter description}
+	 */
+	${7:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}(${3:Type} ${4:Parameter},${5:Type} ${6:Parameter}) {
+		${0}
+	}
 # namespace
 snippet ns
 	namespace ${1:`vim_snippets#Filename('', 'my')`} {
@@ -152,3 +193,13 @@ snippet lld
 	[${1}](${2}){
 		${3}
 	};
+# snippets exception 
+snippet try
+	try {
+		
+	}catch(${1}) {
+		
+	}
+
+
+

From fabeb01662eee90f5999447c7e1ed3667270939d Mon Sep 17 00:00:00 2001
From: Tamas Gulacsy-Toth <tamas.gulacsy.toth@lensa.com>
Date: Tue, 28 Feb 2017 14:34:00 +0100
Subject: [PATCH 0980/1587] add javascript-jasmine-arrow.snippets

---
 UltiSnips/javascript-jasmine-arrow.snippets | 234 ++++++++++++++++++++
 1 file changed, 234 insertions(+)
 create mode 100644 UltiSnips/javascript-jasmine-arrow.snippets

diff --git a/UltiSnips/javascript-jasmine-arrow.snippets b/UltiSnips/javascript-jasmine-arrow.snippets
new file mode 100644
index 000000000..fa7f93643
--- /dev/null
+++ b/UltiSnips/javascript-jasmine-arrow.snippets
@@ -0,0 +1,234 @@
+priority -50
+
+# JavaScript versions -- from the TextMate bundle + some additions
+# for jasmine-jquery matchers
+#
+
+snippet des "Describe (js)" b
+describe('${1:description}', () => {
+	$0
+});
+endsnippet
+
+snippet it "it (js)" b
+it('${1:description}', () => {
+	$0
+});
+endsnippet
+
+snippet bef "before each (js)" b
+beforeEach(() => {
+	$0
+});
+endsnippet
+
+snippet aft "after each (js)" b
+afterEach(() => {
+	$0
+});
+endsnippet
+
+snippet befa "before all (js)" b
+beforeAll(() => {
+	$0
+});
+endsnippet
+
+snippet afta "after all (js)" b
+afterAll(() => {
+	$0
+});
+endsnippet
+
+snippet any "any (js)" b
+jasmine.any($1)
+endsnippet
+
+snippet anyt "anything (js)" b
+jasmine.anything()
+endsnippet
+
+snippet objc "object containing (js)" b
+jasmine.objectContaining({
+	${VISUAL}$0
+});
+endsnippet
+
+snippet arrc "array containing (js)" b
+jasmine.arrayContaining([${1:value1}]);
+endsnippet
+
+snippet strm "string matching (js)" b
+jasmine.stringMatching("${1:matcher}")
+endsnippet
+
+snippet ru "runs (js)" b
+runs(() => {
+	$0
+});
+endsnippet
+
+snippet wa "waits (js)" b
+waits($1);
+endsnippet
+
+snippet ex "expect (js)" b
+expect(${1:target})$0;
+endsnippet
+
+snippet ee "expect to equal (js)" b
+expect(${1:target}).toEqual(${2:value});
+endsnippet
+
+snippet el "expect to be less than (js)" b
+expect(${1:target}).toBeLessThan(${2:value});
+endsnippet
+
+snippet eg "expect to be greater than (js)" b
+expect(${1:target}).toBeGreaterThan(${2:value});
+endsnippet
+
+snippet eb "expect to be (js)" b
+expect(${1:target}).toBe(${2:value});
+endsnippet
+
+snippet em "expect to match (js)" b
+expect(${1:target}).toMatch(${2:pattern});
+endsnippet
+
+snippet eha "expect to have attribute (js)" b
+expect(${1:target}).toHaveAttr('${2:attr}'${3:, '${4:value}'});
+endsnippet
+
+snippet et "expect to be truthy (js)" b
+expect(${1:target}).toBeTruthy();
+endsnippet
+
+snippet ef "expect to be falsy (js)" b
+expect(${1:target}).toBeFalsy();
+endsnippet
+
+snippet ed "expect to be defined (js)" b
+expect(${1:target}).toBeDefined();
+endsnippet
+
+snippet eud "expect to be defined (js)" b
+expect(${1:target}).toBeUndefined();
+endsnippet
+
+snippet en "expect to be null (js)" b
+expect(${1:target}).toBeNull();
+endsnippet
+
+snippet ec "expect to contain (js)" b
+expect(${1:target}).toContain(${2:value});
+endsnippet
+
+snippet ev "expect to be visible (js)" b
+expect(${1:target}).toBeVisible();
+endsnippet
+
+snippet eh "expect to be hidden (js)" b
+expect(${1:target}).toBeHidden();
+endsnippet
+
+snippet eth "expect to throw (js)" b
+expect(${1:target}).toThrow(${2:value});
+endsnippet
+
+snippet ethe "expect to throw error (js)" b
+expect(${1:target}).toThrowError(${2:value});
+endsnippet
+
+snippet notx "expect not (js)" b
+expect(${1:target}).not$0;
+endsnippet
+
+snippet note "expect not to equal (js)" b
+expect(${1:target}).not.toEqual(${2:value});
+endsnippet
+
+snippet notl "expect to not be less than (js)" b
+expect(${1:target}).not.toBeLessThan(${2:value});
+endsnippet
+
+snippet notg "expect to not be greater than (js)" b
+expect(${1:target}).not.toBeGreaterThan(${2:value});
+endsnippet
+
+snippet notm "expect not to match (js)" b
+expect(${1:target}).not.toMatch(${2:pattern});
+endsnippet
+
+snippet notha "expect to not have attribute (js)" b
+expect(${1:target}).not.toHaveAttr('${2:attr}'${3:, '${4:value}'});
+endsnippet
+
+snippet nott "expect not to be truthy (js)" b
+expect(${1:target}).not.toBeTruthy();
+endsnippet
+
+snippet notf "expect not to be falsy (js)" b
+expect(${1:target}).not.toBeFalsy();
+endsnippet
+
+snippet notd "expect not to be defined (js)" b
+expect(${1:target}).not.toBeDefined();
+endsnippet
+
+snippet notn "expect not to be null (js)" b
+expect(${1:target}).not.toBeNull();
+endsnippet
+
+snippet notc "expect not to contain (js)" b
+expect(${1:target}).not.toContain(${2:value});
+endsnippet
+
+snippet notv "expect not to be visible (js)" b
+expect(${1:target}).not.toBeVisible();
+endsnippet
+
+snippet noth "expect not to be hidden (js)" b
+expect(${1:target}).not.toBeHidden();
+endsnippet
+
+snippet notth "expect not to throw (js)" b
+expect(${1:target}).not.toThrow(${2:value});
+endsnippet
+
+snippet notthe "expect not to throw error (js)" b
+expect(${1:target}).not.toThrowError(${2:value});
+endsnippet
+
+snippet s "spy on (js)" b
+spyOn(${1:object}, '${2:method}')$0;
+endsnippet
+
+snippet sr "spy on and return (js)" b
+spyOn(${1:object}, '${2:method}').and.returnValue(${3:arguments});
+endsnippet
+
+snippet st "spy on and throw (js)" b
+spyOn(${1:object}, '${2:method}').and.throwError(${3:exception});
+endsnippet
+
+snippet sct "spy on and call through (js)" b
+spyOn(${1:object}, '${2:method}').and.callThrough();
+endsnippet
+
+snippet scf "spy on and call fake (js)" b
+spyOn(${1:object}, '${2:method}').and.callFake(${3:function});
+endsnippet
+
+snippet ethbc "expect to have been called (js)" b
+expect(${1:target}).toHaveBeenCalled();
+endsnippet
+
+snippet nthbc "expect not to have been called (js)" b
+expect(${1:target}).not.toHaveBeenCalled();
+endsnippet
+
+snippet ethbcw "expect to have been called with (js)" b
+expect(${1:target}).toHaveBeenCalledWith(${2:arguments});
+endsnippet
+

From 5600d3e6acacf074f44dbc0058afc1e00d6508a6 Mon Sep 17 00:00:00 2001
From: Paritosh Kelkar <paritoshskelkar@gmail.com>
Date: Tue, 28 Feb 2017 18:20:40 -0500
Subject: [PATCH 0981/1587] added snippet for basic doxygen style cpp fucntion

---
 UltiSnips/cpp.snippets | 57 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index c83ec6055..b98fee19f 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -4,6 +4,48 @@ extends c
 
 # We want to overwrite everything in parent ft.
 priority -49
+###########################################################################
+# 			    Global functions 						  #
+###########################################################################
+
+global !p 
+
+def parseParamList(snip, args):
+	paramList = args.split(",")
+	s = ""
+	for w in paramList:
+		snip += w.strip()
+		if len(paramList) > 1:
+			snip.rv += '\n' + snip.mkline('',indent='') 
+
+def get_args(arglist):
+	'''
+	args = [Arg(arg) for arg in arglist.split(',') if arg]
+	args = [arg for arg in args if arg.name != 'self']
+	'''
+	args = arglist.split(',')
+	return args
+
+
+def write_docstring_args(arglist, snip):
+	
+	#args = get_args(arglist)
+	args = str(arglist).split(',')
+
+
+	if len(args) > 1:
+		c = 0
+		for arg in args:
+			if c == 0:
+				snip.rv += arg
+				c = 1 
+			else:
+				snip += '*       : %s' % arg.strip() 
+	else:
+		snip.rv = args[0]
+
+
+endglobal
 
 ###########################################################################
 #                            TextMate Snippets                            #
@@ -70,4 +112,19 @@ public:
 
 #endif /* $2 */
 endsnippet
+
+
+snippet fnc "Basic c++ doxygen function template" b
+/**
+* @brief: ${4:brief} 
+*
+* @param: `!p write_docstring_args(t[3],snip)`
+*
+* @return: `!p snip.rv = t[1]` 
+*/
+${1:ReturnType} ${2:FunctionName}(${3:param})
+{
+  ${0:FunctionBody}
+}
+endsnippet
 # vim:ft=snippets:

From a189a34fcd0dfb8227fbda2bc42b86898a004bb0 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 1 Mar 2017 01:10:33 +0000
Subject: [PATCH 0982/1587] Ruby defi: autorecord instance vars

---
 UltiSnips/ruby.snippets | 68 +++++++++++++----------------------------
 snippets/ruby.snippets  | 15 ---------
 2 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index b7124f83b..c61b27668 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -1,5 +1,26 @@
 priority -50
 
+#
+# Global functions
+#
+
+global !p
+
+def write_instance_vars(arglist, snip):
+	args = str(arglist).split(',')
+	for arg in args:
+		name = arg.strip().replace(':', ' ').split(' ', 1)[0]
+		if name:
+			snip += '  @{} = {}'.format(name, name)
+		else:
+			snip += ''
+
+endglobal
+
+#
+# Snippets
+#
+
 snippet "^#!" "#!/usr/bin/env ruby" r
 #!/usr/bin/env ruby
 $0
@@ -17,8 +38,7 @@ end
 endsnippet
 
 snippet defi "def initialize ..."
-def initialize${1:(${2:*args})}
-	$0
+def initialize($1)`!p write_instance_vars(t[1],snip)`$0
 end
 endsnippet
 
@@ -212,32 +232,6 @@ except:
 end
 endsnippet
 
-snippet "(\S+)\.Each_?w(ith)?_?i(ndex)?" ".each_with_index { |<element>,<i>| <block> }" r
-`!p snip.rv=match.group(1)`.each_with_index { |${1:`!p
-element_name = match.group(1).lstrip('$@')
-ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
-try:
-	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
-	snip.rv = wmatch.group(1).lower()
-except:
-	snip.rv = 'element'
-`},${2:i}| $0 }
-endsnippet
-
-snippet "(\S+)\.each_?w(ith)?_?i(ndex)?" ".each_with_index do |<element>,<i>| <block> end" r
-`!p snip.rv=match.group(1)`.each_with_index do |${1:`!p
-element_name = match.group(1).lstrip('$@')
-ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
-try:
-	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
-	snip.rv = wmatch.group(1).lower()
-except:
-	snip.rv = 'element'
-`},${2:i}|
-	$0
-end
-endsnippet
-
 snippet "(\S+)\.Each_?p(air)?"  ".each_pair { |<key>,<value>| <block> }" r
 `!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| $0 }
 endsnippet
@@ -298,20 +292,6 @@ rescue
 end
 endsnippet
 
-snippet begin "begin ... rescue ... else ... ensure ... end"
-begin
-	${1:# Raise exception}
-rescue Exception => e
-	puts e.message
-	puts e.backtrace.inspect
-	${2:# Rescue}
-else
-	${3:# other exception}
-ensure
-	${0:# always excute}
-end
-endsnippet
-
 snippet rescue
 rescue Exception => e
 	puts e.message
@@ -326,10 +306,6 @@ $0
 end
 endsnippet
 
-snippet alias "alias :<new_name> :<old_name>"
-alias :${1:new_name} :${2:old_name}
-endsnippet
-
 snippet class "class <class_name> def initialize ... end end"
 class ${1:class_name}
 	def initialize(${2:*args})
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 9dc984fd5..340391eba 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -142,21 +142,6 @@ snippet mod module .. end
 	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
 		${0}
 	end
-snippet mod module .. ClassMethods .. end
-	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
-		module ClassMethods
-			${0}
-		end
-
-		module InstanceMethods
-
-		end
-
-		def self.included(receiver)
-			receiver.extend         ClassMethods
-			receiver.send :include, InstanceMethods
-		end
-	end
 # attr_reader
 snippet r
 	attr_reader :${0:attr_names}

From 6e3c6ba77a6537dc965472be6f9c38655ae09f35 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 1 Mar 2017 01:12:41 +0000
Subject: [PATCH 0983/1587] Remove unused util code

---
 UltiSnips/cpp.snippets | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index b98fee19f..bb79a0e1f 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -5,42 +5,22 @@ extends c
 # We want to overwrite everything in parent ft.
 priority -49
 ###########################################################################
-# 			    Global functions 						  #
+#			    Global functions 						  #
 ###########################################################################
 
-global !p 
-
-def parseParamList(snip, args):
-	paramList = args.split(",")
-	s = ""
-	for w in paramList:
-		snip += w.strip()
-		if len(paramList) > 1:
-			snip.rv += '\n' + snip.mkline('',indent='') 
-
-def get_args(arglist):
-	'''
-	args = [Arg(arg) for arg in arglist.split(',') if arg]
-	args = [arg for arg in args if arg.name != 'self']
-	'''
-	args = arglist.split(',')
-	return args
-
+global !p
 
 def write_docstring_args(arglist, snip):
-	
-	#args = get_args(arglist)
 	args = str(arglist).split(',')
 
-
 	if len(args) > 1:
 		c = 0
 		for arg in args:
 			if c == 0:
 				snip.rv += arg
-				c = 1 
+				c = 1
 			else:
-				snip += '*       : %s' % arg.strip() 
+				snip += '*       : %s' % arg.strip()
 	else:
 		snip.rv = args[0]
 
@@ -116,11 +96,11 @@ endsnippet
 
 snippet fnc "Basic c++ doxygen function template" b
 /**
-* @brief: ${4:brief} 
+* @brief: ${4:brief}
 *
 * @param: `!p write_docstring_args(t[3],snip)`
 *
-* @return: `!p snip.rv = t[1]` 
+* @return: `!p snip.rv = t[1]`
 */
 ${1:ReturnType} ${2:FunctionName}(${3:param})
 {

From 27634062fa887a1be2998fc0bd5d3c5b21a03ea4 Mon Sep 17 00:00:00 2001
From: Mathew Attlee <hello@codeinabox.com>
Date: Wed, 1 Mar 2017 10:52:11 +0000
Subject: [PATCH 0984/1587] Changed trigger for UltiSnips snippet to `usnip`
 and updated both to use VISUAL

---
 UltiSnips/snippets.snippets | 6 +++---
 snippets/snippets.snippets  | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/UltiSnips/snippets.snippets b/UltiSnips/snippets.snippets
index ee0c8c766..6fc26688c 100644
--- a/UltiSnips/snippets.snippets
+++ b/UltiSnips/snippets.snippets
@@ -2,15 +2,15 @@ priority -50
 
 # We use a little hack so that the snippet is expanded
 # and parsed correctly
-snippet snip "Snippet definition" b
+snippet usnip "Ultisnips snippet definition" b
 `!p snip.rv = "snippet"` ${1:Tab_trigger} "${2:Description}" ${3:b}
-$0
+${0:${VISUAL}}
 `!p snip.rv = "endsnippet"`
 endsnippet
 
 snippet global "Global snippet" b
 `!p snip.rv = "global"` !p
-$0
+${0:${VISUAL}}
 `!p snip.rv = "endglobal"`
 endsnippet
 
diff --git a/snippets/snippets.snippets b/snippets/snippets.snippets
index dc8de42fc..c2d932ae6 100644
--- a/snippets/snippets.snippets
+++ b/snippets/snippets.snippets
@@ -1,10 +1,7 @@
 # snippets for making snippets :)
 snippet snip
-	snippet ${1:trigger}
-		${0}
-snippet msnip
-	snippet ${1:trigger} ${2:description}
-		${0}
+	snippet ${1:trigger} "${2:description}"
+		${0:${VISUAL}}
 snippet v
 	{VISUAL}
 snippet $

From 9a2379be7698ff83985eebb394b7a9f99560a77f Mon Sep 17 00:00:00 2001
From: Andrey Paskal <apaskal@gmail.com>
Date: Wed, 1 Mar 2017 18:21:44 +0300
Subject: [PATCH 0985/1587] Comments to show in completion list popup

---
 snippets/php.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 52572da91..fb313b848 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -94,9 +94,9 @@ snippet E
 	$_ENV['${1:variable}']
 snippet F
 	$_FILES['${1:variable}']
-snippet G
+snippet G "_GET array"
 	$_GET['${1:variable}']
-snippet P
+snippet P "_POST array"
 	$_POST['${1:variable}']
 snippet R
 	$_REQUEST['${1:variable}']

From 24ac9a56fba42c094e2137fd3351bf138582e290 Mon Sep 17 00:00:00 2001
From: Augusto Melo <augustomelo92@gmail.com>
Date: Fri, 10 Mar 2017 16:00:07 -0300
Subject: [PATCH 0986/1587] Added methods snippets

---
 UltiSnips/cs.snippets | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/cs.snippets b/UltiSnips/cs.snippets
index 89b61ca09..31ac19d46 100644
--- a/UltiSnips/cs.snippets
+++ b/UltiSnips/cs.snippets
@@ -300,9 +300,9 @@ MessageBox.Show("${1:message}");
 endsnippet
 
 
-##################
-#  full methods  #
-##################
+#############
+#  methods  #
+#############
 
 snippet equals "Equals method" b
 public override bool Equals(object obj)
@@ -316,6 +316,17 @@ public override bool Equals(object obj)
 }
 endsnippet
 
+snippet mth "Method" b
+${1:public} ${2:void} ${3:MyMethod}(${4})
+{
+	${5}
+}
+
+snippet mth "Static method" b
+${1:public} static ${2:void} ${3:MyMethod}(${4})
+{
+	${5}
+}
 
 ##############
 #  comments  #

From 5854eecad3864be6603e23c8053b0941605fb8c5 Mon Sep 17 00:00:00 2001
From: Augusto Melo <augustomelo92@gmail.com>
Date: Fri, 10 Mar 2017 16:15:24 -0300
Subject: [PATCH 0987/1587] Added XML comments

---
 UltiSnips/cs.snippets | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/cs.snippets b/UltiSnips/cs.snippets
index 31ac19d46..f21994972 100644
--- a/UltiSnips/cs.snippets
+++ b/UltiSnips/cs.snippets
@@ -321,19 +321,37 @@ ${1:public} ${2:void} ${3:MyMethod}(${4})
 {
 	${5}
 }
+endsnippet
 
 snippet mth "Static method" b
 ${1:public} static ${2:void} ${3:MyMethod}(${4})
 {
 	${5}
 }
+endsnippet
 
 ##############
 #  comments  #
 ##############
 
-snippet /// "XML comment" b
+snippet /// "XML summary comment" b
 /// <summary>
 /// $1
 /// </summary>
 endsnippet
+
+snippet <p "XML pramameter comment" b
+<param name="${1}">${2:$1}</param>
+endsnippet
+
+snippet <ex "XML exception comment" b
+<exception cref="${1:System.Exception}">${2}</exception>
+endsnippet
+
+snippet <r "XML returns comment" b
+<returns>${1}</returns>
+endsnippet
+
+snippet <c "XML code comment" b
+<code>${1}</code>
+endsnippet

From e879b11065ddfd4ca59b7cba50b79f5e342f3b74 Mon Sep 17 00:00:00 2001
From: Augusto Melo <augustomelo92@gmail.com>
Date: Fri, 10 Mar 2017 16:18:08 -0300
Subject: [PATCH 0988/1587] Added constructor snippet

---
 UltiSnips/cs.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/UltiSnips/cs.snippets b/UltiSnips/cs.snippets
index f21994972..ee12f4ea2 100644
--- a/UltiSnips/cs.snippets
+++ b/UltiSnips/cs.snippets
@@ -330,6 +330,16 @@ ${1:public} static ${2:void} ${3:MyMethod}(${4})
 }
 endsnippet
 
+###############
+# constructor #
+###############
+
+snippet ctor "Constructor" b
+${1:public} ${2:snip.basename}
+{
+	${3}
+}
+
 ##############
 #  comments  #
 ##############

From 6be25add4c2a11b51a95f9f3bf8530a8fe3d0b51 Mon Sep 17 00:00:00 2001
From: Augusto Melo <augustomelo92@gmail.com>
Date: Fri, 10 Mar 2017 16:55:08 -0300
Subject: [PATCH 0989/1587] Remove extra spaces

---
 snippets/cs.snippets | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 391984bb6..decf79af0 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -56,7 +56,7 @@
 #
 # Feedback is welcome!
 #
-# Main 
+# Main
 snippet sim
 	${1:public }static int Main(string[] args) {
 		${0}
@@ -358,7 +358,7 @@ snippet enum
 	enum ${1} {
 		${0}
 	}
-	
+
 snippet enum+
 	public enum ${1} {
 		${0}
@@ -378,7 +378,7 @@ snippet <p
 snippet <ex
 	<exception cref="${1:System.Exception}">${2}</exception>
 snippet <r
-	<returns>${1}</returns>{
+	<returns>${1}</returns>
 snippet <s
 	<see cref="${1}"/>
 snippet <rem
@@ -398,7 +398,7 @@ snippet eq
 		${0:throw new NotImplementedException();}
 		return base.Equals(obj);
 	}
-# exception 
+# exception
 snippet exc
 	public class ${1:MyException} : ${2:Exception} {
 		public $1() { }
@@ -409,13 +409,13 @@ snippet exc
 			System.Runtime.Serialization.StreamingContext context)
 				: base(info, context) { }
 	}
-# indexer 
+# indexer
 snippet index
 	public ${1:object} this[${2:int} index] {
 		get { ${0} }
 		set { ${0} }
 	}
-# eventhandler 
+# eventhandler
 snippet inv
 	EventHandler temp = ${1:MyEvent};
 	if (${2:temp} != null) {
@@ -442,7 +442,7 @@ snippet propf
 		}
 snippet propg
 	public ${1:int} ${2:MyProperty} { get; private set; }
-# switch    
+# switch
 snippet switch
 	switch (${1:switch_on}) {
 		${0}

From b4edde01783cb969cf93e4882d743285d5e49dde Mon Sep 17 00:00:00 2001
From: Augusto Melo <augustomelo92@gmail.com>
Date: Fri, 10 Mar 2017 17:29:30 -0300
Subject: [PATCH 0990/1587] Fixed snippets

Fixed some snippets that wherer wrong like the constructor one
and some changes like $0
---
 UltiSnips/cs.snippets | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/UltiSnips/cs.snippets b/UltiSnips/cs.snippets
index ee12f4ea2..298eefd28 100644
--- a/UltiSnips/cs.snippets
+++ b/UltiSnips/cs.snippets
@@ -16,7 +16,7 @@ namespace ${1:MyNamespace}
 endsnippet
 
 snippet class "class" w
-class ${1:MyClass}
+${1:public} class ${2:MyClass}
 {
 	$0
 }
@@ -288,6 +288,10 @@ snippet cw "Console.WriteLine" b
 Console.WriteLine("$1");
 endsnippet
 
+snippet cr "Console.ReadLine" b
+Console.ReadLine();
+endsnippet
+
 # as you first type comma-separated parameters on the right, {n} values appear in the format string
 snippet cwp "Console.WriteLine with parameters" b
 Console.WriteLine("${2:`!p
@@ -319,14 +323,14 @@ endsnippet
 snippet mth "Method" b
 ${1:public} ${2:void} ${3:MyMethod}(${4})
 {
-	${5}
+	$0
 }
 endsnippet
 
-snippet mth "Static method" b
+snippet mths "Static method" b
 ${1:public} static ${2:void} ${3:MyMethod}(${4})
 {
-	${5}
+	$0
 }
 endsnippet
 
@@ -335,10 +339,11 @@ endsnippet
 ###############
 
 snippet ctor "Constructor" b
-${1:public} ${2:snip.basename}
+${1:public} ${2:`!p snip.rv = snip.basename or "untitled"`}(${3})
 {
-	${3}
+	$0
 }
+endsnippet
 
 ##############
 #  comments  #
@@ -346,12 +351,12 @@ ${1:public} ${2:snip.basename}
 
 snippet /// "XML summary comment" b
 /// <summary>
-/// $1
+/// $0
 /// </summary>
 endsnippet
 
 snippet <p "XML pramameter comment" b
-<param name="${1}">${2:$1}</param>
+<param name="${1}">${2}</param>
 endsnippet
 
 snippet <ex "XML exception comment" b
@@ -359,9 +364,9 @@ snippet <ex "XML exception comment" b
 endsnippet
 
 snippet <r "XML returns comment" b
-<returns>${1}</returns>
+<returns>$0</returns>
 endsnippet
 
 snippet <c "XML code comment" b
-<code>${1}</code>
+<code>$0</code>
 endsnippet

From 90a917915d21a893d9eef4244d933ed8d06641cb Mon Sep 17 00:00:00 2001
From: Augusto Melo <augustomelo92@gmail.com>
Date: Thu, 16 Mar 2017 10:33:30 -0300
Subject: [PATCH 0991/1587] Change the options

Thease options should be word boundary ('w') because it can only happen
after a /// so the option 'b' does not work
---
 UltiSnips/cs.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/cs.snippets b/UltiSnips/cs.snippets
index 298eefd28..13d3c9717 100644
--- a/UltiSnips/cs.snippets
+++ b/UltiSnips/cs.snippets
@@ -355,18 +355,18 @@ snippet /// "XML summary comment" b
 /// </summary>
 endsnippet
 
-snippet <p "XML pramameter comment" b
+snippet <p "XML pramameter comment" w
 <param name="${1}">${2}</param>
 endsnippet
 
-snippet <ex "XML exception comment" b
+snippet <ex "XML exception comment" w
 <exception cref="${1:System.Exception}">${2}</exception>
 endsnippet
 
-snippet <r "XML returns comment" b
+snippet <r "XML returns comment" w
 <returns>$0</returns>
 endsnippet
 
-snippet <c "XML code comment" b
+snippet <c "XML code comment" w
 <code>$0</code>
 endsnippet

From 8277fa92c7544a573f267045f9e713dbc637b67e Mon Sep 17 00:00:00 2001
From: Zach Whaley <zachbwhaley@gmail.com>
Date: Mon, 20 Mar 2017 16:47:17 -0500
Subject: [PATCH 0992/1587] Remove trailing whitespace from C/C++ snippets

---
 snippets/c.snippets   | 28 ++++++++++++++--------------
 snippets/cpp.snippets | 14 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index 6e8fb0a5e..0336a147f 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -141,7 +141,7 @@ snippet dfun0
 	/*! \brief ${1:Brief function description here}
 	 *
 	 *  ${2:Detailed description of the function}
-	 * 
+	 *
 	 * \return ${3:Return parameter description}
 	 */
 	${4:void} ${5:function_name}()
@@ -159,7 +159,7 @@ snippet dfun1
 	/*! \brief ${1:Brief function description here}
 	 *
 	 *  ${2:Detailed description of the function}
-	 * 
+	 *
 	 * \param $3 ${4:Parameter description}
 	 * \return ${5:Return parameter description}
 	 */
@@ -178,7 +178,7 @@ snippet dfun2
 	/*! \brief ${1:Brief function description here}
 	 *
 	 *  ${2:Detailed description of the function}
-	 * 
+	 *
 	 * \param $3 ${4:Parameter description}
 	 * \param $5 ${6:Parameter description}
 	 * \return ${7:Return parameter description}
@@ -198,7 +198,7 @@ snippet dfun3
 	/*! \brief ${1:Brief function description here}
 	 *
 	 *  ${2:Detailed description of the function}
-	 * 
+	 *
 	 * \param $3 ${4:Parameter description}
 	 * \param $5 ${6:Parameter description}
 	 * \param $7 ${8:Parameter description}
@@ -218,20 +218,20 @@ snippet td
 	typedef ${1:int} ${2:MyCustomType};
 # struct
 snippet st
-	/*! \struct $1 
+	/*! \struct $1
 	 *  \brief ${3:Brief struct description}
-	 * 
-	 *  ${4:Detailed description} 	
+	 *
+	 *  ${4:Detailed description}
 	 */
 	struct ${1:`vim_snippets#Filename('$1_t', 'name')`} {
 		${2:Data} /*!< ${4:Description} */
 	}${5: /* optional variable list */};
 # typedef struct
 snippet tds
-	/*! \struct $2 
+	/*! \struct $2
 	 *  \brief ${5:Brief struct description}
-	 * 
-	 *  ${6:Detailed description} 	
+	 *
+	 *  ${6:Detailed description}
 	 */
 	typedef struct ${2:_$1 }{
 		m_${3:Data} /*!< ${4:Description} */
@@ -239,15 +239,15 @@ snippet tds
 
 snippet enum
 	/*! \enum $1
-	 * 
-	 *  ${2:Detailed description} 	
+	 *
+	 *  ${2:Detailed description}
 	 */
 	enum ${1:name} { ${0} };
 # typedef enum
 snippet tde
 	/*! \enum $2
-	 * 
-	 *  ${4:Detailed description} 	
+	 *
+	 *  ${4:Detailed description}
 	 */
 	typedef enum {
 		${1:Data} /*!< ${3:Description} */
diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 7a55b95ee..4c02a47fa 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -78,10 +78,10 @@ snippet mu
 ## Class
 # class
 snippet cl
-	/*! \class $1 
+	/*! \class $1
 	 *  \brief ${3:Brief class description}
-	 * 
-	 *  ${4:Detailed description} 	
+	 *
+	 *  ${4:Detailed description}
 	 */
 	class ${1:`vim_snippets#Filename('$1', 'name')`}
 	{
@@ -102,7 +102,7 @@ snippet dmfun0
 	/*! \brief ${4:Brief function description here}
 	 *
 	 *  ${5:Detailed description}
-	 * 
+	 *
 	 * \return ${6:Return parameter description}
 	 */
 	${3:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}() {
@@ -113,7 +113,7 @@ snippet dmfun1
 	/*! \brief ${6:Brief function description here}
 	 *
 	 *  ${7:Detailed description}
-	 * 
+	 *
 	 * \param $4 ${8:Parameter description}
 	 * \return ${9:Return parameter description}
 	 */
@@ -125,7 +125,7 @@ snippet dmfun2
 	/*! \brief ${8:Brief function description here}
 	 *
 	 *  ${9:Detailed description}
-	 * 
+	 *
 	 * \param $4 ${10:Parameter description}
 	 * \param $6 ${11:Parameter description}
 	 * \return ${12:Return parameter description}
@@ -193,7 +193,7 @@ snippet lld
 	[${1}](${2}){
 		${3}
 	};
-# snippets exception 
+# snippets exception
 snippet try
 	try {
 		

From 0f290ce487d8e65a1f3f7dabc8b0b045ca11ea95 Mon Sep 17 00:00:00 2001
From: John Zeng <johnzeng@users.noreply.github.com>
Date: Tue, 21 Mar 2017 18:07:45 +0800
Subject: [PATCH 0993/1587] Erlang file name is not working any more (#886)

* fix file name

* add mod all back
---
 snippets/erlang.snippets | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index bd379f3df..960c8e762 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -1,14 +1,16 @@
-# module and export all
+# module
 snippet mod
-	-module(${1:`vim_snippets#Filename('', 'my')`}).
-
+	-module(${1:`vim_snippets#Filename()`}).
+# module and export all
+snippet modall
+	-module(${1:`vim_snippets#Filename()`}).
 	-compile([export_all]).
-
+	 
 	start() ->
-	    ${0}
-
+		${0}
+	 
 	stop() ->
-	    ok.
+		ok.
 # define directive
 snippet def
 	-define(${1:macro}, ${2:body}).
@@ -73,7 +75,7 @@ snippet %p
 	%% @private
 # OTP application
 snippet application
-	-module(${1:`vim_snippets#Filename('', 'my')`}).
+	-module(${1:`vim_snippets#Filename()`}).
 
 	-behaviour(application).
 
@@ -91,7 +93,7 @@ snippet application
 	    ok.
 # OTP supervisor
 snippet supervisor
-	-module(${1:`vim_snippets#Filename('', 'my')`}).
+	-module(${1:`vim_snippets#Filename()`}).
 
 	-behaviour(supervisor).
 
@@ -114,7 +116,7 @@ snippet supervisor
 	    {ok, {RestartStrategy, Children}}.
 # OTP gen_server
 snippet gen_server
-	-module(${0:`vim_snippets#Filename('', 'my')`}).
+	-module(${0:`vim_snippets#Filename()`}).
 
 	-behaviour(gen_server).
 
@@ -170,7 +172,7 @@ snippet gen_server
 	%%%===================================================================
 # OTP gen_fsm
 snippet gen_fsm
-	-module(${0:`vim_snippets#Filename('', 'my')`}).
+	-module(${0:`vim_snippets#Filename()`}).
 
 	-behaviour(gen_fsm).
 
@@ -348,7 +350,7 @@ snippet gen_fsm
 	%%%===================================================================
 # OTP gen_event
 snippet gen_event
-	-module(${0:`vim_snippets#Filename('', 'my')`}).
+	-module(${0:`vim_snippets#Filename()`}).
 
 	-behaviour(gen_event).
 
@@ -484,7 +486,7 @@ snippet gen_event
 	%%%===================================================================
 # EUnit snippets
 snippet eunit
-	-module(${1:`vim_snippets#Filename('', 'my')`}).
+	-module(${1:`vim_snippets#Filename()`}).
 	-include_lib("eunit/include/eunit.hrl").
 
 	${0}
@@ -515,7 +517,7 @@ snippet asexc
 	?assertException(${1:Class}, ${2:Pattern}, ${0:Expression})
 # common_test test_SUITE
 snippet testsuite
-	-module(${0:`vim_snippets#Filename('', 'my')`}).
+	-module(${0:`vim_snippets#Filename()`}).
 
 	-include_lib("common_test/include/ct.hrl").
 

From 037be07864c39d1e64ee0dbae6c444aecf6247d0 Mon Sep 17 00:00:00 2001
From: Adriaan Zonnenberg <adriaanzon@users.noreply.github.com>
Date: Mon, 27 Mar 2017 00:06:12 +0200
Subject: [PATCH 0994/1587] Create vue.snippets (#890)

Adds a snippet file for single file Vue components,
consisting of html, javascript and css.

https://vuejs.org/v2/guide/single-file-components.html
---
 UltiSnips/vue.snippets | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 UltiSnips/vue.snippets

diff --git a/UltiSnips/vue.snippets b/UltiSnips/vue.snippets
new file mode 100644
index 000000000..4e09d0cc6
--- /dev/null
+++ b/UltiSnips/vue.snippets
@@ -0,0 +1 @@
+extends html, javascript, css

From ff8a33b9ab90e747973203c2de2cd26d11b2c9fe Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 5 Apr 2017 20:28:15 +0100
Subject: [PATCH 0995/1587] Add Idris snippets

---
 snippets/elm.snippets   |  3 ++-
 snippets/idris.snippets | 46 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 snippets/idris.snippets

diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index 7898d5f36..7a4e3ef51 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -34,7 +34,8 @@ snippet -
 		${0}
 snippet let
 	let
-		${1} = ${2}
+		${1} =
+			${2}
 	in
 		${0}
 snippet if
diff --git a/snippets/idris.snippets b/snippets/idris.snippets
new file mode 100644
index 000000000..abbedb629
--- /dev/null
+++ b/snippets/idris.snippets
@@ -0,0 +1,46 @@
+snippet mod
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')`
+	${0}
+snippet imp
+	import ${0:List}
+snippet fn
+	${1:fn} : ${2:a} -> ${3:a}
+	$1 ${4} =
+		${0}
+snippet fn1
+	${1:fn} : ${2:a} -> ${3:a}
+	$1 ${4} =
+		${0}
+snippet fn2
+	${1:fn} : ${2:a} -> ${3:a} -> ${4:a}
+	$1 ${5} =
+		${0}
+snippet fn3
+	${1:fn} : ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
+	$1 ${6} =
+		${0}
+snippet fn0
+	${1:fn} : ${2:a}
+	$1 =
+		${0}
+snippet case
+	case ${1} of
+		${2} =>
+			${0}
+snippet let
+	let
+		${1} =
+			${2}
+	in
+		${0}
+snippet wh
+	where
+		${0}
+snippet if
+	if ${1} then
+		${2:${VISUAL}}
+	else
+		${0}
+	${0}
+snippet \ "Lambda function (\x => ...)"
+	(\\${1:_} => ${0})

From c569477189f02ded61a3fc3c3f43abcc1ebcdaa4 Mon Sep 17 00:00:00 2001
From: Jordan Lord <jordanpaullord@hotmail.co.uk>
Date: Thu, 6 Apr 2017 15:23:24 +0100
Subject: [PATCH 0996/1587] Update C# snippets based off of MSDN style (#893)

---
 snippets/cs.snippets | 193 ++++++++++++++++++++++++++++---------------
 1 file changed, 127 insertions(+), 66 deletions(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index decf79af0..110c85f42 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -58,28 +58,34 @@
 #
 # Main
 snippet sim
-	${1:public }static int Main(string[] args) {
+	${1:public} static int Main(string[] args)
+	{
 		${0}
 		return 0;
 	}
 snippet simc
-	public class Application {
-		${1:public }static int Main(string[] args) {
+	public class Application
+	{
+		${1:public} static int Main(string[] args)
+		{
 			${0}
 			return 0;
 		}
 	}
 snippet svm
-	${1:public }static void Main(string[] args) {
+	${1:public} static void Main(string[] args)
+	{
 		${0}
 	}
 # if condition
 snippet if
-	if (${1:true}) {
+	if (${1:true})
+	{
 		${0:${VISUAL}}
 	}
 snippet el
-	else {
+	else
+	{
 		${0:${VISUAL}}
 	}
 snippet ifs
@@ -92,81 +98,99 @@ snippet ?
 	${1} ? ${2} : ${0}
 # do while loop
 snippet do
-	do {
+	do
+	{
 		${0:${VISUAL}}
 	} while (${1:true});
 # while loop
 snippet wh
-	while (${1:true}) {
+	while (${1:true})
+	{
 		${0:${VISUAL}}
 	}
 # for loop
 snippet for
-	for (int ${1:i} = 0; $1 < ${2:count}; $1${3:++}) {
+	for (int ${1:i} = 0; $1 < ${2:count}; $1${3:++})
+	{
 		${0}
 	}
 snippet forr
-	for (int ${1:i} = ${2:length}; $1 >= 0; $1--) {
+	for (int ${1:i} = ${2:length}; $1 >= 0; $1--)
+	{
 		${0}
 	}
 # foreach
 snippet fore
-	foreach (${1:var} ${2:entry} in ${3}) {
+	foreach (${1:var} ${2:entry} in ${3})
+	{
 		${0}
 	}
 snippet foreach
-	foreach (${1:var} ${2:entry} in ${3}) {
+	foreach (${1:var} ${2:entry} in ${3})
+	{
 		${0}
 	}
 snippet each
-	foreach (${1:var} ${2:entry} in ${3}) {
+	foreach (${1:var} ${2:entry} in ${3})
+	{
 		${0}
 	}
 # interfaces
 snippet interface
-	public interface ${1:`vim_snippets#Filename()`} {
+	public interface ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 snippet if+
-	public interface ${1:`vim_snippets#Filename()`} {
+	public interface ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 # class bodies
 snippet class
-	public class ${1:`vim_snippets#Filename()`} {
+	public class ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 snippet cls
-	${2:public} class ${1:`vim_snippets#Filename()`} {
+	${2:public} class ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 snippet cls+
-	public class ${1:`vim_snippets#Filename()`} {
+	public class ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 snippet cls+^
-	public static class ${1:`vim_snippets#Filename()`} {
+	public static class ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 snippet cls&
-	internal class ${1:`vim_snippets#Filename()`} {
+	internal class ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 snippet cls&^
-	internal static class ${1:`vim_snippets#Filename()`} {
+	internal static class ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 snippet cls|
-	protected class ${1:`vim_snippets#Filename()`} {
+	protected class ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 snippet cls|%
-	protected abstract class ${1:`vim_snippets#Filename()`} {
+	protected abstract class ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 # constructor
 snippet ctor
-	public ${1:`vim_snippets#Filename()`}() {
+	public ${1:`vim_snippets#Filename()`}()
+	{
 		${0}
 	}
 # properties - auto properties by default.
@@ -266,101 +290,124 @@ snippet ps-
 	private string ${1} { get; set; }
 # members - void
 snippet m
-	${1:public} ${2:void} ${3}(${4}) {
+	${1:public} ${2:void} ${3}(${4})
+	{
 		${0}
 	}
 snippet m+
-	public ${1:void} ${2}(${3}) {
+	public ${1:void} ${2}(${3})
+	{
 		${0}
 	}
 snippet m&
-	internal ${1:void} ${2}(${3}) {
+	internal ${1:void} ${2}(${3})
+	{
 		${0}
 	}
 snippet m|
-	protected ${1:void} ${2}(${3}) {
+	protected ${1:void} ${2}(${3})
+	{
 		${0}
 	}
 snippet m-
-	private ${1:void} ${2}(${3}) {
+	private ${1:void} ${2}(${3})
+	{
 		${0}
 	}
 # members - int
 snippet mi
-	${1:public} int ${2}(${3}) {
+	${1:public} int ${2}(${3})
+	{
 		${0:return 0;}
 	}
 snippet mi+
-	public int ${1}(${2}) {
+	public int ${1}(${2})
+	{
 		${0:return 0;}
 	}
 snippet mi&
-	internal int ${1}(${2}) {
+	internal int ${1}(${2})
+	{
 		${0:return 0;}
 	}
 snippet mi|
-	protected int ${1}(${2}) {
+	protected int ${1}(${2})
+	{
 		${0:return 0;}
 	}
 snippet mi-
-	private int ${1}(${2}) {
+	private int ${1}(${2})
+	{
 		${0:return 0;}
 	}
 # members - bool
 snippet mb
-	${1:public} bool ${2}(${3}) {
+	${1:public} bool ${2}(${3})
+	{
 		${0:return false;}
 	}
 snippet mb+
-	public bool ${1}(${2}) {
+	public bool ${1}(${2})
+	{
 		${0:return false;}
 	}
 snippet mb&
-	internal bool ${1}(${2}) {
+	internal bool ${1}(${2})
+	{
 		${0:return false;}
 	}
 snippet mb|
-	protected bool ${1}(${2}) {
+	protected bool ${1}(${2})
+	{
 		${0:return false;}
 	}
 snippet mb-
-	private bool ${1}(${2}) {
+	private bool ${1}(${2})
+	{
 		${0:return false;}
 	}
 # members - string
 snippet ms
-	${1:public} string ${2}(${3}) {
+	${1:public} string ${2}(${3})
+	{
 		${0:return "";}
 	}
 snippet ms+
-	public string ${1}(${2}) {
+	public string ${1}(${2})
+	{
 		${0:return "";}
 	}
 snippet ms&
-	internal string ${1}(${2}) {
+	internal string ${1}(${2})
+	{
 		${0:return "";}
 	}
 snippet ms|
-	protected string ${1:}(${2:}) {
+	protected string ${1:}(${2:})
+	{
 		${0:return "";}
 	}
 snippet ms-
-	private string ${1}(${2}) {
+	private string ${1}(${2})
+	{
 		${0:return "";}
 	}
 # structure
 snippet struct
-	public struct ${1:`vim_snippets#Filename()`} {
+	public struct ${1:`vim_snippets#Filename()`}
+	{
 		${0}
 	}
 # enumeration
 snippet enum
-	enum ${1} {
+	enum ${1}
+	{
 		${0}
 	}
 
 snippet enum+
-	public enum ${1} {
+	public enum ${1}
+	{
 		${0}
 	}
 # preprocessor directives
@@ -391,8 +438,10 @@ snippet cw
 
 # equals override
 snippet eq
-	public override bool Equals(object obj) {
-		if (obj == null || GetType() != obj.GetType()) {
+	public override bool Equals(object obj)
+	{
+		if (obj == null || GetType() != obj.GetType())
+		{
 			return false;
 		}
 		${0:throw new NotImplementedException();}
@@ -400,7 +449,8 @@ snippet eq
 	}
 # exception
 snippet exc
-	public class ${1:MyException} : ${2:Exception} {
+	public class ${1:MyException} : ${2:Exception}
+	{
 		public $1() { }
 		public $1(string message) : base(message) { }
 		public $1(string message, Exception inner) : base(message, inner) { }
@@ -411,24 +461,28 @@ snippet exc
 	}
 # indexer
 snippet index
-	public ${1:object} this[${2:int} index] {
+	public ${1:object} this[${2:int} index]
+	{
 		get { ${0} }
 		set { ${0} }
 	}
 # eventhandler
 snippet inv
 	EventHandler temp = ${1:MyEvent};
-	if (${2:temp} != null) {
+	if (${2:temp} != null)
+	{
 		$2();
 	}
 # lock
 snippet lock
-	lock (${1:this}) {
+	lock (${1:this})
+	{
 		${0}
 	}
 # namespace
 snippet namespace
-	namespace ${1:MyNamespace} {
+	namespace ${1:MyNamespace}
+	{
 		${0}
 	}
 # property
@@ -436,35 +490,42 @@ snippet prop
 	public ${1:int} ${2:MyProperty} { get; set; }
 snippet propf
 	private ${1:int} ${2:myVar};
-		public $1 ${3:MyProperty} {
-			get { return $2; }
-			set { $2 = value; }
-		}
+	public $1 ${3:MyProperty}
+	{
+		get { return $2; }
+		set { $2 = value; }
+	}
 snippet propg
 	public ${1:int} ${2:MyProperty} { get; private set; }
 # switch
 snippet switch
-	switch (${1:switch_on}) {
+	switch (${1:switch_on})
+	{
 		${0}
 		default:
 	}
 # try
 snippet try
-	try {
-			${0:${VISUAL}}
+	try
+	{
+		${0:${VISUAL}}
 	}
-	catch (${1:System.Exception}) {
-			throw;
+	catch (${1:System.Exception})
+	{
+		throw;
 	}
 snippet tryf
-	try {
+	try
+	{
 		${0:${VISUAL}}
 	}
-	finally {
+	finally
+	{
 		${1}
 	}
 # using
 snippet usi
-	using(${1:resource}) {
+	using (${1:resource})
+	{
 		${0}
 	}

From ba4815b6b5a8de3c6275853534e1c953672a5cfc Mon Sep 17 00:00:00 2001
From: Evan Wilde <etcwilde@uvic.ca>
Date: Mon, 13 Mar 2017 08:44:07 -0700
Subject: [PATCH 0997/1587] LaTeX: (sub)sec without numbers in Ultisnips

Adds un-numbered sections and subsections to the Ultisnips latex format.
The snipmate version uses capital letters and spaces in the label, which isn't good,
the Ultisnips version doesn't.
---
 UltiSnips/tex.snippets | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 9957b3f74..d7d353454 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -78,6 +78,14 @@ snippet sec "Section" b
 $0
 endsnippet
 
+snippet sec* "Section" b
+\section*{${1:section name}}
+\label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+${0}
+endsnippet
+
+
 snippet sub "Subsection" b
 \subsection{${1:subsection name}}
 \label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
@@ -85,6 +93,13 @@ snippet sub "Subsection" b
 $0
 endsnippet
 
+snippet sub* "Subsection" b
+\subsection*{${1:subsection name}}
+\label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+${0}
+endsnippet
+
 snippet ssub "Subsubsection" b
 \subsubsection{${1:subsubsection name}}
 \label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
@@ -92,6 +107,13 @@ snippet ssub "Subsubsection" b
 $0
 endsnippet
 
+snippet ssub* "Subsubsection" b
+\subsubsection*{${1:subsubsection name}}
+\label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+${0}
+endsnippet
+
 snippet par "Paragraph" b
 \paragraph{${1:paragraph name}}
 \label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}

From 64dae68d165f26337097aedfe99df0803161b5c7 Mon Sep 17 00:00:00 2001
From: Evan Wilde <etcwilde@uvic.ca>
Date: Mon, 13 Mar 2017 09:01:49 -0700
Subject: [PATCH 0998/1587] LaTeX: Make snippet naming consistent

The subsubsection naming between the UltiSnips and Snippets were different. Now they
are consistent.
---
 snippets/tex.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index c095b5a4e..ea7e24ff5 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -149,14 +149,14 @@ snippet sub* \subsection*
 	\\label{sub:${2:$1}}
 	${0}
 # Sub Sub Section
-snippet subs \subsubsection
-	\\subsubsection{${1:subsubsection name}}
-	\\label{ssub:${2:$1}}
+snippet ssub \subsubsection
+	\subsubsection{${1:subsubsection name}}
+	\label{ssub:${2:$1}}
 	${0}
 # Sub Sub Section without number
-snippet subs* \subsubsection*
-	\\subsubsection*{${1:subsubsection name}}
-	\\label{ssub:${2:$1}}
+snippet ssub* \subsubsection*
+	\subsubsection*{${1:subsubsection name}}
+	\label{ssub:${2:$1}}
 	${0}
 # Paragraph
 snippet par \paragraph

From 457362e414f4fe9dc52f2713343f78a998fa0ae0 Mon Sep 17 00:00:00 2001
From: Evan Wilde <etcwilde@uvic.ca>
Date: Sat, 8 Apr 2017 20:16:17 -0700
Subject: [PATCH 0999/1587] LaTeX: Remove square braces if options removed

Same behaviour as with class and id in html div tags.
---
 UltiSnips/tex.snippets | 2 +-
 snippets/tex.snippets  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index d7d353454..5a67abbc0 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -134,7 +134,7 @@ $0
 endsnippet
 
 snippet pac "Package" b
-\usepackage[${1:options}]{${2:package}}$0
+\usepackage`!p snip.rv='[' if t[1] else ""`${1:options}`!p snip.rv = ']' if t[1] else ""`{${2:package}}$0
 endsnippet
 
 snippet lp "Long parenthesis"
diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index ea7e24ff5..2808cf711 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -150,13 +150,13 @@ snippet sub* \subsection*
 	${0}
 # Sub Sub Section
 snippet ssub \subsubsection
-	\subsubsection{${1:subsubsection name}}
-	\label{ssub:${2:$1}}
+	\\subsubsection{${1:subsubsection name}}
+	\\label{ssub:${2:$1}}
 	${0}
 # Sub Sub Section without number
 snippet ssub* \subsubsection*
-	\subsubsection*{${1:subsubsection name}}
-	\label{ssub:${2:$1}}
+	\\subsubsection*{${1:subsubsection name}}
+	\\label{ssub:${2:$1}}
 	${0}
 # Paragraph
 snippet par \paragraph

From 1b183d063738a30a13113261273215b89e2842f2 Mon Sep 17 00:00:00 2001
From: "Viet (Drake) Tran" <phuocviet89@gmail.com>
Date: Sun, 9 Apr 2017 22:54:49 +0700
Subject: [PATCH 1000/1587] Update ruby.snippets

Fix placeholder index for ruby rspec snippets `iexp` and `iexpb`
---
 snippets/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 340391eba..3f909a0c8 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -703,9 +703,9 @@ snippet is
 snippet isn
 	it { should_not ${0} }
 snippet iexp
-	it { expect(${1:object}).${1} ${0} }
+	it { expect(${1:object}).${2} ${0} }
 snippet iexpb
-	it { expect { ${1:object} }.${1} ${0} }
+	it { expect { ${1:object} }.${2} ${0} }
 snippet iiexp
 	it { is_expected.to ${0} }
 snippet iiexpn

From 2e5f7adc40bc666bad7375357337149f7fe6e6f6 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 12 Apr 2017 22:20:39 +0100
Subject: [PATCH 1001/1587] Correct purescript mod snippet

---
 snippets/purescript.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/purescript.snippets b/snippets/purescript.snippets
index 06d6b34aa..757fa2f57 100644
--- a/snippets/purescript.snippets
+++ b/snippets/purescript.snippets
@@ -3,9 +3,9 @@ snippet mod
 		(
 		) where
 
-		import Prelude
+	import Prelude
 
-		${0}
+	${0}
 snippet imp
 	import ${0:Data.List}
 snippet impq

From 527f21a1903501811a515ae959dcd940d1da43f4 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 15 Apr 2017 09:38:38 +0100
Subject: [PATCH 1002/1587] Purescript if

---
 snippets/purescript.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/purescript.snippets b/snippets/purescript.snippets
index 757fa2f57..cdbcbd2ce 100644
--- a/snippets/purescript.snippets
+++ b/snippets/purescript.snippets
@@ -50,3 +50,8 @@ snippet testunit
 				Assert.equal
 					"Hello, world!"
 					"Hello, sailor!"
+snippet if
+	if ${1} then
+		${2:${VISUAL}}
+	else
+		${0}

From 2c2b6db1de138eb9b7270a89de3e29e74c44659f Mon Sep 17 00:00:00 2001
From: Craig Paterson <craig@widdershins.co.za>
Date: Thu, 9 Feb 2017 08:31:32 +0200
Subject: [PATCH 1003/1587] Add Elixir @spec snippet

Snippet that expands to Elixir type spec notation. I've had this in my
own snippets file for a while and use it regularly.
---
 snippets/elixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index ccc5fb730..f22f38612 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -63,6 +63,8 @@ snippet wie
 		${4} ->
 			${0}
 	end
+snippet spec
+	@spec ${1:name}(${2:args}) :: ${3:returns}
 snippet df
 	def ${1:name}, do: ${2}
 snippet def

From 10a426f1d5cc5153916876a8ca6988ad6f6fcee3 Mon Sep 17 00:00:00 2001
From: Craig Paterson <craig@widdershins.co.za>
Date: Tue, 18 Apr 2017 08:11:50 +0200
Subject: [PATCH 1004/1587] Shorten to `sp`

Also add snippets for `@opaque`, `@type` and `@typep`
---
 snippets/elixir.snippets | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index f22f38612..5af275b79 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -63,8 +63,16 @@ snippet wie
 		${4} ->
 			${0}
 	end
-snippet spec
+snippet sp
 	@spec ${1:name}(${2:args}) :: ${3:returns}
+snippet op
+	@opaque ${1:type_name} :: ${2:type}
+snippet ty
+	@type ${1:type_name} :: ${2:type}
+snippet typ
+	@typep ${1:type_name} :: ${2:type}
+snippet cb
+	@callback ${1:name}(${2:args}) :: ${3:returns}
 snippet df
 	def ${1:name}, do: ${2}
 snippet def

From 2341950f964e67e07e02213757e9f8c66f62c4cf Mon Sep 17 00:00:00 2001
From: Jacques Kvam <jwkvam@gmail.com>
Date: Tue, 18 Apr 2017 11:26:37 -0700
Subject: [PATCH 1005/1587] add wdb snippet

---
 snippets/python.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index b32ef0a89..faa716eb7 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -150,6 +150,10 @@ snippet pdbbb
 snippet rpdb
 	import rpdb
 	rpdb.set_trace()
+# web python debugger (wdb)
+snippet wdb
+	import wdb
+	wdb.set_trace()
 # ptpython
 snippet ptpython
 	from ptpython.repl import embed

From 7b02b74edf5de3d4864b7601fbd83ccc2671d0ba Mon Sep 17 00:00:00 2001
From: Fabian Nick <fp.nick@gmail.com>
Date: Wed, 19 Apr 2017 13:52:33 +0200
Subject: [PATCH 1006/1587] Fortran snippet for printing variable name and
 value. (#899)

* Empty comment line after brief docu of subroutine

* Snippet for Doxygen parameter tag.

* No new line after Doxygen @param.

* Fortran snippet for printing variable name and valueC

* Comma was missing
---
 snippets/fortran.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
index e61d3fb5a..e04d4fda0 100644
--- a/snippets/fortran.snippets
+++ b/snippets/fortran.snippets
@@ -91,6 +91,8 @@ snippet func
 	end function $1
 snippet pr
 	write(*,*) $0
+snippet dpr
+	write(*,*) '$1 = ', $1
 snippet read
 	read(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0
 snippet write

From 57aeff8ebbc1fff95773f27998782b8a0bf3cacf Mon Sep 17 00:00:00 2001
From: Mikael Muszynski <linduxed@gmail.com>
Date: Sun, 23 Apr 2017 14:12:27 +0200
Subject: [PATCH 1007/1587] Remove trailing newline in --- markdown snippet

This trailing newline is not present in the === snippet, which is an
almost exact copy of the === snippet. While one could add a trailing
newline to the === snippet instead, the user might not need a newline
after the snippet, so remove it.
---
 snippets/markdown.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index d258aa8b5..8aac907b3 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -81,7 +81,6 @@ snippet ---
 	`repeat('-', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
 
 	${0}
-
 snippet blockquote
 	{% blockquote %}
 	${0:quote}

From c0308754b7300c9d245358d95e770742b0f4ec14 Mon Sep 17 00:00:00 2001
From: Mikael Muszynski <linduxed@gmail.com>
Date: Sun, 23 Apr 2017 14:30:23 +0200
Subject: [PATCH 1008/1587] Make ---/=== markdown snippets find headline
 contents

As of version 5352d98f of UltiSnips (not tested with the other snippet
engines), when executing these two snippets the cursor is placed at the
line where `${0}` is located, meaning that when `line('.')` is
evaluated, the line returned is not (as the snippets currently expect)
the line where the `---` or `===` was present, but two lines further
down.

It appears that the order of evaluation is such that first the parts of
the snippet that require no interpolation get written out, then the
inlined code gets executed. As explained above, this leads to
`line('.')` returning the line number of an empty line.

The subtraction statements currently expect to have '.' return the line
where the `---` or `===` is locted. Ensure that this is the case.
---
 snippets/markdown.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index 8aac907b3..3f2956e68 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -72,13 +72,13 @@ snippet **
 snippet __
 	__${1:bold}__
 snippet ===
-	`repeat('=', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
+	`repeat('=', strlen(getline(line(".") - 3)) - strlen(getline(line('.') - 2)))`
 
 	${0}
 snippet -
 	-   ${0}
 snippet ---
-	`repeat('-', strlen(getline(line(".") - 1)) - strlen(getline('.')))`
+	`repeat('-', strlen(getline(line(".") - 3)) - strlen(getline(line('.') - 2)))`
 
 	${0}
 snippet blockquote

From cf7651140ec37033399a87e7225b1545181cdd58 Mon Sep 17 00:00:00 2001
From: Mikael Muszynski <linduxed@gmail.com>
Date: Sun, 23 Apr 2017 14:41:26 +0200
Subject: [PATCH 1009/1587] Remove redundant subtraction inside snippet

It seems like the first thing the current version of UltiSnips
(5352d98f) does is delete the snippet abbreviation (`---` or `===`) and
only thereafter it evaluates the snippet contents.

The purpose of `- strlen(getline(line('.') - 2))` was likely to ensure
that however long the headline was it should add three less `-`/`=` than
that, because there are already three present.

With the current version of UltiSnips, that line is empty: the `---` are
not there, making the entire subtraction redundant.
---
 snippets/markdown.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index 3f2956e68..f8e65bada 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -72,13 +72,13 @@ snippet **
 snippet __
 	__${1:bold}__
 snippet ===
-	`repeat('=', strlen(getline(line(".") - 3)) - strlen(getline(line('.') - 2)))`
+	`repeat('=', strlen(getline(line(".") - 3)))`
 
 	${0}
 snippet -
 	-   ${0}
 snippet ---
-	`repeat('-', strlen(getline(line(".") - 3)) - strlen(getline(line('.') - 2)))`
+	`repeat('-', strlen(getline(line(".") - 3)))`
 
 	${0}
 snippet blockquote

From 01216e82ef1343addd722033bb307718e624610c Mon Sep 17 00:00:00 2001
From: Mikael Muszynski <linduxed@gmail.com>
Date: Sun, 23 Apr 2017 14:42:27 +0200
Subject: [PATCH 1010/1587] Use only single-quotes for uniformity

---
 snippets/markdown.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index f8e65bada..f8000b445 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -72,13 +72,13 @@ snippet **
 snippet __
 	__${1:bold}__
 snippet ===
-	`repeat('=', strlen(getline(line(".") - 3)))`
+	`repeat('=', strlen(getline(line('.') - 3)))`
 
 	${0}
 snippet -
 	-   ${0}
 snippet ---
-	`repeat('-', strlen(getline(line(".") - 3)))`
+	`repeat('-', strlen(getline(line('.') - 3)))`
 
 	${0}
 snippet blockquote

From df26062a37500390c53f3efa7462384a86695e89 Mon Sep 17 00:00:00 2001
From: Chet Gurevitch <chetgurevitch@users.noreply.github.com>
Date: Mon, 24 Apr 2017 02:36:39 -0700
Subject: [PATCH 1011/1587] Rust: cleanup and duplicate removal (#903)

---
 UltiSnips/rust.snippets | 72 -----------------------------------------
 snippets/rust.snippets  |  7 ++++
 2 files changed, 7 insertions(+), 72 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 482f78e46..24af1b37a 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -4,25 +4,6 @@
 
 priority -50
 
-snippet let "let variable declaration" b
-let ${1:name}${2:: ${3:type}} = $4;
-endsnippet
-
-snippet letm "let mut variable declaration" b
-let mut ${1:name}${2:: ${3:type}} = $4;
-endsnippet
-
-snippet fn "A function, optionally with arguments and return type."
-fn ${1:function_name}($2)${3/..*/ -> /}$3 {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet pfn "A public function, optionally with arguments and return type."
-pub fn ${1:function_name}($2)${3/..*/ -> /}$3 {
-	${VISUAL}$0
-}
-endsnippet
 
 snippet arg "Function Arguments" i
 ${1:a}: ${2:T}${3:, arg}
@@ -38,18 +19,6 @@ ${1:move }|$2| {
 }
 endsnippet
 
-snippet pri "print!(..)" b
-print!("$1"${2/..*/, /}$2);
-endsnippet
-
-snippet pln "println!(..)" b
-println!("$1"${2/..*/, /}$2);
-endsnippet
-
-snippet fmt "format!(..)"
-format!("$1"${2/..*/, /}$2);
-endsnippet
-
 snippet macro "macro_rules!" b
 macro_rules! ${1:name} {
 	(${2:matcher}) => (
@@ -58,49 +27,8 @@ macro_rules! ${1:name} {
 }
 endsnippet
 
-snippet mod "A module" b
-mod ${1:`!p snip.rv = snip.basename.lower() or "name"`} {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet for "for .. in .." b
-for ${1:i} in $2 {
-	${VISUAL}$0
-}
-endsnippet
-
-snippet todo "A Todo comment"
-// [TODO]: ${1:Description} - `!v strftime("%Y-%m-%d %I:%M%P")`
-endsnippet
-
-snippet st "Struct" b
-struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
-	${VISUAL}$0
-}
-endsnippet
-
-# TODO: fancy dynamic field mirroring like Python slotclass
-snippet stn "Struct with new constructor." b
-pub struct ${1:`!p snip.rv = snip.basename.title() or "Name"`} {
-	fd$0
-}
-
-impl $1 {
-	pub fn new($2) -> $1 {
-		$1 { $3 }
-	}
-}
-endsnippet
-
 snippet fd "Struct field definition" w
 ${1:name}: ${2:Type},
 endsnippet
 
-snippet impl "Struct/Trait implementation" b
-impl ${1:Type/Trait}${2: for ${3:Type}} {
-	$0
-}
-endsnippet
-
 # vim:ft=snippets:
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 25effe6e6..51f10055f 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -39,10 +39,17 @@ snippet letm "let mut variable declaration with type inference"
 	let mut ${1}  = ${2};
 snippet lettm "let mut variable declaration with explicit type annotation"
 	let mut ${1}: ${2}  = ${3};
+snippet pri "print!"
+	print!("${1}");
+snippet pri, "print! with format param"
+	print!("${1}", ${2});
 snippet pln "println!"
 	println!("${1}");
 snippet pln, "println! with format param"
 	println!("${1}", ${2});
+snippet fmt "format!"
+	format!("${1}", ${2});
+
 # Modules
 snippet ec "extern crate"
 	extern crate ${1:sync};

From 1ee5a35897b71c02ac1dfb2ead85dbb89affa3b7 Mon Sep 17 00:00:00 2001
From: Craig <craig@widdershins.co.za>
Date: Sun, 30 Apr 2017 23:11:46 +0200
Subject: [PATCH 1012/1587] Pipe snippets (#906)

Some pipe snippets that I often find useful when working with pipe
chains.
---
 snippets/elixir.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 5af275b79..5e2b208fc 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -167,3 +167,15 @@ snippet qu
 snippet beh
 	@behaviour ${1:Mix.Task}
 	${0}
+snippet >e pipe to each
+	|> Enum.each(fn ${1} -> ${0} end)
+snippet >m pipe to map
+	|> Enum.map(fn ${1} -> ${0} end)
+snippet >f pipe to filter
+	|> Enum.filter(fn ${1} -> ${0} end)
+snippet >r pipe to reduce
+	|> Enum.reduce(${1:acc}, fn ${2}, ${3:acc} -> ${0} end)
+snippet >i pipe to inspect
+	|> IO.inspect
+snippet >il pipe to inspect with label
+	|> IO.inspect(label: "${1:label}")

From 85abc616481cbbcc7eb6f898af549e4341585e6b Mon Sep 17 00:00:00 2001
From: Craig <craig@widdershins.co.za>
Date: Sun, 30 Apr 2017 23:12:54 +0200
Subject: [PATCH 1013/1587] IO.puts and IO.inspect (#905)

I've been using these personally for some time and find them useful and
efficient on a day-to-day basis.
---
 snippets/elixir.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 5e2b208fc..de011dc1e 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -2,6 +2,12 @@ snippet do
 	do
 		${0:${VISUAL}}
 	end
+snippet put IO.puts
+	IO.puts "${0}"
+snippet ins IO.inspect
+	IO.inspect ${0}
+snippet insl IO.inspect with label
+	IO.inspect(${0}label: "${1:label}")
 snippet if if .. do .. end
 	if ${1} do
 		${0:${VISUAL}}

From c6cd30f836e0a2c19a867fc4fe0dabf6337a0b08 Mon Sep 17 00:00:00 2001
From: Craig <craig@widdershins.co.za>
Date: Sun, 30 Apr 2017 23:13:10 +0200
Subject: [PATCH 1014/1587] Elixir inline for (#904)

An inline `for` triggered with `for:` in the spirit of `ife` and `ife:`.
---
 snippets/elixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index de011dc1e..45ac291c5 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -50,6 +50,8 @@ snippet for
 	for ${1:item} <- ${2:items} do
 		${0}
 	end
+snippet for:
+	for ${1:item} <- ${2:items}, do: ${0}
 snippet fori
 	for ${1:item} <- ${2:items}, into: ${3} do
 		${0}

From 620bfaddbf7807e1c7fec1a9cc8ffa2c7fb0d4b3 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 30 Apr 2017 22:16:32 +0100
Subject: [PATCH 1015/1587] Elixir: Use more idiomatic `with` syntax

---
 snippets/elixir.snippets | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 45ac291c5..963470e9d 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -57,9 +57,7 @@ snippet fori
 		${0}
 	end
 snippet wi
-	with(
-		${1:item} <- ${2:items}
-	) do
+	with ${1:item} <- ${2:items} do
 		${0}
 	end
 snippet wie

From 3bdc99ccf202c61a9fba1eca568fe1838cf5ec69 Mon Sep 17 00:00:00 2001
From: heiderich <florian@heiderich.org>
Date: Fri, 5 May 2017 11:21:12 +0200
Subject: [PATCH 1016/1587] add snippet for abstract environment (#907)

---
 UltiSnips/tex.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 5a67abbc0..b72ed3eaa 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -8,6 +8,12 @@ snippet "b(egin)?" "begin{} / end{}" br
 \end{$1}
 endsnippet
 
+snippet abs "abstract environment" b
+\begin{abstract}
+	$0
+\end{abstract}
+endsnippet
+
 snippet tab "tabular / array environment" b
 \begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
 $0${2/(?<=.)(c|l|r)|./(?1: & )/g}

From f379c4d369a454d03d2951a5a029485010d699bc Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 5 May 2017 12:52:20 +0100
Subject: [PATCH 1017/1587] Safe shell snippets

---
 snippets/sh.snippets | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 12f8115ac..35afa3019 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -1,7 +1,14 @@
 # Shebang. Executing bash via /usr/bin/env makes scripts more portable.
 snippet #!
 	#!/usr/bin/env sh
-	
+
+snippet s#!
+	#!/usr/bin/env sh
+	set -euo pipefail
+
+snippet safe
+	set -euo pipefail
+
 snippet bash
 	#!/usr/bin/env bash
 

From 5ab99e148c79c6d61a8b9edde2bce9f525adbee0 Mon Sep 17 00:00:00 2001
From: gaara <sabakugaara@users.noreply.github.com>
Date: Sun, 7 May 2017 00:18:48 +0800
Subject: [PATCH 1018/1587] add vue.snippets for snipmate (#909)

this snippets is same as UltiSnips
---
 snippets/vue.snippets | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 snippets/vue.snippets

diff --git a/snippets/vue.snippets b/snippets/vue.snippets
new file mode 100644
index 000000000..4e09d0cc6
--- /dev/null
+++ b/snippets/vue.snippets
@@ -0,0 +1 @@
+extends html, javascript, css

From f6468a7dbeddd67535b03912eb5c1faafe33fe79 Mon Sep 17 00:00:00 2001
From: Alvin Chan <chaucerbao@users.noreply.github.com>
Date: Sat, 6 May 2017 09:19:10 -0700
Subject: [PATCH 1019/1587] Make TypeScript extend JavaScript for VimL snippets
 (#908)

---
 snippets/typescript.snippets | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 snippets/typescript.snippets

diff --git a/snippets/typescript.snippets b/snippets/typescript.snippets
new file mode 100644
index 000000000..aa87242fb
--- /dev/null
+++ b/snippets/typescript.snippets
@@ -0,0 +1 @@
+extends javascript

From 764fb92038084056b0db600cbb4c07bbe77ba20e Mon Sep 17 00:00:00 2001
From: zandrmartin <zandrmartin@users.noreply.github.com>
Date: Sun, 14 May 2017 12:18:53 -0400
Subject: [PATCH 1020/1587] correct typo and remove extra empty line in BSD2

---
 snippets/_.snippets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/snippets/_.snippets b/snippets/_.snippets
index ad0235f1b..d93eb8708 100644
--- a/snippets/_.snippets
+++ b/snippets/_.snippets
@@ -133,10 +133,9 @@ snippet BSD2
 	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 	The views and conclusions contained in the software and documentation
 	are those of the authors and should not be interpreted as representing
-	official policies, either expressedor implied, of $2.
+	official policies, either expressed or implied, of $2.
 	${0}
 snippet BSD3
 	${1:one line to give the program's name and a brief description}

From 3b683eecc3622fa2632471fc7a56b679ccec3a29 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Thu, 18 May 2017 21:59:34 +0200
Subject: [PATCH 1021/1587] Add blade snippets

---
 UltiSnips/blade.snippets | 135 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 UltiSnips/blade.snippets

diff --git a/UltiSnips/blade.snippets b/UltiSnips/blade.snippets
new file mode 100644
index 000000000..e56610c20
--- /dev/null
+++ b/UltiSnips/blade.snippets
@@ -0,0 +1,135 @@
+priority -50
+
+extends html
+
+# We want to overwrite everything in parent ft.
+priority -49
+
+snippet break "@break"
+@break
+endsnippet
+
+snippet component "@component directive"
+@component('$1')
+	${2:${VISUAL}}
+@endcomponent
+endsnippet
+
+snippet each "@each directive"
+@each('$1', $$2, '$3')
+endsnippet
+
+snippet else "@else directive"
+@else
+endsnippet
+
+snippet eif "@else if directive"
+@else if ($1)
+	${2:${VISUAL}}
+endsnippet
+
+snippet for "@for directive"
+@for ($1)
+	${2:${VISUAL}}
+@endfor
+endsnippet
+
+snippet foreach "@foreach directive"
+@foreach ($$1 as $$2)
+	${3:${VISUAL}}
+@endforeach
+endsnippet
+
+snippet extends "@extends directive"
+@extends('$1')
+endsnippet
+
+snippet if "@if directive"
+@if ($1)
+	${2:${VISUAL}}
+@endif
+endsnippet
+
+snippet ife "@if @else structure"
+@if ($1)
+	${2:${VISUAL}}
+@else
+	${3:${VISUAL}}
+@endif
+endsnippet
+
+snippet include "@include directive"
+@include('$1')
+endsnippet
+
+snippet includeIf "@includeIf directive"
+@includeIf('$1')
+endsnippet
+
+snippet isset "@isset directive"
+@isset
+	${1:${VISUAL}}
+@endisset
+endsnippet
+
+snippet inject "@inject directive"
+@inject('$1', '$2')
+endsnippet
+
+snippet php "@php directive"
+@php
+	${1:${VISUAL}}
+@endphp
+endsnippet
+
+snippet push "@push directive"
+@push('$1')
+	${2:${VISUAL}}
+@endpush
+endsnippet
+
+snippet section "@section directive"
+@section('$1')
+endsnippet
+
+snippet show "@show directive"
+@show
+endsnippet
+
+snippet slot "@slot directive"
+@slot('$1')
+	${2:${VISUAL}}
+@endslot
+endsnippet
+
+snippet unless "@unless directive"
+@unless
+	${1:${VISUAL}}
+@endunless
+endsnippet
+
+snippet verbatim "@verbatim directive"
+@verbatim
+	${0:$VISUAL}
+@endverbatim
+endsnippet
+
+snippet wh "@while directive"
+@while ($1)
+	${2:${VISUAL}}
+@endwhile
+endsnippet
+
+snippet yield "@yield directive"
+@yield('$1')
+endsnippet
+
+snippet { "{{ }} statement."
+{{ $1 }}
+endsnippet
+
+snippet {! "{!! !!} statement"
+{!! $1 !!}
+endsnippet
+
+# vim:ft=snippets:

From f07a30d1a165f7afc5d011b977e4120daf66297e Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Fri, 19 May 2017 12:04:25 +0200
Subject: [PATCH 1022/1587] Order HTML UltiSnips alphabetically

It is easier to know where things are now
---
 UltiSnips/html.snippets | 142 ++++++++++++++++++++--------------------
 1 file changed, 70 insertions(+), 72 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 6d98cb1c2..dafc9738d 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -32,16 +32,8 @@ snippet escape "Escape (escape)"
 &#x238B;
 endsnippet
 
-snippet shift "Shift (shift)"
-&#x21E7;
-endsnippet
-
-snippet tab "Tab (tab)"
-&#x21E5;
-endsnippet
-
-snippet up "Up (up)"
-&#x2191;
+snippet left "Left (left)"
+&#x2190;
 endsnippet
 
 snippet return "Return (return)"
@@ -52,39 +44,23 @@ snippet right "Right (right)"
 &#x2192;
 endsnippet
 
-snippet left "Left (left)"
-&#x2190;
-endsnippet
-
-#############
-# HTML TAGS #
-#############
-snippet input "Input with Label" w
-<label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}">$1</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="$5"${6: id="${7:$2}"}`!p x(snip)`>
-endsnippet
-
-snippet input "HTML   <input>" w
-<input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}`!p x(snip)`>
-endsnippet
-
-
-snippet option "Option" w
-<option${1: value="${2:option}"}>${3:$2}</option>
+snippet shift "Shift (shift)"
+&#x21E7;
 endsnippet
 
-snippet select "Select Box" w
-<select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: onchange="${6:}"}${7: size="${8:1}"}}>
-	${0:${VISUAL}}
-</select>
+snippet tab "Tab (tab)"
+&#x21E5;
 endsnippet
 
-
-snippet textarea "HTML   <textarea>" w
-<textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">$0</textarea>
+snippet up "Up (up)"
+&#x2191;
 endsnippet
 
-snippet mailto "HTML <a mailto: >" w
-<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
+#############
+# HTML TAGS #
+#############
+snippet a "Link" w
+<a href="${1:http://www.${2:url.com}}"${3: target="_blank"}>${4:Anchor Text}</a>
 endsnippet
 
 snippet base "HTML <base>" w
@@ -103,16 +79,23 @@ snippet div "<div>" w
 </div>
 endsnippet
 
+snippet div# "<div> with ID & class" w
+<div`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`>
+	${0:${VISUAL}}
+</div>
+endsnippet
+
 snippet div. "<div> with class" w
 <div`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`>
 	${0:${VISUAL}}
 </div>
 endsnippet
 
-snippet div# "<div> with ID & class" w
-<div`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`>
+snippet fieldset "Fieldset" w
+<fieldset id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}" ${2:class="${3:}"}>
+	<legend>$1</legend>
 	${0:${VISUAL}}
-</div>
+</fieldset>
 endsnippet
 
 snippet form "XHTML <form>" w
@@ -155,16 +138,42 @@ snippet head "XHTML <head>"
 </head>
 endsnippet
 
+snippet input "Input with Label" w
+<label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}">$1</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="$5"${6: id="${7:$2}"}`!p x(snip)`>
+endsnippet
+
+snippet input "HTML   <input>" w
+<input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}`!p x(snip)`>
+endsnippet
+
+snippet li "list item" w
+<li>${0:${VISUAL}}</li>
+endsnippet
+
 snippet link "XHTML <link>" w
 <link rel="${1:stylesheet}" href="${2:/css/master.css}" type="text/css" media="${3:screen}" title="${4:no title}" charset="${5:utf-8}"`!p x(snip)`>
 endsnippet
 
+snippet mailto "HTML <a mailto: >" w
+<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
+endsnippet
+
 snippet meta "XHTML <meta>" w
 <meta name="${1:name}" content="${2:content}"`!p x(snip)`>
 endsnippet
 
-snippet scriptsrc "HTML <script src...>" w
-<script src="$1" charset="${3:utf-8}"></script>
+snippet option "Option" w
+<option${1: value="${2:option}"}>${3:$2}</option>
+endsnippet
+
+snippet p "paragraph" w
+<p>${0:${VISUAL}}</p>
+endsnippet
+
+snippet select "Select Box" w
+<select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: onchange="${6:}"}${7: size="${8:1}"}}>
+	${0:${VISUAL}}
+</select>
 endsnippet
 
 snippet script "HTML <script>" w
@@ -173,18 +182,22 @@ snippet script "HTML <script>" w
 </script>
 endsnippet
 
-snippet span "<span>" w
-<span> ${0:${VISUAL}} </span>
+snippet scriptsrc "HTML <script src...>" w
+<script src="$1" charset="${3:utf-8}"></script>
 endsnippet
 
-snippet span. "<span> with class" w
-<span`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`> ${0:${VISUAL}} </span>
+snippet span "<span>" w
+<span> ${0:${VISUAL}} </span>
 endsnippet
 
 snippet span# "<span> with ID & class" w
 <span`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`> ${0:${VISUAL}} </span>
 endsnippet
 
+snippet span. "<span> with class" w
+<span`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`> ${0:${VISUAL}} </span>
+endsnippet
+
 snippet style "XHTML <style>" w
 <style type="text/css" media="screen">
 	${0:${VISUAL}}
@@ -197,45 +210,30 @@ snippet table "XHTML <table>" w
 </table>
 endsnippet
 
-snippet a "Link" w
-<a href="${1:http://www.${2:url.com}}"${3: target="_blank"}>${4:Anchor Text}</a>
-endsnippet
-
-snippet p "paragraph" w
-<p>${0:${VISUAL}}</p>
-endsnippet
-
-snippet li "list item" w
-<li>${0:${VISUAL}}</li>
-endsnippet
-
-snippet ul "unordered list" w
-<ul>
-	${0:${VISUAL}}
-</ul>
-endsnippet
-
 snippet td "table cell" w
 <td>${0:${VISUAL}}</td>
 endsnippet
 
-snippet th "table header" w
-<th>${0:${VISUAL}}</th>
+snippet textarea "HTML   <textarea>" w
+<textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">$0</textarea>
 endsnippet
 
-snippet tr "table row" w
-<tr>${0:${VISUAL}}</tr>
+snippet th "table header" w
+<th>${0:${VISUAL}}</th>
 endsnippet
 
 snippet title "XHTML <title>" w
 <title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
 endsnippet
 
-snippet fieldset "Fieldset" w
-<fieldset id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}" ${2:class="${3:}"}>
-	<legend>$1</legend>
+snippet tr "table row" w
+<tr>${0:${VISUAL}}</tr>
+endsnippet
+
+snippet ul "unordered list" w
+<ul>
 	${0:${VISUAL}}
-</fieldset>
+</ul>
 endsnippet
 
 snippet viewport "Responsive viewport meta" w

From 8b0ce52bde9f3668a78e8c221a8c790b4620e091 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Fri, 19 May 2017 12:06:49 +0200
Subject: [PATCH 1023/1587] HTML UltiSnips: comments say HTML instead of XHTML

---
 UltiSnips/html.snippets | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index dafc9738d..9fd082441 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -98,7 +98,7 @@ snippet fieldset "Fieldset" w
 </fieldset>
 endsnippet
 
-snippet form "XHTML <form>" w
+snippet form "HTML <form>" w
 <form action="${1:`!p
 snip.rv = (snip.basename or 'unnamed') + '_submit'
 `}" method="${2:get}" accept-charset="utf-8">
@@ -106,31 +106,31 @@ snip.rv = (snip.basename or 'unnamed') + '_submit'
 </form>
 endsnippet
 
-snippet h1 "XHTML <h1>" w
+snippet h1 "HTML <h1>" w
 <h1>${0:${VISUAL}}</h1>
 endsnippet
 
-snippet h2 "XHTML <h2>" w
+snippet h2 "HTML <h2>" w
 <h2>${0:${VISUAL}}</h2>
 endsnippet
 
-snippet h3 "XHTML <h3>" w
+snippet h3 "HTML <h3>" w
 <h3>${0:${VISUAL}}</h3>
 endsnippet
 
-snippet h4 "XHTML <h4>" w
+snippet h4 "HTML <h4>" w
 <h4>${0:${VISUAL}}</h4>
 endsnippet
 
-snippet h5 "XHTML <h5>" w
+snippet h5 "HTML <h5>" w
 <h5>${0:${VISUAL}}</h5>
 endsnippet
 
-snippet h6 "XHTML <h6>" w
+snippet h6 "HTML <h6>" w
 <h6>${0:${VISUAL}}</h6>
 endsnippet
 
-snippet head "XHTML <head>"
+snippet head "HTML <head>"
 <head>
 	<meta charset="utf-8">
 	<title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
@@ -142,7 +142,7 @@ snippet input "Input with Label" w
 <label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}">$1</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="$5"${6: id="${7:$2}"}`!p x(snip)`>
 endsnippet
 
-snippet input "HTML   <input>" w
+snippet input "HTML <input>" w
 <input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}`!p x(snip)`>
 endsnippet
 
@@ -150,7 +150,7 @@ snippet li "list item" w
 <li>${0:${VISUAL}}</li>
 endsnippet
 
-snippet link "XHTML <link>" w
+snippet link "HTML <link>" w
 <link rel="${1:stylesheet}" href="${2:/css/master.css}" type="text/css" media="${3:screen}" title="${4:no title}" charset="${5:utf-8}"`!p x(snip)`>
 endsnippet
 
@@ -158,7 +158,7 @@ snippet mailto "HTML <a mailto: >" w
 <a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
 endsnippet
 
-snippet meta "XHTML <meta>" w
+snippet meta "HTML <meta>" w
 <meta name="${1:name}" content="${2:content}"`!p x(snip)`>
 endsnippet
 
@@ -198,13 +198,13 @@ snippet span. "<span> with class" w
 <span`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`> ${0:${VISUAL}} </span>
 endsnippet
 
-snippet style "XHTML <style>" w
+snippet style "HTML <style>" w
 <style type="text/css" media="screen">
 	${0:${VISUAL}}
 </style>
 endsnippet
 
-snippet table "XHTML <table>" w
+snippet table "HTML <table>" w
 <table>
 	${0:${VISUAL}}
 </table>
@@ -214,7 +214,7 @@ snippet td "table cell" w
 <td>${0:${VISUAL}}</td>
 endsnippet
 
-snippet textarea "HTML   <textarea>" w
+snippet textarea "HTML <textarea>" w
 <textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">$0</textarea>
 endsnippet
 
@@ -222,7 +222,7 @@ snippet th "table header" w
 <th>${0:${VISUAL}}</th>
 endsnippet
 
-snippet title "XHTML <title>" w
+snippet title "HTML <title>" w
 <title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
 endsnippet
 

From 3cb0d29cf55d3d93e0a330819770b4f60e66e39f Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Fri, 19 May 2017 16:37:19 +0200
Subject: [PATCH 1024/1587] HTML UltiSnips: Drop onchange from select snippet

---
 UltiSnips/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 9fd082441..71428de0e 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -171,7 +171,7 @@ snippet p "paragraph" w
 endsnippet
 
 snippet select "Select Box" w
-<select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: onchange="${6:}"}${7: size="${8:1}"}}>
+<select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: size="${6:1}"}}>
 	${0:${VISUAL}}
 </select>
 endsnippet

From 8a0f865950d70d6de1e39cec20ad4d52b611bd8f Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sat, 20 May 2017 12:46:26 +0200
Subject: [PATCH 1025/1587] HTML UltiSnips: HTML 5.1 support

Also placed the select snippet after the script tag, as it was not
alphabetically sorted.
---
 UltiSnips/html.snippets | 296 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 292 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 71428de0e..04802770d 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -63,16 +63,94 @@ snippet a "Link" w
 <a href="${1:http://www.${2:url.com}}"${3: target="_blank"}>${4:Anchor Text}</a>
 endsnippet
 
+snippet abbr "<abbr>" w
+<abbr title="$2">$1</abbr>
+endsnippet
+
+snippet access "accesskey global attribute"
+accesskey="$1"
+endsnippet
+
+snippet address "<address>" w
+<address>$1</address>
+endsnippet
+
+snippet article "<article>"
+<article>
+	${1:article content}
+</article>
+endsnippet
+
+snippet aside "<aside>"
+<aside>
+	${1:aside content}
+</aside>
+endsnippet
+
+snippet b "<b>" w
+<b>$1</b>
+endsnippet
+
 snippet base "HTML <base>" w
 <base href="$1"${2: target="$3"}`!p x(snip)`>
 endsnippet
 
+snippet blockquote "<blockquote>"
+<blockquote>$1</blockquote>
+endsnippet
+
 snippet body "<body>"
 <body>
 	${0:${VISUAL}}
 </body>
 endsnippet
 
+snippet br "<br>" w
+<br>$1</br>
+endsnippet
+
+snippet button "<button>"
+<button>$1</button>
+endsnippet
+
+snippet caption "<caption>"
+<caption>$1</caption>
+endsnippet
+
+snippet cite "<cite>" w
+<cite>$1</cite>
+endsnippet
+
+snippet class "class global attribute"
+class="$1"
+endsnippet
+
+snippet code "<code>" w
+<code>$1</code>
+endsnippet
+
+snippet data "<data>"
+<data value="$2">$1</data>
+endsnippet
+
+snippet datalist "<datalist>"
+<datalist id="$1" name="$2">
+	opt$3
+</datalist>
+endsnippet
+
+snippet dd "<dd>"
+<dd>$1</dd>
+endsnippet
+
+snippet del "<del>" w
+<del cite="$2" datetime="${3:`date '+%Y-%m-%dT%H:%M:%S%:z'`}">$1</del>
+endsnippet
+
+snippet dfn "<dfn>" w
+<dfn>$1</dfn>
+endsnippet
+
 snippet div "<div>" w
 <div>
 	${0:${VISUAL}}
@@ -91,6 +169,20 @@ snippet div. "<div> with class" w
 </div>
 endsnippet
 
+snippet dl "<dl>"
+<dl>
+	${1:Definition list}
+</dl>
+endsnippet
+
+snippet dt "<dt>"
+<dt>$1</dt>
+endsnippet
+
+snippet em "<em>" w
+<em>$1</em>
+endsnippet
+
 snippet fieldset "Fieldset" w
 <fieldset id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}" ${2:class="${3:}"}>
 	<legend>$1</legend>
@@ -98,6 +190,23 @@ snippet fieldset "Fieldset" w
 </fieldset>
 endsnippet
 
+snippet fig "<figure>"
+<figure>
+$1
+<figcaption>$2</figcaption>
+</figure>
+endsnippet
+
+snippet figcaption "<figcaption>"
+<figcaption>$1</figcaption>
+endsnippet
+
+snippet footer "<footer>"
+<footer>
+	${1:footer content}
+</footer>
+endsnippet
+
 snippet form "HTML <form>" w
 <form action="${1:`!p
 snip.rv = (snip.basename or 'unnamed') + '_submit'
@@ -138,6 +247,56 @@ snippet head "HTML <head>"
 </head>
 endsnippet
 
+snippet header "<header>"
+<header>
+	${1:header content}
+</header>
+endsnippet
+
+snippet hr "<hr>"
+<hr>
+endsnippet
+
+snippet html "HTML basic structure" b
+	<!DOCTYPE html>
+	<html>
+		<head>
+			<meta charset="UTF-8" />
+			<meta name="viewport" content="width=device-width" />
+			<title>${1:`!p snip.rv = snip.basename.replace('-', ' ').capitalize()`}</title>
+		</head>
+		<body>
+			${0:body}
+		</body>
+	</html>
+endsnippet
+
+snippet htmll "HTML basic structure with the lang attribute" b
+	<!DOCTYPE html>
+	<html lang="${1:es}">
+		<head>
+			<meta charset="UTF-8" />
+			<meta name="viewport" content="width=device-width" />
+			<title>${2:`!p snip.rv = snip.basename.replace('-', ' ').capitalize()`}</title>
+		</head>
+		<body>
+			${0:body}
+		</body>
+	</html>
+endsnippet
+
+snippet i "<i>" w
+<i>$1</i>
+endsnippet
+
+snippet id "id global attribute"
+id="$1"
+endsnippet
+
+snippet img "<img>"
+<img src="$1" alt="$2">
+endsnippet
+
 snippet input "Input with Label" w
 <label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}">$1</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="$5"${6: id="${7:$2}"}`!p x(snip)`>
 endsnippet
@@ -146,6 +305,22 @@ snippet input "HTML <input>" w
 <input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}`!p x(snip)`>
 endsnippet
 
+snippet ins "<ins>" w
+<ins cite="$2" datetime="${3:`date '+%Y-%m-%dT%H:%M:%S%:z'`}">$1</ins>
+endsnippet
+
+snippet kbd "<kbd>" w
+<kbd>$1</kbd>
+endsnippet
+
+snippet label "<label>"
+<label>$1</label>
+endsnippet
+
+snippet legend "<legend>"
+<legend>$1</leyend>
+endsnippet
+
 snippet li "list item" w
 <li>${0:${VISUAL}}</li>
 endsnippet
@@ -158,10 +333,50 @@ snippet mailto "HTML <a mailto: >" w
 <a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
 endsnippet
 
+snippet main "<main>"
+<main>
+	${1:main content}
+</main>
+endsnippet
+
+snippet mark "<mark>"
+<mark>$1</mark>
+endsnippet
+
 snippet meta "HTML <meta>" w
 <meta name="${1:name}" content="${2:content}"`!p x(snip)`>
 endsnippet
 
+snippet meter "<meter>"
+<meter>$1</meter>
+endsnippet
+
+snippet nav "<nav>"
+<nav>
+	${1:navigation links}
+</nav>
+endsnippet
+
+snippet noscript "<noscript>"
+<noscript>$1</noscript>
+endsnippet
+
+snippet ol "<ol>"
+<ol>
+	<li>$1</li>
+</ol>
+endsnippet
+
+snippet optgroup "<optgroup>"
+<optgroup label="$1">
+	opt$2
+</optgroup>
+endsnippet
+
+snippet output "<output>"
+<output for="$1" name="$2">$3</output>
+endsnippet
+
 snippet option "Option" w
 <option${1: value="${2:option}"}>${3:$2}</option>
 endsnippet
@@ -170,10 +385,30 @@ snippet p "paragraph" w
 <p>${0:${VISUAL}}</p>
 endsnippet
 
-snippet select "Select Box" w
-<select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: size="${6:1}"}}>
-	${0:${VISUAL}}
-</select>
+snippet picture "<picture>"
+<picture>
+	${1:image sources}
+</picture>
+endsnippet
+
+snippet pre "<pre>"
+<pre>$1</pre>
+endsnippet
+
+snippet progress "<progress>"
+<progress>$1</progress>
+endsnippet
+
+snippet q "<q>" w
+<q>$1</q>
+endsnippet
+
+snippet s "<s>" w
+<s>$1</s>
+endsnippet
+
+snippet samp "<samp>" w
+<samp>$1</samp>
 endsnippet
 
 snippet script "HTML <script>" w
@@ -186,6 +421,16 @@ snippet scriptsrc "HTML <script src...>" w
 <script src="$1" charset="${3:utf-8}"></script>
 endsnippet
 
+snippet select "Select Box" w
+<select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: size="${6:1}"}}>
+	${0:${VISUAL}}
+</select>
+endsnippet
+
+snippet small "<small>" w
+<small>$1</small>
+endsnippet
+
 snippet span "<span>" w
 <span> ${0:${VISUAL}} </span>
 endsnippet
@@ -198,30 +443,64 @@ snippet span. "<span> with class" w
 <span`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`> ${0:${VISUAL}} </span>
 endsnippet
 
+snippet strong "<strong>" w
+<strong>$1</strong>
+endsnippet
+
 snippet style "HTML <style>" w
 <style type="text/css" media="screen">
 	${0:${VISUAL}}
 </style>
 endsnippet
 
+snippet sub "<sub>" w
+<sub>$1</sub>
+endsnippet
+
+snippet sup "<sup>" w
+<sup>$1</sup>
+endsnippet
+
 snippet table "HTML <table>" w
 <table>
 	${0:${VISUAL}}
 </table>
 endsnippet
 
+snippet tbody "<tbody>"
+<tbody>$1</tbody>
+endsnippet
+
 snippet td "table cell" w
 <td>${0:${VISUAL}}</td>
 endsnippet
 
+snippet template "<template>"
+<template id="$1">
+$2
+</template>
+endsnippet
+
 snippet textarea "HTML <textarea>" w
 <textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">$0</textarea>
 endsnippet
 
+snippet tfoot "<tfoot>"
+<tfoot>$1</tfoot>
+endsnippet
+
 snippet th "table header" w
 <th>${0:${VISUAL}}</th>
 endsnippet
 
+snippet thead "<thead>"
+<thead>$1</thead>
+endsnippet
+
+snippet time "<time>" w
+<time datetime="$2">$1</time>
+endsnippet
+
 snippet title "HTML <title>" w
 <title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
 endsnippet
@@ -236,7 +515,16 @@ snippet ul "unordered list" w
 </ul>
 endsnippet
 
+snippet var "<var>" w
+<var>$1</var>
+endsnippet
+
 snippet viewport "Responsive viewport meta" w
 <meta name="viewport" content="width=device-width, initial-scale=1">
 endsnippet
+
+snippet wbr "<wbr>" w
+<wbr>$1</wbr>
+endsnippet
+
 # vim:ft=snippets:

From 13963e14ada4e6acb1e5322ab7dfc61cea6a9d84 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 27 May 2017 22:45:39 +0100
Subject: [PATCH 1026/1587] Elixir: Use compiler doc style

---
 snippets/elixir.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 963470e9d..4b4ef39f1 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -88,10 +88,20 @@ snippet def
 snippet defd
 	@doc """
 	${1:doc string}
+
 	"""
 	def ${2:name} do
 		${0}
 	end
+snippet defsd
+	@doc """
+	${1:doc string}
+
+	"""
+	@spec ${2:name} :: ${3:no_return}
+	def ${2} do
+		${0}
+	end
 snippet defim
 	defimpl ${1:protocol_name}, for: ${2:data_type} do
 		${0}
@@ -117,6 +127,7 @@ snippet defr
 snippet doc
 	@doc """
 	${0}
+
 	"""
 snippet docf
 	@doc false
@@ -125,6 +136,7 @@ snippet fn
 snippet mdoc
 	@moduledoc """
 	${0}
+
 	"""
 snippet mdocf
 	@moduledoc false

From d34aa92db0103a1c9e219f4b1cebb16f79669811 Mon Sep 17 00:00:00 2001
From: Yuji Nakao <nakaoyuji.nakao@gmail.com>
Date: Sun, 28 May 2017 09:41:34 +0900
Subject: [PATCH 1027/1587] Remove extra whitespaces

---
 snippets/rust.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 51f10055f..adfd29c96 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -34,11 +34,11 @@ snippet main "Main function"
 snippet let "let variable declaration with type inference"
 	let ${1} = ${2};
 snippet lett "let variable declaration with explicit type annotation"
-	let ${1}: ${2}  = ${3};
+	let ${1}: ${2} = ${3};
 snippet letm "let mut variable declaration with type inference"
-	let mut ${1}  = ${2};
+	let mut ${1} = ${2};
 snippet lettm "let mut variable declaration with explicit type annotation"
-	let mut ${1}: ${2}  = ${3};
+	let mut ${1}: ${2} = ${3};
 snippet pri "print!"
 	print!("${1}");
 snippet pri, "print! with format param"

From ea25f3d442830f5bba089e8d769bdcc7631bf291 Mon Sep 17 00:00:00 2001
From: Mauro Porras P <mauroporrasp@gmail.com>
Date: Sun, 28 May 2017 12:07:40 -0500
Subject: [PATCH 1028/1587] Remove unnecessary parentheses

---
 snippets/javascript.es6.react.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript.es6.react.snippets b/snippets/javascript.es6.react.snippets
index 2894ac5d7..a584bb132 100644
--- a/snippets/javascript.es6.react.snippets
+++ b/snippets/javascript.es6.react.snippets
@@ -40,7 +40,7 @@ snippet rcdp
 
 # Presentational component
 snippet rcom
-	(props) => {
+	props => {
 		return (
 			${0:<div></div>}
 		)

From 660a006b0435161c30602ed4a86f55efeda150f4 Mon Sep 17 00:00:00 2001
From: Leon Kuchenbecker <lkuchenb@inf.fu-berlin.de>
Date: Sat, 27 May 2017 19:07:30 +0200
Subject: [PATCH 1029/1587] Add exit jump mark for TeX inline text modifiers

---
 snippets/tex.snippets | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 2808cf711..c2ae5b951 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -204,32 +204,32 @@ snippet fcite \footcite[]{}
 	\\footcite[${1}]{${2}}${0}
 #Formating text: italic, bold, underline, small capital, emphase ..
 snippet it italic text
-	\\textit{${0:${VISUAL:text}}}
+	\\textit{${1:${VISUAL:text}}} ${0}
 snippet bf bold face text
-	\\textbf{${0:${VISUAL:text}}}
+	\\textbf{${1:${VISUAL:text}}} ${0}
 snippet under underline text
-	\\underline{${0:${VISUAL:text}}}
+	\\underline{${1:${VISUAL:text}}} ${0}
 snippet emp emphasize text
-	\\emph{${0:${VISUAL:text}}}
+	\\emph{${1:${VISUAL:text}}} ${0}
 snippet sc small caps text
-	\\textsc{${0:${VISUAL:text}}}
+	\\textsc{${1:${VISUAL:text}}} ${0}
 #Choosing font
 snippet sf sans serife text
-	\\textsf{${0:${VISUAL:text}}}
+	\\textsf{${1:${VISUAL:text}}} ${0}
 snippet rm roman font text
-	\\textrm{${0:${VISUAL:text}}}
+	\\textrm{${1:${VISUAL:text}}} ${0}
 snippet tt typewriter (monospace) text
-	\\texttt{${0:${VISUAL:text}}}
+	\\texttt{${1:${VISUAL:text}}} ${0}
 #Math font
 snippet mf mathfrak
-	\\mathfrak{${0:${VISUAL:text}}}
+	\\mathfrak{${1:${VISUAL:text}}} ${0}
 snippet mc mathcal
-	\\mathcal{${0:${VISUAL:text}}}
+	\\mathcal{${1:${VISUAL:text}}} ${0}
 snippet ms mathscr
-	\\mathscr{${0:${VISUAL:text}}}
+	\\mathscr{${1:${VISUAL:text}}} ${0}
 #misc
 snippet ft \footnote
-	\\footnote{${0:${VISUAL:text}}}
+	\\footnote{${1:${VISUAL:text}}} ${0}
 snippet fig figure environment (includegraphics)
 	\\begin{figure}
 	\\begin{center}

From 1e1ee89d723918c9947621cda7af7f802dc00136 Mon Sep 17 00:00:00 2001
From: heiderich <florian@heiderich.org>
Date: Sun, 28 May 2017 19:48:59 +0200
Subject: [PATCH 1030/1587] add tikzcd* and properly escape backslashes (#919)

* add snippet for abstract environment

* add tikzcd* and properly escape backslashes
---
 snippets/tex.snippets | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index c2ae5b951..f60f312bb 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -259,12 +259,19 @@ snippet subfig subfigure environment
 	\\label{fig:${5}}
 	\\end{subfigure}
 	${0}
-snippet tikzcd tikzcd environment
-	\begin{equation}
-	\begin{tikzcd}
+snippet tikzcd tikzcd environment in equation
+	\\begin{equation}
+	\\begin{tikzcd}
+		${1}
+	\\end{tikzcd}
+	\\end{equation}
+	${0}
+snippet tikzcd* tikzcd environment in equation*
+	\\begin{equation*}
+	\\begin{tikzcd}
 		${1}
-	\end{tikzcd}
-	\end{equation}
+	\\end{tikzcd}
+	\\end{equation*}
 	${0}
 #math
 snippet stackrel \stackrel{}{}

From 64acfafe169bf4a6a5c8f3109558a42dde96ef85 Mon Sep 17 00:00:00 2001
From: sanjivj <sanjivchristopher@gmail.com>
Date: Sun, 28 May 2017 10:50:10 -0700
Subject: [PATCH 1031/1587] =?UTF-8?q?Added=20vue-specific=20html=20snippet?=
 =?UTF-8?q?s=20and=20vue=20boilerplate.=20These=20two=20categ=E2=80=A6=20(?=
 =?UTF-8?q?#912)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added vue-specific html snippets and vue boilerplate. These two categories were both ported from Sarah Drasner's vue snippets for Sublimetext.

* Removed merge conflict.

The original poster had put 'extends html, javascript, css ' at the top; my changes repeated this line; that redundancy is now removed.

* Removed redundancy from vue.snippet file; also untracked change (~) files.

* Changed beginning spaces to tabs; also added a top-level comment,so git would recognize that the file had changed.

* Fixed typos.

* Fixed more mistakes.
---
 .gitignore            |   1 +
 snippets/vue.snippets | 184 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 184 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0d20b6487..f3d74a9a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.pyc
+*~
diff --git a/snippets/vue.snippets b/snippets/vue.snippets
index 4e09d0cc6..c296acb37 100644
--- a/snippets/vue.snippets
+++ b/snippets/vue.snippets
@@ -1 +1,183 @@
-extends html, javascript, css
+# This snippet file enables vue files to use tabs for html, js and css. It also
+# includes some vue-specific html-like snippets, as well as some general 
+# boilerplate code for vue.
+
+extends html, javascript, css 
+
+# These snippets form a port of Sarah Drasner's vue-sublime-snippets
+
+# some html-like snippets
+
+snippet slot
+	<slot></slot>
+
+snippet template
+	<template></template>
+
+snippet transition 
+	<transition></transition>
+
+# The following snippets create more complex boilerplate code.
+
+snippet vbase
+	<template>
+		<div>
+
+		</div>
+	</template>
+
+	<script>
+		export default{
+
+		}	
+	</script>
+	<style scoped>
+
+	</style>
+snippet vimport:c
+	import New from './components/New.vue';
+
+	export default{
+		components: {
+			appNew: New 
+		}
+	}
+
+snippet vactionsis now
+
+	actions: {
+		updateValue({commit}, payload) {
+			commit(updateValue, payload);
+	}
+}
+
+# Add in js animation hooks
+snippet vanim:js:el 
+	<transition 
+	  @before-enter="beforeEnter"
+	  @enter="enter"
+	  @after-enter="afterEnter"
+	  @enter-cancelled="enterCancelled"
+	  @before-Leave="beforeLeave"
+	  @leave="leave"
+	  @after-leave="afterLeave"
+	  @leave-cancelled="leaveCancelled"
+	  :css="false">
+	 
+	 </transition>
+	 
+snippet vanim:js:method
+	methods: {
+	  beforeEnter(el) {
+		console.log('beforeEnter');
+	  }, 
+	  enter(el, done) {
+		 console.log('enter');
+		 done();
+	  },
+	  afterEnter(el) {
+		console.log('afterEnter');
+	  }, 
+	  enterCancelled(el, done) {
+		 console.log('enterCancelled');
+	  },
+	  beforeLeave(el) {
+		console.log('beforeLeave');
+	  }, 
+	  leave(el, done) {
+		 console.log('leave');
+		 done();
+	  },
+	  afterLeave(el) {
+		console.log('afterLeave');
+	  }, 
+	  leaveCancelled(el, done) {
+		 console.log('leaveCancelled');
+	  }
+	}
+
+snippet vcl 
+	@click=""
+
+snippet vdata
+	data: function () {
+	  return {
+		key: value
+	  };
+	}
+
+snippet vfilter
+	filters: {
+	  fnName: function (v) {
+		return;
+	  }
+	}
+
+snippet vfor
+	<div v-for="item in items" :key="item.id">
+	  {{ item }}
+	</div
+
+snippet vgetters
+	getters: {
+		value: state => {
+			return state.value;
+		}
+	}
+
+snippet vimport 
+	import New from './components/New.vue';
+
+snippet vkeep
+	<keep-alive>
+	  <component :is="">
+		<p>default</p>
+	  </component>
+	</keep-alive>
+
+snippet vmixin
+	// define a mixin object
+	var myMixin = {
+	  created: function () {
+		this.hello()
+	  },
+	  methods: {
+		hello: function () {
+		  console.log('hello from mixin!')
+		}
+	  }
+	}
+	// define a component that uses this mixin
+	var Component = Vue.extend({
+	  mixins: [myMixin]
+	})
+	var component = new Component() // -> "hello from mixin!"
+
+snippet vmutations
+	// define a mixin object
+	var myMixin = {
+	  created: function () {
+		this.hello()
+	  },
+	  methods: {
+		hello: function () {
+		  console.log('hello from mixin!')
+		}
+	  }
+	}
+	// define a component that uses this mixin
+	var Component = Vue.extend({
+	  mixins: [myMixin]
+	})
+	var component = new Component() // -> "hello from mixin!"
+
+snippet vprops:d
+	propName: {
+	  type: Number,
+	  default: 100
+	},
+
+snippet vprops 
+	propName: {
+		type: Number
+	},

From 0676af534873faa2dc31f27bc081665c065b8df8 Mon Sep 17 00:00:00 2001
From: Charlie Chang <icharlie@users.noreply.github.com>
Date: Mon, 29 May 2017 13:08:07 -0700
Subject: [PATCH 1032/1587] Fixing the vue snippet's indentation issue. (#923)

---
 snippets/vue.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/vue.snippets b/snippets/vue.snippets
index c296acb37..63764f848 100644
--- a/snippets/vue.snippets
+++ b/snippets/vue.snippets
@@ -48,8 +48,8 @@ snippet vactionsis now
 	actions: {
 		updateValue({commit}, payload) {
 			commit(updateValue, payload);
+		}
 	}
-}
 
 # Add in js animation hooks
 snippet vanim:js:el 

From 90b7b5aa7b9e294b1728cce47949607b0be12b69 Mon Sep 17 00:00:00 2001
From: minusf <minusf@gmail.com>
Date: Tue, 6 Jun 2017 23:11:14 +0200
Subject: [PATCH 1033/1587] pdbpp is a drop-in replacement of pdb, use it
 importing pdb (#929)

---
 snippets/python.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index faa716eb7..9e35a2fa0 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -142,10 +142,6 @@ snippet ipdb
 snippet iem
 	import IPython
 	IPython.embed()
-# ipython debugger (pdbbb)
-snippet pdbbb
-	import pdbpp
-	pdbpp.set_trace()
 # remote python debugger (rpdb)
 snippet rpdb
 	import rpdb

From 60a9bd6b63325194e6b99ecd9e9eedd8fb2bd2ae Mon Sep 17 00:00:00 2001
From: Ilya Pekelny <pekelny@gmail.com>
Date: Thu, 1 Jun 2017 12:16:29 +0300
Subject: [PATCH 1034/1587] Go composite literal snippet.

---
 snippets/go.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 05d80c9b6..de58b54df 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -226,3 +226,8 @@ snippet bench benchmark function
 		}
 	}
 	${0}
+# composite literals
+snippet cl
+	type ${1:name} struct {
+		${2:attrName} ${3:attrType}
+	}

From 82629a451c9e6afa4dca09b18d874ca38eafeff6 Mon Sep 17 00:00:00 2001
From: Ilya Pekelny <pekelny@gmail.com>
Date: Thu, 1 Jun 2017 14:06:28 +0300
Subject: [PATCH 1035/1587] If key in a map. Go snippet.

---
 snippets/go.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index de58b54df..2e2372e7b 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -231,3 +231,8 @@ snippet cl
 	type ${1:name} struct {
 		${2:attrName} ${3:attrType}
 	}
+# if key in a map
+snippet om
+	if ${1:value}, ok := ${2:map}[${3:key}]; ok == true {
+		${4:/* code */}
+	}

From 5b7b743d5f2288ae79079fbfcc236cb6ffce9e03 Mon Sep 17 00:00:00 2001
From: Ilya Pekelny <pekelny@gmail.com>
Date: Thu, 8 Jun 2017 20:23:08 +0300
Subject: [PATCH 1036/1587] GO: Anonymous struct global variables

---
 snippets/go.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 2e2372e7b..6bc4602c9 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -236,3 +236,11 @@ snippet om
 	if ${1:value}, ok := ${2:map}[${3:key}]; ok == true {
 		${4:/* code */}
 	}
+
+# Grouped globals with anonymous struct
+snippet gg
+	var ${1:var} = struct{
+		${2:name} ${3:type}
+	}{
+		${2:name}: ${4:value},
+	}

From 9c05a32d14836eb7c98512d97fbac3f5630a77a6 Mon Sep 17 00:00:00 2001
From: nuke-ellington <lukas.maurer.muc@gmail.com>
Date: Thu, 8 Jun 2017 16:30:03 +0200
Subject: [PATCH 1037/1587] Port of UltiSnips/javascript-jasmine.snippets to
 snipMate format.

---
 .../javascript/javascript-jasmine.snippets    | 176 ++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 snippets/javascript/javascript-jasmine.snippets

diff --git a/snippets/javascript/javascript-jasmine.snippets b/snippets/javascript/javascript-jasmine.snippets
new file mode 100644
index 000000000..3204782ed
--- /dev/null
+++ b/snippets/javascript/javascript-jasmine.snippets
@@ -0,0 +1,176 @@
+snippet des "Describe (js)"
+	describe('${1:description}', function() {
+		${0}
+	});
+
+snippet it "it (js)"
+	it('${1:description}', function() {
+		${0}
+	});
+
+snippet bef "before each (js)"
+	beforeEach(function() {
+		${0}
+	});
+
+snippet aft "after each (js)"
+	afterEach(function() {
+		${0}
+	});
+
+snippet befa "before all (js)"
+	beforeAll(function() {
+		${0}
+	});
+
+snippet afta "after all (js)"
+	afterAll(function() {
+		${0}
+	});
+
+snippet any "any (js)"
+	jasmine.any(${1})
+
+snippet anyt "anything (js)"
+	jasmine.anything()
+
+version 1
+snippet objc "object containing (js)"
+	jasmine.objectContaining({
+		${VISUAL}$0
+	});
+
+snippet arrc "array containing (js)"
+	jasmine.arrayContaining([${1:value1}]);
+
+snippet strm "string matching (js)"
+	jasmine.stringMatching("${1:matcher}")
+
+snippet ru "runs (js)"
+	runs(function() {
+		${0}
+	});
+
+snippet wa "waits (js)"
+	waits(${1});
+
+snippet ex "expect (js)"
+	expect(${1:target})${0};
+
+snippet ee "expect to equal (js)"
+	expect(${1:target}).toEqual(${2:value});
+
+snippet el "expect to be less than (js)"
+	expect(${1:target}).toBeLessThan(${2:value});
+
+snippet eg "expect to be greater than (js)"
+	expect(${1:target}).toBeGreaterThan(${2:value});
+
+snippet eb "expect to be (js)"
+	expect(${1:target}).toBe(${2:value});
+
+snippet em "expect to match (js)"
+	expect(${1:target}).toMatch(${2:pattern});
+
+snippet eha "expect to have attribute (js)"
+	expect(${1:target}).toHaveAttr('${2:attr}'${3:, '${4:value}'});
+
+snippet et "expect to be truthy (js)"
+	expect(${1:target}).toBeTruthy();
+
+snippet ef "expect to be falsy (js)"
+	expect(${1:target}).toBeFalsy();
+
+snippet ed "expect to be defined (js)"
+	expect(${1:target}).toBeDefined();
+
+snippet eud "expect to be defined (js)"
+	expect(${1:target}).toBeUndefined();
+
+snippet en "expect to be null (js)"
+	expect(${1:target}).toBeNull();
+
+snippet ec "expect to contain (js)"
+	expect(${1:target}).toContain(${2:value});
+
+snippet ev "expect to be visible (js)"
+	expect(${1:target}).toBeVisible();
+
+snippet eh "expect to be hidden (js)"
+	expect(${1:target}).toBeHidden();
+
+snippet eth "expect to throw (js)"
+	expect(${1:target}).toThrow(${2:value});
+
+snippet ethe "expect to throw error (js)"
+	expect(${1:target}).toThrowError(${2:value});
+
+snippet notx "expect not (js)"
+	expect(${1:target}).not${0};
+
+snippet note "expect not to equal (js)"
+	expect(${1:target}).not.toEqual(${2:value});
+
+snippet notl "expect to not be less than (js)"
+	expect(${1:target}).not.toBeLessThan(${2:value});
+
+snippet notg "expect to not be greater than (js)"
+	expect(${1:target}).not.toBeGreaterThan(${2:value});
+
+snippet notm "expect not to match (js)"
+	expect(${1:target}).not.toMatch(${2:pattern});
+
+snippet notha "expect to not have attribute (js)"
+	expect(${1:target}).not.toHaveAttr('${2:attr}'${3:, '${4:value}'});
+
+snippet nott "expect not to be truthy (js)"
+	expect(${1:target}).not.toBeTruthy();
+
+snippet notf "expect not to be falsy (js)"
+	expect(${1:target}).not.toBeFalsy();
+
+snippet notd "expect not to be defined (js)"
+	expect(${1:target}).not.toBeDefined();
+
+snippet notn "expect not to be null (js)"
+	expect(${1:target}).not.toBeNull();
+
+snippet notc "expect not to contain (js)"
+	expect(${1:target}).not.toContain(${2:value});
+
+snippet notv "expect not to be visible (js)"
+	expect(${1:target}).not.toBeVisible();
+
+snippet noth "expect not to be hidden (js)"
+	expect(${1:target}).not.toBeHidden();
+
+snippet notth "expect not to throw (js)"
+	expect(${1:target}).not.toThrow(${2:value});
+
+snippet notthe "expect not to throw error (js)"
+	expect(${1:target}).not.toThrowError(${2:value});
+
+snippet s "spy on (js)"
+	spyOn(${1:object}, '${2:method}');
+
+snippet sr "spy on and return (js)"
+	spyOn(${1:object}, '${2:method}').and.returnValue(${3:arguments});
+
+snippet st "spy on and throw (js)"
+	spyOn(${1:object}, '${2:method}').and.throwError(${3:exception});
+
+snippet sct "spy on and call through (js)"
+	spyOn(${1:object}, '${2:method}').and.callThrough();
+
+snippet scf "spy on and call fake (js)"
+	spyOn(${1:object}, '${2:method}').and.callFake(${3:function});
+
+snippet ethbc "expect to have been called (js)"
+	expect(${1:target}).toHaveBeenCalled();
+
+snippet nthbc "expect not to have been called (js)"
+	expect(${1:target}).not.toHaveBeenCalled();
+
+snippet ethbcw "expect to have been called with (js)"
+	expect(${1:target}).toHaveBeenCalledWith(${2:arguments});
+

From 7c673c77506ea8ab23f9c73a6e8b15d1899e07fd Mon Sep 17 00:00:00 2001
From: nuke-ellington <lukas.maurer.muc@gmail.com>
Date: Fri, 9 Jun 2017 02:01:43 +0200
Subject: [PATCH 1038/1587] Obsolete UltiSnips removed.

---
 UltiSnips/javascript-jasmine.snippets | 234 --------------------------
 1 file changed, 234 deletions(-)
 delete mode 100644 UltiSnips/javascript-jasmine.snippets

diff --git a/UltiSnips/javascript-jasmine.snippets b/UltiSnips/javascript-jasmine.snippets
deleted file mode 100644
index 2efbf2663..000000000
--- a/UltiSnips/javascript-jasmine.snippets
+++ /dev/null
@@ -1,234 +0,0 @@
-priority -50
-
-# JavaScript versions -- from the TextMate bundle + some additions
-# for jasmine-jquery matchers
-#
-
-snippet des "Describe (js)" b
-describe('${1:description}', function() {
-	$0
-});
-endsnippet
-
-snippet it "it (js)" b
-it('${1:description}', function() {
-	$0
-});
-endsnippet
-
-snippet bef "before each (js)" b
-beforeEach(function() {
-	$0
-});
-endsnippet
-
-snippet aft "after each (js)" b
-afterEach(function() {
-	$0
-});
-endsnippet
-
-snippet befa "before all (js)" b
-beforeAll(function() {
-	$0
-});
-endsnippet
-
-snippet afta "after all (js)" b
-afterAll(function() {
-	$0
-});
-endsnippet
-
-snippet any "any (js)" b
-jasmine.any($1)
-endsnippet
-
-snippet anyt "anything (js)" b
-jasmine.anything()
-endsnippet
-
-snippet objc "object containing (js)" b
-jasmine.objectContaining({
-	${VISUAL}$0
-});
-endsnippet
-
-snippet arrc "array containing (js)" b
-jasmine.arrayContaining([${1:value1}]);
-endsnippet
-
-snippet strm "string matching (js)" b
-jasmine.stringMatching("${1:matcher}")
-endsnippet
-
-snippet ru "runs (js)" b
-runs(function() {
-	$0
-});
-endsnippet
-
-snippet wa "waits (js)" b
-waits($1);
-endsnippet
-
-snippet ex "expect (js)" b
-expect(${1:target})$0;
-endsnippet
-
-snippet ee "expect to equal (js)" b
-expect(${1:target}).toEqual(${2:value});
-endsnippet
-
-snippet el "expect to be less than (js)" b
-expect(${1:target}).toBeLessThan(${2:value});
-endsnippet
-
-snippet eg "expect to be greater than (js)" b
-expect(${1:target}).toBeGreaterThan(${2:value});
-endsnippet
-
-snippet eb "expect to be (js)" b
-expect(${1:target}).toBe(${2:value});
-endsnippet
-
-snippet em "expect to match (js)" b
-expect(${1:target}).toMatch(${2:pattern});
-endsnippet
-
-snippet eha "expect to have attribute (js)" b
-expect(${1:target}).toHaveAttr('${2:attr}'${3:, '${4:value}'});
-endsnippet
-
-snippet et "expect to be truthy (js)" b
-expect(${1:target}).toBeTruthy();
-endsnippet
-
-snippet ef "expect to be falsy (js)" b
-expect(${1:target}).toBeFalsy();
-endsnippet
-
-snippet ed "expect to be defined (js)" b
-expect(${1:target}).toBeDefined();
-endsnippet
-
-snippet eud "expect to be defined (js)" b
-expect(${1:target}).toBeUndefined();
-endsnippet
-
-snippet en "expect to be null (js)" b
-expect(${1:target}).toBeNull();
-endsnippet
-
-snippet ec "expect to contain (js)" b
-expect(${1:target}).toContain(${2:value});
-endsnippet
-
-snippet ev "expect to be visible (js)" b
-expect(${1:target}).toBeVisible();
-endsnippet
-
-snippet eh "expect to be hidden (js)" b
-expect(${1:target}).toBeHidden();
-endsnippet
-
-snippet eth "expect to throw (js)" b
-expect(${1:target}).toThrow(${2:value});
-endsnippet
-
-snippet ethe "expect to throw error (js)" b
-expect(${1:target}).toThrowError(${2:value});
-endsnippet
-
-snippet notx "expect not (js)" b
-expect(${1:target}).not$0;
-endsnippet
-
-snippet note "expect not to equal (js)" b
-expect(${1:target}).not.toEqual(${2:value});
-endsnippet
-
-snippet notl "expect to not be less than (js)" b
-expect(${1:target}).not.toBeLessThan(${2:value});
-endsnippet
-
-snippet notg "expect to not be greater than (js)" b
-expect(${1:target}).not.toBeGreaterThan(${2:value});
-endsnippet
-
-snippet notm "expect not to match (js)" b
-expect(${1:target}).not.toMatch(${2:pattern});
-endsnippet
-
-snippet notha "expect to not have attribute (js)" b
-expect(${1:target}).not.toHaveAttr('${2:attr}'${3:, '${4:value}'});
-endsnippet
-
-snippet nott "expect not to be truthy (js)" b
-expect(${1:target}).not.toBeTruthy();
-endsnippet
-
-snippet notf "expect not to be falsy (js)" b
-expect(${1:target}).not.toBeFalsy();
-endsnippet
-
-snippet notd "expect not to be defined (js)" b
-expect(${1:target}).not.toBeDefined();
-endsnippet
-
-snippet notn "expect not to be null (js)" b
-expect(${1:target}).not.toBeNull();
-endsnippet
-
-snippet notc "expect not to contain (js)" b
-expect(${1:target}).not.toContain(${2:value});
-endsnippet
-
-snippet notv "expect not to be visible (js)" b
-expect(${1:target}).not.toBeVisible();
-endsnippet
-
-snippet noth "expect not to be hidden (js)" b
-expect(${1:target}).not.toBeHidden();
-endsnippet
-
-snippet notth "expect not to throw (js)" b
-expect(${1:target}).not.toThrow(${2:value});
-endsnippet
-
-snippet notthe "expect not to throw error (js)" b
-expect(${1:target}).not.toThrowError(${2:value});
-endsnippet
-
-snippet s "spy on (js)" b
-spyOn(${1:object}, '${2:method}')$0;
-endsnippet
-
-snippet sr "spy on and return (js)" b
-spyOn(${1:object}, '${2:method}').and.returnValue(${3:arguments});
-endsnippet
-
-snippet st "spy on and throw (js)" b
-spyOn(${1:object}, '${2:method}').and.throwError(${3:exception});
-endsnippet
-
-snippet sct "spy on and call through (js)" b
-spyOn(${1:object}, '${2:method}').and.callThrough();
-endsnippet
-
-snippet scf "spy on and call fake (js)" b
-spyOn(${1:object}, '${2:method}').and.callFake(${3:function});
-endsnippet
-
-snippet ethbc "expect to have been called (js)" b
-expect(${1:target}).toHaveBeenCalled();
-endsnippet
-
-snippet nthbc "expect not to have been called (js)" b
-expect(${1:target}).not.toHaveBeenCalled();
-endsnippet
-
-snippet ethbcw "expect to have been called with (js)" b
-expect(${1:target}).toHaveBeenCalledWith(${2:arguments});
-endsnippet
-

From a8727e7d67986f54d111832cb9b7679048261a00 Mon Sep 17 00:00:00 2001
From: nuke-ellington <lukas.maurer.muc@gmail.com>
Date: Fri, 9 Jun 2017 13:41:31 +0200
Subject: [PATCH 1039/1587] Parser v1 for whole file.

---
 .../javascript/javascript-jasmine.snippets    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/snippets/javascript/javascript-jasmine.snippets b/snippets/javascript/javascript-jasmine.snippets
index 3204782ed..855a18944 100644
--- a/snippets/javascript/javascript-jasmine.snippets
+++ b/snippets/javascript/javascript-jasmine.snippets
@@ -1,40 +1,41 @@
+version 1
+
 snippet des "Describe (js)"
 	describe('${1:description}', function() {
-		${0}
+		$0
 	});
 
 snippet it "it (js)"
 	it('${1:description}', function() {
-		${0}
+		$0
 	});
 
 snippet bef "before each (js)"
 	beforeEach(function() {
-		${0}
+		$0
 	});
 
 snippet aft "after each (js)"
 	afterEach(function() {
-		${0}
+		$0
 	});
 
 snippet befa "before all (js)"
 	beforeAll(function() {
-		${0}
+		$0
 	});
 
 snippet afta "after all (js)"
 	afterAll(function() {
-		${0}
+		$0
 	});
 
 snippet any "any (js)"
-	jasmine.any(${1})
+	jasmine.any($1)
 
 snippet anyt "anything (js)"
 	jasmine.anything()
 
-version 1
 snippet objc "object containing (js)"
 	jasmine.objectContaining({
 		${VISUAL}$0
@@ -48,14 +49,14 @@ snippet strm "string matching (js)"
 
 snippet ru "runs (js)"
 	runs(function() {
-		${0}
+		$0
 	});
 
 snippet wa "waits (js)"
-	waits(${1});
+	waits($1);
 
 snippet ex "expect (js)"
-	expect(${1:target})${0};
+	expect(${1:target})$0;
 
 snippet ee "expect to equal (js)"
 	expect(${1:target}).toEqual(${2:value});
@@ -106,7 +107,7 @@ snippet ethe "expect to throw error (js)"
 	expect(${1:target}).toThrowError(${2:value});
 
 snippet notx "expect not (js)"
-	expect(${1:target}).not${0};
+	expect(${1:target}).not$0;
 
 snippet note "expect not to equal (js)"
 	expect(${1:target}).not.toEqual(${2:value});
@@ -151,7 +152,7 @@ snippet notthe "expect not to throw error (js)"
 	expect(${1:target}).not.toThrowError(${2:value});
 
 snippet s "spy on (js)"
-	spyOn(${1:object}, '${2:method}');
+	spyOn(${1:object}, '${2:method}')$0;
 
 snippet sr "spy on and return (js)"
 	spyOn(${1:object}, '${2:method}').and.returnValue(${3:arguments});

From ab66dec7e6583ceb8d23d434962a16573095339b Mon Sep 17 00:00:00 2001
From: nuke-ellington <lukas.maurer.muc@gmail.com>
Date: Fri, 9 Jun 2017 13:44:07 +0200
Subject: [PATCH 1040/1587] Redundant snippets pruned.

---
 UltiSnips/javascript-jasmine-arrow.snippets | 186 --------------------
 1 file changed, 186 deletions(-)

diff --git a/UltiSnips/javascript-jasmine-arrow.snippets b/UltiSnips/javascript-jasmine-arrow.snippets
index fa7f93643..e8c2a9b2e 100644
--- a/UltiSnips/javascript-jasmine-arrow.snippets
+++ b/UltiSnips/javascript-jasmine-arrow.snippets
@@ -40,195 +40,9 @@ afterAll(() => {
 });
 endsnippet
 
-snippet any "any (js)" b
-jasmine.any($1)
-endsnippet
-
-snippet anyt "anything (js)" b
-jasmine.anything()
-endsnippet
-
-snippet objc "object containing (js)" b
-jasmine.objectContaining({
-	${VISUAL}$0
-});
-endsnippet
-
-snippet arrc "array containing (js)" b
-jasmine.arrayContaining([${1:value1}]);
-endsnippet
-
-snippet strm "string matching (js)" b
-jasmine.stringMatching("${1:matcher}")
-endsnippet
-
 snippet ru "runs (js)" b
 runs(() => {
 	$0
 });
 endsnippet
 
-snippet wa "waits (js)" b
-waits($1);
-endsnippet
-
-snippet ex "expect (js)" b
-expect(${1:target})$0;
-endsnippet
-
-snippet ee "expect to equal (js)" b
-expect(${1:target}).toEqual(${2:value});
-endsnippet
-
-snippet el "expect to be less than (js)" b
-expect(${1:target}).toBeLessThan(${2:value});
-endsnippet
-
-snippet eg "expect to be greater than (js)" b
-expect(${1:target}).toBeGreaterThan(${2:value});
-endsnippet
-
-snippet eb "expect to be (js)" b
-expect(${1:target}).toBe(${2:value});
-endsnippet
-
-snippet em "expect to match (js)" b
-expect(${1:target}).toMatch(${2:pattern});
-endsnippet
-
-snippet eha "expect to have attribute (js)" b
-expect(${1:target}).toHaveAttr('${2:attr}'${3:, '${4:value}'});
-endsnippet
-
-snippet et "expect to be truthy (js)" b
-expect(${1:target}).toBeTruthy();
-endsnippet
-
-snippet ef "expect to be falsy (js)" b
-expect(${1:target}).toBeFalsy();
-endsnippet
-
-snippet ed "expect to be defined (js)" b
-expect(${1:target}).toBeDefined();
-endsnippet
-
-snippet eud "expect to be defined (js)" b
-expect(${1:target}).toBeUndefined();
-endsnippet
-
-snippet en "expect to be null (js)" b
-expect(${1:target}).toBeNull();
-endsnippet
-
-snippet ec "expect to contain (js)" b
-expect(${1:target}).toContain(${2:value});
-endsnippet
-
-snippet ev "expect to be visible (js)" b
-expect(${1:target}).toBeVisible();
-endsnippet
-
-snippet eh "expect to be hidden (js)" b
-expect(${1:target}).toBeHidden();
-endsnippet
-
-snippet eth "expect to throw (js)" b
-expect(${1:target}).toThrow(${2:value});
-endsnippet
-
-snippet ethe "expect to throw error (js)" b
-expect(${1:target}).toThrowError(${2:value});
-endsnippet
-
-snippet notx "expect not (js)" b
-expect(${1:target}).not$0;
-endsnippet
-
-snippet note "expect not to equal (js)" b
-expect(${1:target}).not.toEqual(${2:value});
-endsnippet
-
-snippet notl "expect to not be less than (js)" b
-expect(${1:target}).not.toBeLessThan(${2:value});
-endsnippet
-
-snippet notg "expect to not be greater than (js)" b
-expect(${1:target}).not.toBeGreaterThan(${2:value});
-endsnippet
-
-snippet notm "expect not to match (js)" b
-expect(${1:target}).not.toMatch(${2:pattern});
-endsnippet
-
-snippet notha "expect to not have attribute (js)" b
-expect(${1:target}).not.toHaveAttr('${2:attr}'${3:, '${4:value}'});
-endsnippet
-
-snippet nott "expect not to be truthy (js)" b
-expect(${1:target}).not.toBeTruthy();
-endsnippet
-
-snippet notf "expect not to be falsy (js)" b
-expect(${1:target}).not.toBeFalsy();
-endsnippet
-
-snippet notd "expect not to be defined (js)" b
-expect(${1:target}).not.toBeDefined();
-endsnippet
-
-snippet notn "expect not to be null (js)" b
-expect(${1:target}).not.toBeNull();
-endsnippet
-
-snippet notc "expect not to contain (js)" b
-expect(${1:target}).not.toContain(${2:value});
-endsnippet
-
-snippet notv "expect not to be visible (js)" b
-expect(${1:target}).not.toBeVisible();
-endsnippet
-
-snippet noth "expect not to be hidden (js)" b
-expect(${1:target}).not.toBeHidden();
-endsnippet
-
-snippet notth "expect not to throw (js)" b
-expect(${1:target}).not.toThrow(${2:value});
-endsnippet
-
-snippet notthe "expect not to throw error (js)" b
-expect(${1:target}).not.toThrowError(${2:value});
-endsnippet
-
-snippet s "spy on (js)" b
-spyOn(${1:object}, '${2:method}')$0;
-endsnippet
-
-snippet sr "spy on and return (js)" b
-spyOn(${1:object}, '${2:method}').and.returnValue(${3:arguments});
-endsnippet
-
-snippet st "spy on and throw (js)" b
-spyOn(${1:object}, '${2:method}').and.throwError(${3:exception});
-endsnippet
-
-snippet sct "spy on and call through (js)" b
-spyOn(${1:object}, '${2:method}').and.callThrough();
-endsnippet
-
-snippet scf "spy on and call fake (js)" b
-spyOn(${1:object}, '${2:method}').and.callFake(${3:function});
-endsnippet
-
-snippet ethbc "expect to have been called (js)" b
-expect(${1:target}).toHaveBeenCalled();
-endsnippet
-
-snippet nthbc "expect not to have been called (js)" b
-expect(${1:target}).not.toHaveBeenCalled();
-endsnippet
-
-snippet ethbcw "expect to have been called with (js)" b
-expect(${1:target}).toHaveBeenCalledWith(${2:arguments});
-endsnippet
-

From d21f43c210ac7b04ec1bcda39f10b03a934a9ae8 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Sat, 10 Jun 2017 00:15:59 +0200
Subject: [PATCH 1041/1587] Blade UltiSnips: make echo trigger also just after
 a non-whitespace character

It is very inconvenient if you want to trigger an echo snippet inside an HTML tag (e.g. <h1>{{  }}</h1>). This commit solves that
---
 UltiSnips/blade.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/blade.snippets b/UltiSnips/blade.snippets
index e56610c20..6a9c45f7c 100644
--- a/UltiSnips/blade.snippets
+++ b/UltiSnips/blade.snippets
@@ -124,11 +124,11 @@ snippet yield "@yield directive"
 @yield('$1')
 endsnippet
 
-snippet { "{{ }} statement."
+snippet { "{{ }} statement." i
 {{ $1 }}
 endsnippet
 
-snippet {! "{!! !!} statement"
+snippet {! "{!! !!} statement" i
 {!! $1 !!}
 endsnippet
 

From 459449bb9987a0f88c5ab3c099cc12fd69298281 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 12 Jun 2017 23:17:35 +0100
Subject: [PATCH 1042/1587] Fix JS Jasmine snippets

Fixes https://github.com/honza/vim-snippets/issues/933
---
 snippets/javascript/javascript-jasmine.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/snippets/javascript/javascript-jasmine.snippets b/snippets/javascript/javascript-jasmine.snippets
index 855a18944..7045c5f7f 100644
--- a/snippets/javascript/javascript-jasmine.snippets
+++ b/snippets/javascript/javascript-jasmine.snippets
@@ -1,5 +1,3 @@
-version 1
-
 snippet des "Describe (js)"
 	describe('${1:description}', function() {
 		$0

From 4a462103b2d5c8ed2157c66b657b5e85d3f0b218 Mon Sep 17 00:00:00 2001
From: andrew <andrew@ekohe.com>
Date: Wed, 14 Jun 2017 16:54:23 +0800
Subject: [PATCH 1043/1587] BUG #938 - You missing end parenthesis at line 19
 in haml.snippets

---
 snippets/haml.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/haml.snippets b/snippets/haml.snippets
index b8a74e27b..b1feaa51f 100644
--- a/snippets/haml.snippets
+++ b/snippets/haml.snippets
@@ -16,7 +16,7 @@ snippet rp
 snippet rpc
 	= render :partial => "${1:item}", :collection => ${0:@$1s}
 snippet rpl
-	= render :partial => "${1:item}", :locals => { :${2:$1} => ${0:@$1}
+	= render :partial => "${1:item}", :locals => { :${2:$1} => ${0:@$1} }
 snippet rpo
 	= render :partial => "${1:item}", :object => ${0:@$1}
 snippet lt

From 7bb4aeb2ab5b07c60713ac018361d1bd876a2f28 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Thu, 22 Jun 2017 09:00:42 +0200
Subject: [PATCH 1044/1587] Blade UltiSnips: add snippet for @lang directive

documented https://laravel.com/docs/5.4/localization#retrieving-translation-strings
---
 UltiSnips/blade.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/blade.snippets b/UltiSnips/blade.snippets
index 6a9c45f7c..26fde1793 100644
--- a/UltiSnips/blade.snippets
+++ b/UltiSnips/blade.snippets
@@ -76,6 +76,10 @@ snippet inject "@inject directive"
 @inject('$1', '$2')
 endsnippet
 
+snippet lang "@lang directive" i
+@lang('$1')
+endsnippet
+
 snippet php "@php directive"
 @php
 	${1:${VISUAL}}

From 63964df614e484db3592968dd045377a0d81ff8a Mon Sep 17 00:00:00 2001
From: David Briscoe <idbrii@gmail.com>
Date: Wed, 24 May 2017 12:27:34 -0700
Subject: [PATCH 1045/1587] Satisfy mktemp's X requirement

mktemp requires XXX in the filename[1], so make the inserted snippet
satisfy that requirement.

[1]: mktemp (GNU coreutils) 8.21
---
 UltiSnips/sh.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 701818451..d351e509e 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -43,7 +43,7 @@ endsnippet
 snippet temp "Tempfile"
 ${1:TMPFILE}="$(mktemp -t ${2:`!p
 snip.rv = re.sub(r'[^a-zA-Z]', '_', snip.fn) or "untitled"
-`})"
+`}.XXXXXX)"
 ${3:${4/(.+)/trap "/}${4:rm -f '$${1/.*\s//}'}${4/(.+)/" 0               # EXIT\n/}${5/(.+)/trap "/}${5:rm -f '$${1/.*\s//}'; exit 1}${5/(.+)/" 2       # INT\n/}${6/(.+)/trap "/}${6:rm -f '$${1/.*\s//}'; exit 1}${6/(.+)/" 1 15    # HUP TERM\n/}}
 
 endsnippet

From aab8f82f40a13b29dc5af4cf4d9b2ef91c07c02e Mon Sep 17 00:00:00 2001
From: David Briscoe <idbrii@gmail.com>
Date: Wed, 24 May 2017 13:19:44 -0700
Subject: [PATCH 1046/1587] Add optional suffix to temp file

Sometimes it is useful to add a suffix to make a temp file
get detected by ftdetect.
---
 UltiSnips/sh.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index d351e509e..611b1ce32 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -41,10 +41,10 @@ IFS=$'\n\t'
 endsnippet
 
 snippet temp "Tempfile"
-${1:TMPFILE}="$(mktemp -t ${2:`!p
+${1:TMPFILE}="$(mktemp -t ${3:--suffix=${4:.SUFFIX}} ${2:`!p
 snip.rv = re.sub(r'[^a-zA-Z]', '_', snip.fn) or "untitled"
 `}.XXXXXX)"
-${3:${4/(.+)/trap "/}${4:rm -f '$${1/.*\s//}'}${4/(.+)/" 0               # EXIT\n/}${5/(.+)/trap "/}${5:rm -f '$${1/.*\s//}'; exit 1}${5/(.+)/" 2       # INT\n/}${6/(.+)/trap "/}${6:rm -f '$${1/.*\s//}'; exit 1}${6/(.+)/" 1 15    # HUP TERM\n/}}
+${5:${6/(.+)/trap "/}${6:rm -f '$${1/.*\s//}'}${6/(.+)/" 0               # EXIT\n/}${7/(.+)/trap "/}${7:rm -f '$${1/.*\s//}'; exit 1}${7/(.+)/" 2       # INT\n/}${8/(.+)/trap "/}${8:rm -f '$${1/.*\s//}'; exit 1}${8/(.+)/" 1 15    # HUP TERM\n/}}
 
 endsnippet
 

From 94622013f675b864e2be9de6f3cbb7c98d429b60 Mon Sep 17 00:00:00 2001
From: Sylvain Bannier <sbannier@lafourchette.com>
Date: Sun, 25 Jun 2017 21:44:15 +0200
Subject: [PATCH 1047/1587] update PropTypes import in react snippets

Since react 15.05, PropTypes belongs to the `prop-types` package.
---
 snippets/javascript.es6.react.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/snippets/javascript.es6.react.snippets b/snippets/javascript.es6.react.snippets
index a584bb132..c9138752e 100644
--- a/snippets/javascript.es6.react.snippets
+++ b/snippets/javascript.es6.react.snippets
@@ -4,7 +4,8 @@ snippet ri1
 
 # Import both React and Component
 snippet ri2
-	import React, { Component, PropTypes } from 'react'
+	import React, { Component } from 'react'
+	import PropTypes from 'prop-types'
 
 # React class
 snippet rcla

From 3c908c54bb620a5e2e7b6aac2273e37a15bdca79 Mon Sep 17 00:00:00 2001
From: Yuji Nakao <nakaoyuji.nakao@gmail.com>
Date: Sat, 1 Jul 2017 22:37:27 +0900
Subject: [PATCH 1048/1587] Add missing semicolons after assert macros

---
 snippets/rust.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index adfd29c96..0969a1cba 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -188,6 +188,6 @@ snippet chan "Declare (Sender, Receiver) pair of asynchronous channel()"
 	let (${1:tx}, ${2:rx}): (Sender<${3:i32}>, Receiver<${4:i32}>) = channel();
 # Testing
 snippet as "assert!"
-	assert!(${1:predicate})
+	assert!(${1:predicate});
 snippet ase "assert_eq!"
-	assert_eq!(${1:expected}, ${2:actual})
+	assert_eq!(${1:expected}, ${2:actual});

From 4e45931fa693946cc6d384edbfb838dda2fb96e5 Mon Sep 17 00:00:00 2001
From: dnivra <dnivra@users.noreply.github.com>
Date: Sat, 1 Jul 2017 11:56:23 +0530
Subject: [PATCH 1049/1587] Rename TeX italics snippet to prevent collision
 with TeX item snippet

---
 snippets/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index f60f312bb..eecd885b5 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -203,7 +203,7 @@ snippet citey \citeyear
 snippet fcite \footcite[]{}
 	\\footcite[${1}]{${2}}${0}
 #Formating text: italic, bold, underline, small capital, emphase ..
-snippet it italic text
+snippet ita italic text
 	\\textit{${1:${VISUAL:text}}} ${0}
 snippet bf bold face text
 	\\textbf{${1:${VISUAL:text}}} ${0}

From 87bd8e4f572916d63ec099dd7658a4f573266896 Mon Sep 17 00:00:00 2001
From: Ilya Pekelny <pekelny@gmail.com>
Date: Mon, 3 Jul 2017 12:17:38 +0300
Subject: [PATCH 1050/1587] GO: Json marshalable object

To avoid infinity recursion when MarshalJSON method is defined required
to declare an alias type to wrap an original struct.
---
 snippets/go.snippets | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 6bc4602c9..47125f8aa 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -242,5 +242,13 @@ snippet gg
 	var ${1:var} = struct{
 		${2:name} ${3:type}
 	}{
-		${2:name}: ${4:value},
+		$2: ${4:value},
+	}
+
+# Marshalable json alias
+snippet ja
+	type ${1:parentType}Alias $1
+
+	func (p *$1) MarshalJSON() ([]byte, error) {
+		return json.Marshal(&struct{ *$1Alias }{(*$1Alias)(p)})
 	}

From 0817950a4fb8ccd48ec38a2b65cf046b597eecb3 Mon Sep 17 00:00:00 2001
From: Ricardo Berdejo <ricardo@remotto.co>
Date: Thu, 6 Jul 2017 19:46:22 -0500
Subject: [PATCH 1051/1587] changed jasmine to be defined trigger

---
 snippets/javascript/javascript-jasmine.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript-jasmine.snippets b/snippets/javascript/javascript-jasmine.snippets
index 7045c5f7f..8cae81a3d 100644
--- a/snippets/javascript/javascript-jasmine.snippets
+++ b/snippets/javascript/javascript-jasmine.snippets
@@ -80,7 +80,7 @@ snippet et "expect to be truthy (js)"
 snippet ef "expect to be falsy (js)"
 	expect(${1:target}).toBeFalsy();
 
-snippet ed "expect to be defined (js)"
+snippet etbd "expect to be defined (js)"
 	expect(${1:target}).toBeDefined();
 
 snippet eud "expect to be defined (js)"

From d6a97c12a485da5d622c7adcbe8ab97e4425b0ca Mon Sep 17 00:00:00 2001
From: Joshua <zirho6@gmail.com>
Date: Thu, 13 Jul 2017 12:30:05 -0700
Subject: [PATCH 1052/1587] add an example for javascript options

---
 UltiSnips/javascript.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 652dd707e..b6a654c7e 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -7,6 +7,14 @@ priority -50
 # The smart snippets use a global options called
 # "g:ultisnips_javascript.{option}" which can control the format
 # of trailing semicolon, space before function paren, etc.
+#
+# e.g.
+# let g:ultisnips_javascript = {
+#      \ 'keyword-spacing': 'always',
+#      \ 'semi': 'never',
+#      \ 'space-before-function-paren': 'always',
+#      \ }
+
 
 global !p
 from javascript_snippets import (

From 2657c86d942e09b753dd63f200ddd05eb5b36f34 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 28 Jul 2017 18:53:21 +0100
Subject: [PATCH 1053/1587] Elm test snippet

---
 snippets/elm.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index 7a4e3ef51..6324eeaaf 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -49,3 +49,5 @@ snippet ty
 snippet tya
 	type alias ${1:Model} =
 		${0}
+snippet test
+	test "${1}" <| \_ -> $0

From 9181f29981c0fe8d633f7dea6ce69338fe6b7a47 Mon Sep 17 00:00:00 2001
From: japrogramer <japrogramer@yahoo.com>
Date: Wed, 2 Aug 2017 18:13:18 -0500
Subject: [PATCH 1054/1587] Fixed #956 for you.

---
 UltiSnips/django.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index 8f8362882..d6e2d434f 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -292,25 +292,25 @@ endsnippet
 
 snippet createview "Generic Create View" b
 class ${1:MODEL_NAME}CreateView(CreateView):
-	model = ${1:MODEL_NAME}
+	model = $1
 	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
 snippet deleteview "Generic Delete View" b
 class ${1:MODEL_NAME}DeleteView(DeleteView):
-	model = ${1:MODEL_NAME}
+	model = $1
 	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
 snippet detailview "Generic Detail View" b
 class ${1:MODEL_NAME}DetailView(DetailView):
-	model = ${1:MODEL_NAME}
+	model = $1
 	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
 snippet listview "Generic List View" b
 class ${1:MODEL_NAME}ListView(ListView):
-	model = ${1:MODEL_NAME}
+	model = $1
 	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 
@@ -345,7 +345,7 @@ endsnippet
 
 snippet updateview "Generic Update View" b
 class ${1:MODEL_NAME}UpdateView(UpdateView):
-	model = ${1:MODEL_NAME}
+	model = $1
 	template_name = "${2:TEMPLATE_NAME}"
 endsnippet
 

From f1c5baaae4acf4885b24c9f6d0b5f51e6f2acb47 Mon Sep 17 00:00:00 2001
From: Jon Olin <github.jao@jon.tomolin.net>
Date: Fri, 11 Aug 2017 20:50:58 -0400
Subject: [PATCH 1055/1587] Fix markdown table snippets for Ultisnips

---
 UltiSnips/markdown.snippets | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index add9f7f95..0c844eccf 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -3,7 +3,7 @@ priority -50
 global !p
 def create_table(snip):
     # retrieving single line from current string and treat it like tabstops count
-    placeholders_string = snip.buffer[snip.line].strip().split("x",1)
+    placeholders_string = snip.buffer[snip.line].strip()[2:].split("x",1)
     rows_amount = int(placeholders_string[0])
     columns_amount = int(placeholders_string[1])
 
@@ -84,9 +84,8 @@ snippet fnt "Footnote"
 [^$1]:${2:Text}
 endsnippet
 
-post_jump "create_table(snip)"
+pre_expand "create_table(snip)"
 snippet "tb(\d+x\d+)" "Customizable table" br
-`!p snip.rv = match.group(1)`
 endsnippet
 
 # vim:ft=snippets:

From 36351fac5cca70de5bfc1f29132206a2935adfb6 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 19 Aug 2017 20:36:07 +0100
Subject: [PATCH 1056/1587] More Elm snippets

---
 UltiSnips/elm.snippets | 9 +++++++++
 snippets/elm.snippets  | 9 +++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 UltiSnips/elm.snippets

diff --git a/UltiSnips/elm.snippets b/UltiSnips/elm.snippets
new file mode 100644
index 000000000..6e21bb5e2
--- /dev/null
+++ b/UltiSnips/elm.snippets
@@ -0,0 +1,9 @@
+priority -50
+
+snippet impa "Qualified import"
+import ${1:Json.Encode} as ${0:`!p snip.rv = t[1].split(".")[-1]`}
+endsnippet
+
+snippet impae "Qualified import with exposing"
+import ${1:Json.Encode} as ${2:`!p snip.rv = t[1].split(".")[-1]`} exposing (${0:Value})
+endsnippet
diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index 6324eeaaf..336ee0948 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -2,9 +2,11 @@ snippet mod
 	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` exposing (${1})
 	${0}
 snippet imp
-	import ${0:List}
+	import ${0:Http}
 snippet impe
-	import ${1:List} exposing (${0:map})
+	import ${1:Html} exposing (${0:..})
+snippet impae
+	import ${1:Json.Encode} as ${2:Encode} exposing (${0:Value})
 snippet fn
 	${1:fn} : ${2:a} -> ${3:a}
 	$1 ${4} =
@@ -51,3 +53,6 @@ snippet tya
 		${0}
 snippet test
 	test "${1}" <| \_ -> $0
+snippet doc
+	{-| ${0}
+	-}

From d52a0936ede89b0fbbf122aa8d184fda1ca5ec0b Mon Sep 17 00:00:00 2001
From: Bishwa Hang Rai <bishwa@freeletics.com>
Date: Sun, 20 Aug 2017 17:42:43 +0200
Subject: [PATCH 1057/1587] Add 'priv' and 'prot' snippet. Also, add spaces
 after 'when', in 'case' statement

---
 UltiSnips/ruby.snippets | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index c61b27668..cb90a9dbb 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -302,7 +302,7 @@ endsnippet
 snippet "\b(case|sw(itch)?)" "case <variable> when <expression> ... end" r
 case ${1:variable}
 when ${2:expression}
-$0
+  $0
 end
 endsnippet
 
@@ -326,4 +326,16 @@ snippet ###
 =end
 endsnippet
 
+snippet priv "private " m
+private
+
+$0
+endsnippet
+
+snippet prot "protected" m
+protected
+
+$0
+endsnippet
+
 # vim: set ts=2 sw=2 expandtab:

From 9de9bb39a2ae5264ce6c757cff4be89e65ee84fb Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 27 Aug 2017 12:58:19 +0100
Subject: [PATCH 1058/1587] Additional Hspec snippets

---
 snippets/haskell.snippets | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index e4957e4ce..adde1929e 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -103,7 +103,22 @@ snippet spec
 	spec :: Spec
 	spec =
 		describe "${1}" $ do
-			$0
+			it "${2}" $
+				$0
+snippet specf
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (main, spec) where
+
+	import Test.Hspec
+	import Test.Hspec.Runner (configFastFail, defaultConfig, hspecWith)
+
+	main :: IO ()
+	main = hspecWith defaultConfig {configFastFail = True} spec
+
+	spec :: Spec
+	spec =
+		describe "${1}" $ do
+			it "${2}" $
+				$0
 snippet desc
 	describe "${1}" $ do
 		$0
@@ -113,3 +128,5 @@ snippet it
 snippet itp
 	it "${1}" $ property $
 		$0
+snippet sb
+	\`shouldBe\` $0

From 512ab73f11cf8ea49613767500e663e9cd36f0fe Mon Sep 17 00:00:00 2001
From: Sebastian Mueller <sebm@posteo.de>
Date: Tue, 5 Sep 2017 16:27:01 +0100
Subject: [PATCH 1059/1587] Changed visual placeholder to UltiSnip R snippets.

---
 UltiSnips/r.snippets | 62 ++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index 44624b3be..f81b0c9c2 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -1,4 +1,4 @@
-priority -50
+priority -20
 
 global !p
 import os
@@ -38,63 +38,63 @@ library("${3:${2/^(\w+)_.*$/(?1:$1)/ga}}")
 endsnippet
 
 snippet lib "Import a library"
-library(${0:package})
+library('${0:${VISUAL:package}}')
 endsnippet
 
 snippet req "Require a file"
-require(${0:package})
+require('${0:${VISUAL:package}}')
 endsnippet
 
 snippet source "Source a file"
-source('${0:file}')
+source('${0:${VISUAL:file}}')
 endsnippet
 
 snippet if "If statement"
 if ($1) {
-	$0
+	${0:${VISUAL}}
 }
 endsnippet
 
 snippet eif "Else-If statement"
 else if ($1) {
-	$0
+	${0:${VISUAL}}
 }
 endsnippet
 
 snippet el "Else statement"
 else {
-	$0
+	${0:${VISUAL}}
 }
 endsnippet
 
 snippet ife "if .. else"
 if ($1) {
-	$2
+	${2:${VISUAL}}
 } else {
-	$3
+	$0
 }
 endsnippet
 
 snippet wh "while loop"
 while($1) {
-	$2
+	${0:${VISUAL}}
 }
 endsnippet
 
 snippet for "for loop"
 for (${1:item} in ${2:list}) {
-	$3
+	${0:${VISUAL}}
 }
 endsnippet
 
 snippet fun "Function definition"
 ${1:name} <- function ($2) {
-	$0
+	${0:${VISUAL}}
 }
 endsnippet
 
 snippet ret "Return call"
-return($0)
+return(${0:${VISUAL}})
 endsnippet
 
 snippet df "Data frame"
@@ -102,51 +102,51 @@ ${1:name}[${2:rows}, ${0:cols}]
 endsnippet
 
 snippet c "c function"
-c(${0:items})
+c(${0:${VISUAL:items}})
 endsnippet
 
 snippet li "list function"
-list(${0:items})
+list(${0:${VISUAL:items}})
 endsnippet
 
 snippet mat "matrix function"
-matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
+matrix(${1:${VISUAL:data}}, nrow = ${2:rows}, ncol = ${0:cols})
 endsnippet
 
 snippet apply "apply function"
-apply(${1:array}, ${2:margin}, ${0:function})
+apply(${1:${VISUAL:array}}, ${2:margin}, ${0:function})
 endsnippet
 
 snippet lapply "lapply function"
-lapply(${1:list}, ${0:function})
+lapply(${1:${VISUAL:list}}, ${0:function})
 endsnippet
 
 snippet sapply "sapply function"
-sapply(${1:list}, ${0:function})
+sapply(${1:${VISUAL:list}}, ${0:function})
 endsnippet
 
 snippet vapply "vapply function"
-vapply(${1:list}, ${2:function}, ${0:type})
+vapply(${1:${VISUAL:list}}, ${2:function}, ${0:type})
 endsnippet
 
 snippet mapply "mapply function"
-mapply(${1:function}, ${0:...})
+mapply(${1:${VISUAL:function}}, ${0:...})
 endsnippet
 
 snippet tapply "tapply function"
-tapply(${1:vector}, ${2:index}, ${0:function})
+tapply(${1:${VISUAL:vector}}, ${2:index}, ${0:function})
 endsnippet
 
 snippet rapply "rapply function"
-rapply(${1:list}, ${0:function})
+rapply(${1:${VISUAL:list}}, ${0:function})
 endsnippet
 
 snippet pl "Plot function"
-plot(${1:x}, ${0:y})
+plot(${1:${VISUAL:x}}, ${0:y})
 endsnippet
 
 snippet ggp "ggplot2 plot"
-ggplot(${1:data}, aes(${0:aesthetics}))
+ggplot(${1:${VISUAL:data}}, aes(${0:aesthetics}))
 endsnippet
 
 snippet fis "Fisher test"
@@ -176,3 +176,15 @@ endsnippet
 snippet kvt "KV test"
 kv.test(${1:x}, ${0:y})
 endsnippet
+
+#################################
+#  easily create string vector  #
+#################################
+# Given individual words separated by spaces
+# Select words (e.g. shift-v for whole line (such as the line above)
+# then press <Tab> then type "vec", press <Tab> again to get this:
+# var <- c("#","Given","individual","words","separated","by","spaces")
+# var <- c("#","type","out","individual","words","separated","by","spaces")
+snippet vec
+${1:var} <- c("${0:${VISUAL:/ /","/g}}")
+endsnippet

From 2aa1c6c080bdb69516fdf09749de9b223043a0ba Mon Sep 17 00:00:00 2001
From: Philippe Granger <pgranger@elementai.com>
Date: Fri, 1 Sep 2017 11:09:26 -0400
Subject: [PATCH 1060/1587] Add snippet for given when then for python tests.

---
 UltiSnips/python.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 686226e73..b24e4651c 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -709,4 +709,10 @@ snippet pmdoc "pocoo style module doc string" b
 $0
 endsnippet
 
+snippet tgwt "test given when then template" b
+# given: ${1}
+# when: ${2}
+# then: ${3}
+endsnippet
+
 # vim:ft=snippets:

From 2d269ad7a77dbe0bd2d8b3df7cf26dc7ab154c75 Mon Sep 17 00:00:00 2001
From: Philippe Granger <pgranger@elementai.com>
Date: Tue, 5 Sep 2017 09:05:30 -0400
Subject: [PATCH 1061/1587] Move tgwt to snipmate format

---
 UltiSnips/python.snippets | 6 ------
 snippets/python.snippets  | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index b24e4651c..686226e73 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -709,10 +709,4 @@ snippet pmdoc "pocoo style module doc string" b
 $0
 endsnippet
 
-snippet tgwt "test given when then template" b
-# given: ${1}
-# when: ${2}
-# then: ${3}
-endsnippet
-
 # vim:ft=snippets:
diff --git a/snippets/python.snippets b/snippets/python.snippets
index 9e35a2fa0..6bd1513c0 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -181,6 +181,11 @@ snippet testcase
 
 		def test_${2:description}(self):
 			${0}
+# test given when then
+snippet tgwt
+	# given: ${1}
+	# when: ${2}
+	# then: ${3}
 snippet fut
 	from __future__ import ${0}
 #getopt

From 843ce75d16329899fd57dca44f126ab5d553bb55 Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Fri, 1 Sep 2017 21:59:39 +0800
Subject: [PATCH 1062/1587] Add pygal chart for rst

---
 UltiSnips/rst.snippets | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index 9a2b4c0c4..f83628798 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -41,6 +41,8 @@ INCLUDABLE_DIRECTIVES = ['image', 'figure', 'include']
 # http://stackoverflow.com/questions/2718196/find-all-chinese-text-in-a-string-using-python-and-regex
 CJK_RE = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-鿃豈-鶴侮-頻並-龎]', re.UNICODE)
 
+#http://www.pygal.org/en/stable/documentation/types/index.html
+CHART_TYPES = ["Line", "StackedLine", "HorizontalLine", "Bar", "StackedBar", "HorizontalBar", "Histogram", "XY", "DateLine", "TimeLine", "TimeDeltaLine", "DateTimeLine", "Pie", "Radar", "Box", "Dot", "Funnel", "Gauge", "SolidGauge", "Pyramid", "Treemap"]
 
 def has_cjk(s):
 	"""Detect if s contains CJK characters."""
@@ -299,6 +301,19 @@ snippet fnt "Footnote or Citation" i
 .. [$1] ${2:Reference}
 endsnippet
 
+# Only for Nikola — Static Site Generator
+snippet cha "pygal chart" b
+.. chart:: $1`!p snip.rv=complete(t[1], CHART_TYPES)`
+	:title: '${2:Browser usage evolution (in %)}'
+	:x_labels: [${3:"2002", "2003", "2004", "2005", "2006", "2007"}]
+	
+	'Firefox', [None, None, 0, 16.6, 25, 31]
+	'Chrome',  [None, None, None, None, None, None]
+	'IE',      [85.8, 84.6, 84.7, 74.5, 66, 58.6]
+	'Others',  [14.2, 15.4, 15.3, 8.9, 9, 10.4]
+$0
+endsnippet
+
 ############
 #  Sphinx  #
 ############

From 9547e6d89a8eba251bd1d5038eb6ec116fe40711 Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Sat, 2 Sep 2017 00:48:00 +0800
Subject: [PATCH 1063/1587] a longer trigger for pygal chart

---
 UltiSnips/rst.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index f83628798..efd8c86d9 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -302,7 +302,7 @@ snippet fnt "Footnote or Citation" i
 endsnippet
 
 # Only for Nikola — Static Site Generator
-snippet cha "pygal chart" b
+snippet chart "Pygal chart for Nikola" b
 .. chart:: $1`!p snip.rv=complete(t[1], CHART_TYPES)`
 	:title: '${2:Browser usage evolution (in %)}'
 	:x_labels: [${3:"2002", "2003", "2004", "2005", "2006", "2007"}]

From 125437df37fface8da8881a8250b9f58537c0a09 Mon Sep 17 00:00:00 2001
From: Craig Paterson <craig@widdershins.co.za>
Date: Wed, 6 Sep 2017 21:24:42 +0200
Subject: [PATCH 1064/1587] @impl true annotation

---
 snippets/elixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 4b4ef39f1..cffece642 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -129,6 +129,8 @@ snippet doc
 	${0}
 
 	"""
+snippet im
+	@impl true
 snippet docf
 	@doc false
 snippet fn

From 33865c969585920957054701c419e99837c075ca Mon Sep 17 00:00:00 2001
From: Craig Paterson <craig@widdershins.co.za>
Date: Wed, 6 Sep 2017 21:31:21 +0200
Subject: [PATCH 1065/1587] basic genserver structure

---
 snippets/elixir.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index cffece642..c239ba77d 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -199,3 +199,15 @@ snippet >i pipe to inspect
 	|> IO.inspect
 snippet >il pipe to inspect with label
 	|> IO.inspect(label: "${1:label}")
+snippet gs basic genserver structure
+	use GenServer
+
+	@doc false
+	def start_link do
+		GenServer.start_link(__MODULE__, ${1:Map.new}, name: __MODULE__)
+	end
+
+	@impl true
+	def init(state) do
+		{:ok, state}
+	end

From 2bc5a94f331a8630ac96da25816c990c36d2ae83 Mon Sep 17 00:00:00 2001
From: Craig Paterson <craig@widdershins.co.za>
Date: Thu, 7 Sep 2017 08:01:31 +0200
Subject: [PATCH 1066/1587] renamed, removed proc name, added short : version

---
 snippets/elixir.snippets | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index c239ba77d..c2acfa5d1 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -199,15 +199,23 @@ snippet >i pipe to inspect
 	|> IO.inspect
 snippet >il pipe to inspect with label
 	|> IO.inspect(label: "${1:label}")
-snippet gs basic genserver structure
+snippet genserver basic genserver structure
 	use GenServer
 
 	@doc false
 	def start_link do
-		GenServer.start_link(__MODULE__, ${1:Map.new}, name: __MODULE__)
+		GenServer.start_link(__MODULE__, ${1:Map.new})
 	end
 
 	@impl true
 	def init(state) do
 		{:ok, state}
 	end
+snippet genserver: basic genserver structure
+	use GenServer
+
+	@doc false
+	def start_link, do: GenServer.start_link(__MODULE__, ${1:Map.new})
+
+	@impl true
+	def init(state), do: {:ok, state}

From 4691751d9731447e28625a2277d3fbfe28c93ff4 Mon Sep 17 00:00:00 2001
From: Craig Paterson <craig@widdershins.co.za>
Date: Wed, 6 Sep 2017 21:25:54 +0200
Subject: [PATCH 1067/1587] Removing unnecessary empty line in doc directives

---
 snippets/elixir.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index c2acfa5d1..aa696a0e1 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -127,7 +127,6 @@ snippet defr
 snippet doc
 	@doc """
 	${0}
-
 	"""
 snippet im
 	@impl true
@@ -138,7 +137,6 @@ snippet fn
 snippet mdoc
 	@moduledoc """
 	${0}
-
 	"""
 snippet mdocf
 	@moduledoc false

From 755e6358801dccedc4270be75c62c9ed366d2c6b Mon Sep 17 00:00:00 2001
From: Craig Paterson <craig@widdershins.co.za>
Date: Wed, 6 Sep 2017 21:34:16 +0200
Subject: [PATCH 1068/1587] remove additional unnecessary whitespace

---
 snippets/elixir.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index aa696a0e1..c16d808de 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -88,7 +88,6 @@ snippet def
 snippet defd
 	@doc """
 	${1:doc string}
-
 	"""
 	def ${2:name} do
 		${0}
@@ -96,7 +95,6 @@ snippet defd
 snippet defsd
 	@doc """
 	${1:doc string}
-
 	"""
 	@spec ${2:name} :: ${3:no_return}
 	def ${2} do

From 9362e462ea6286f9072b0dc1edf023f99db6978e Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 9 Sep 2017 17:54:58 +0100
Subject: [PATCH 1069/1587] Haskell additions

---
 UltiSnips/haskell.snippets |  5 +++++
 snippets/haskell.snippets  | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 UltiSnips/haskell.snippets

diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets
new file mode 100644
index 000000000..2b18ec620
--- /dev/null
+++ b/UltiSnips/haskell.snippets
@@ -0,0 +1,5 @@
+priority -50
+
+snippet impq "Qualified import"
+import ${1:Data.Text} as ${0:`!p snip.rv = t[1].split(".")[-1]`}
+endsnippet
diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index adde1929e..d073bf116 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -31,8 +31,12 @@ snippet importq
 snippet inst
 	instance ${1:Monoid} ${2:Type} where
 		${0}
+snippet ty
+	type ${1:Type} = ${0:Type}
 snippet type
 	type ${1:Type} = ${0:Type}
+snippet da
+	data ${1:Type} = ${2:$1} ${0:Int}
 snippet data
 	data ${1:Type} = ${2:$1} ${0:Int}
 snippet newtype
@@ -54,6 +58,12 @@ snippet const
 snippet fn
 	${1:fn} :: ${2:a} -> ${3:a}
 	$1 ${4} = ${0:undefined}
+snippet fn0
+	${1:fn} :: ${2:a}
+	$1 = ${0:undefined}
+snippet fn1
+	${1:fn} :: ${2:a} -> ${3:a}
+	$1 ${4} = ${0:undefined}
 snippet fn2
 	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a}
 	$1 ${5} = ${0:undefined}
@@ -130,3 +140,6 @@ snippet itp
 		$0
 snippet sb
 	\`shouldBe\` $0
+snippet doc
+	{-| ${0}
+	-}

From d0b65293be66f6cb2406fc230a2faf50e6be6668 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 9 Sep 2017 18:04:35 +0100
Subject: [PATCH 1070/1587] Add missing keyword to Haskell snippet

---
 UltiSnips/haskell.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets
index 2b18ec620..11d82c81c 100644
--- a/UltiSnips/haskell.snippets
+++ b/UltiSnips/haskell.snippets
@@ -1,5 +1,5 @@
 priority -50
 
 snippet impq "Qualified import"
-import ${1:Data.Text} as ${0:`!p snip.rv = t[1].split(".")[-1]`}
+import qualified ${1:Data.Text} as ${0:`!p snip.rv = t[1].split(".")[-1]`}
 endsnippet

From d993ee0985197a63396188bd3fab06e8f92b14db Mon Sep 17 00:00:00 2001
From: Craig <craig@widdershins.co.za>
Date: Mon, 11 Sep 2017 12:44:02 +0200
Subject: [PATCH 1071/1587] child_spec for Elixir 1.5 workers/supervisors
 (#965)

* child_spec for Elixir 1.5 workers/supervisors

* Extra parans for child_spec opts and args
---
 snippets/elixir.snippets | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index c16d808de..4243910ab 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -195,6 +195,17 @@ snippet >i pipe to inspect
 	|> IO.inspect
 snippet >il pipe to inspect with label
 	|> IO.inspect(label: "${1:label}")
+snippet cs
+	@doc false
+	def child_spec(${1:_opts}) do
+		%{
+			id: __MODULE__,
+			start: {__MODULE__, :start_link, ${2:[]}},
+			restart: ${3::permanent},
+			shutdown: ${4:5000},
+			type: ${5::worker}
+		}
+	end
 snippet genserver basic genserver structure
 	use GenServer
 

From 5ed14e14190ba71360c6cc688945fba2306f2357 Mon Sep 17 00:00:00 2001
From: Ram-Z <me@rmz.io>
Date: Mon, 18 Sep 2017 15:30:14 +0100
Subject: [PATCH 1072/1587] VERSION needs to be uppercase (#969)

---
 snippets/cmake.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/cmake.snippets b/snippets/cmake.snippets
index 3a0b920ea..54b956629 100644
--- a/snippets/cmake.snippets
+++ b/snippets/cmake.snippets
@@ -1,5 +1,5 @@
 snippet init
-	cmake_minimum_required(version ${1:2.8.2})
+	cmake_minimum_required(VERSION ${1:2.8.2})
 	project(${2:ProjectName})
 
 	find_package(${3:library})
@@ -16,7 +16,7 @@ snippet proj
 	project(${0:Name})
 
 snippet min
-	cmake_minimum_required(version ${0:2.8.2})
+	cmake_minimum_required(VERSION ${0:2.8.2})
 
 snippet include
 	include_directories(${${0:include_dir}})

From 2b19cde7535e7502138fb31f0b7831613b040161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20M?= <L4in@users.noreply.github.com>
Date: Mon, 18 Sep 2017 16:32:37 +0200
Subject: [PATCH 1073/1587] it snippet no longer insert tabs and newlines
 (#971)

---
 UltiSnips/tex.snippets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index b72ed3eaa..3dd458857 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -59,8 +59,7 @@ snippet desc "Description" b
 endsnippet
 
 snippet it "Individual item" b
-\item $1
-$0
+\item $0
 endsnippet
 
 snippet part "Part" b

From ab69f01730af77ab9948b6679ffb2cf6b8e76b49 Mon Sep 17 00:00:00 2001
From: Neil Edwards <neil@plasticwater.com>
Date: Thu, 21 Sep 2017 06:33:47 -0400
Subject: [PATCH 1074/1587] Remove trailing space after export default { }
 (#979)

Vue-CLI default linting rules complain about trailing spaces, removed.
---
 snippets/vue.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/vue.snippets b/snippets/vue.snippets
index 63764f848..53e7cce9e 100644
--- a/snippets/vue.snippets
+++ b/snippets/vue.snippets
@@ -29,7 +29,7 @@ snippet vbase
 	<script>
 		export default{
 
-		}	
+		}
 	</script>
 	<style scoped>
 

From 41ca10c24a03953094cd13462037b312eedaa08e Mon Sep 17 00:00:00 2001
From: Skyler Lewis <sblnog@gmail.com>
Date: Fri, 22 Sep 2017 12:44:49 -0600
Subject: [PATCH 1075/1587] Update python.snippets (#970)

---
 snippets/python.snippets | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 6bd1513c0..89bc4599f 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -33,6 +33,9 @@ snippet dowh
 snippet with
 	with ${1:expr} as ${2:var}:
 		${0:${VISUAL}}
+snippet awith
+	async with ${1:expr} as ${2:var}:
+		${0:${VISUAL}}
 # New Class
 snippet cl
 	class ${1:ClassName}(${2:object}):
@@ -49,10 +52,21 @@ snippet def
 snippet deff
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
 		${0}
+snippet adef
+	async def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
+		"""${3:docstring for $1}"""
+		${0}
+snippet adeff
+	async def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
+		${0}
 # New Method
 snippet defm
 	def ${1:mname}(self, ${2:arg}):
 		${0}
+snippet adefm
+	async def ${1:mname}(self, ${2:arg}):
+		${0}
+
 # New Property
 snippet property
 	def ${1:foo}():

From 4c2551f4a834eaa612fc27f220dbefcd8da97027 Mon Sep 17 00:00:00 2001
From: justeph <31988046+justeph@users.noreply.github.com>
Date: Fri, 22 Sep 2017 20:46:14 +0200
Subject: [PATCH 1076/1587] Add snippets for lua (#972)

---
 snippets/lua.snippets | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/snippets/lua.snippets b/snippets/lua.snippets
index b7de2deb3..84aaa0bee 100644
--- a/snippets/lua.snippets
+++ b/snippets/lua.snippets
@@ -19,3 +19,28 @@ snippet fori
 	for ${1:i},${2:v} in ipairs(${3:table_name}) do
 	   ${0:-- body}
 	end
+snippet if
+	if ${1:condition} then
+		${2:-- body}
+	end
+snippet ife
+	if ${1:condition} then
+		${2:-- if condition}
+	else
+		${0:-- else}
+	end
+snippet elif
+	elseif ${1:condition} then
+		${0:--body}
+snippet repeat
+	repeat
+		${1:--body}
+	until ${0:condition}
+snippet while
+	while ${1:condition} do
+		${0:--body}
+	end
+snippet print
+	print("${1:string}")
+snippet im
+	import "${1:import file}"

From d14c155d5d157904c976774f98551cc755a4a328 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 22 Sep 2017 19:47:08 +0100
Subject: [PATCH 1077/1587] Correct Lua indentation

---
 snippets/lua.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/lua.snippets b/snippets/lua.snippets
index 84aaa0bee..ff6c0619b 100644
--- a/snippets/lua.snippets
+++ b/snippets/lua.snippets
@@ -13,11 +13,11 @@ snippet for
 	end
 snippet forp
 	for ${1:i},${2:v} in pairs(${3:table_name}) do
-	   ${0:-- body}
+		${0:-- body}
 	end
 snippet fori
 	for ${1:i},${2:v} in ipairs(${3:table_name}) do
-	   ${0:-- body}
+		${0:-- body}
 	end
 snippet if
 	if ${1:condition} then

From e9b869380dd96bbfae65daccc4ad46d8db7547fd Mon Sep 17 00:00:00 2001
From: Victor Alvarez <v.alvarez312@gmail.com>
Date: Fri, 22 Sep 2017 14:48:55 -0700
Subject: [PATCH 1078/1587] Python comprehensions (#975)

* comprehensions

* rm copy-pasta

* put back pragram
---
 snippets/python.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 89bc4599f..7fbd72777 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -259,3 +259,10 @@ snippet kwargs
 	**kwargs${1:,}${0}
 snippet akw
 	*args, **kwargs${1:,}${0}
+
+# comprehensions
+snippet lcp list comprehension
+	[${1} for ${2} in ${3:${VISUAL}}]${0}
+
+snippet dcp dict comprehension
+	{${1}: ${2} for ${3} in ${4:${VISUAL}}}${0}

From d9a8ac3ce385ade985ff49adbacd9b7c7c4af9e2 Mon Sep 17 00:00:00 2001
From: Benjamin Krein <superbenk@gmail.com>
Date: Sun, 24 Sep 2017 19:08:42 -0400
Subject: [PATCH 1079/1587] add 'notify' resource snippet (#981)

---
 snippets/puppet.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index 9e9ceeb2b..838861121 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -214,6 +214,9 @@ snippet mount
 		device	=> "${0:device name or path}",
 	}
 
+snippet notify
+	notify { "${1:message}": }
+
 snippet package
 	package { "${1:package name}":
 		ensure	=> ${0:present},

From 8216257c9d05bb4bd277ea4d2f215247fa515d90 Mon Sep 17 00:00:00 2001
From: Joseph An <an.joseph891@gmail.com>
Date: Mon, 25 Sep 2017 15:09:26 -0400
Subject: [PATCH 1080/1587] p to pipe operator snippet for elixir (#982)

* p to pipe operator snippet

I noticed there was a missing snippet simply for `|>` which is used frequently.
This has prevented me from repositioning my hand every time I wanted to input a pipe.

* Add space after pipe in Elixir
---
 snippets/elixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 4243910ab..3ebc5d4f2 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -183,6 +183,8 @@ snippet qu
 snippet beh
 	@behaviour ${1:Mix.Task}
 	${0}
+snippet p
+	|> ${0}
 snippet >e pipe to each
 	|> Enum.each(fn ${1} -> ${0} end)
 snippet >m pipe to map

From 0489ddf6fa24df63214888d3d51cecd1254af66d Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 25 Sep 2017 20:20:42 +0100
Subject: [PATCH 1081/1587] Elm pipe + program

---
 snippets/elm.snippets | 44 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index 336ee0948..d2bace3db 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -56,3 +56,47 @@ snippet test
 snippet doc
 	{-| ${0}
 	-}
+snippet p
+	|> ${0}
+snippet program
+	import Html exposing (Html)
+
+
+	type alias Model =
+		{}
+
+
+	type Msg
+		= Noop
+
+
+	main : Program Never Model Msg
+	main =
+		Html.program
+			{ init = init
+			, view = view
+			, update = update
+			, subscriptions = subscriptions
+			}
+
+
+	init : ( Model, Cmd Msg )
+	init =
+		{} ! []
+
+
+	update : Msg -> Model -> ( Model, Cmd Msg )
+	update msg model =
+		case msg of
+			Noop ->
+				model ! []
+
+
+	subscriptions : Model -> Sub Msg
+	subscriptions model =
+		Sub.none
+
+
+	view : Model -> Html Msg
+	view model =
+		Html.text "Hello, sailor!"

From 0d3ab1410fad2e1962d2c79166c80fbc24ca5a92 Mon Sep 17 00:00:00 2001
From: Victor Alvarez <v.alvarez312@gmail.com>
Date: Wed, 27 Sep 2017 11:01:36 -0700
Subject: [PATCH 1082/1587] Adding set comprehension (#983)

* comprehensions

* rm copy-pasta

* put back pragram

* adding set comprehension
---
 snippets/python.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 7fbd72777..72ce42d0e 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -266,3 +266,6 @@ snippet lcp list comprehension
 
 snippet dcp dict comprehension
 	{${1}: ${2} for ${3} in ${4:${VISUAL}}}${0}
+
+snippet scp set comprehension
+	{${1} for ${2} in ${3:${VISUAL}}}${0}

From 755c95fa3985d97a26a94daf94d4ca11aa5f7381 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <github@thequod.de>
Date: Wed, 4 Oct 2017 19:03:16 +0200
Subject: [PATCH 1083/1587] python: make pdb (alike) snippets oneliners (#985)

This allows for them to be used in a lambda, and avoids warnings like
"module import not at the beginning of file" etc from linters.

It also makes it easier to remove, and the `__import__` makes it stand
out even more (when you deal with multiple `set_trace` instances).
---
 snippets/python.snippets | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 72ce42d0e..826b11689 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -142,43 +142,33 @@ snippet _
 	__${1:init}__
 # python debugger (pdb)
 snippet pdb
-	import pdb
-	pdb.set_trace()
+	__import__('pdb').set_trace()
 # bpython debugger (bpdb)
 snippet bpdb
-	import bpdb
-	bpdb.set_trace()
+	__import__('bpdb').set_trace()
 # ipython debugger (ipdb)
 snippet ipdb
-	import ipdb
-	ipdb.set_trace()
+	__import__('ipdb').set_trace()
 # embed ipython itself
 snippet iem
-	import IPython
-	IPython.embed()
+	__import__('IPython').embed()
 # remote python debugger (rpdb)
 snippet rpdb
-	import rpdb
-	rpdb.set_trace()
+	__import__('rpdb').set_trace()
 # web python debugger (wdb)
 snippet wdb
-	import wdb
-	wdb.set_trace()
+	__import__('wdb').set_trace()
 # ptpython
 snippet ptpython
-	from ptpython.repl import embed
-	embed(globals(), locals(), vi_mode=${1:False}, history_filename=${2:None})
+	__import__('ptpython.repl', fromlist=('repl')).embed(globals(), locals(), vi_mode=${1:False}, history_filename=${2:None})
 # python console debugger (pudb)
 snippet pudb
-	import pudb
-	pudb.set_trace()
+	__import__('pudb').set_trace()
 # pdb in nosetests
 snippet nosetrace
-	from nose.tools import set_trace
-	set_trace()
+	__import__('nose').tools.set_trace()
 snippet pprint
-	import pprint
-	pprint.pprint(${1})
+	__import__('pprint').pprint(${1})
 snippet "
 	"""${0:doc}
 	"""

From 40a9fcf0c9c514ef6190e780abca924f55256144 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <github@thequod.de>
Date: Wed, 4 Oct 2017 19:03:38 +0200
Subject: [PATCH 1084/1587] python: use LOGGER instead of logger (#986)

It is a constant usually, and should therefore be uppercase.

This pleases pylint (C0103).
---
 snippets/python.snippets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 826b11689..3e2ebed97 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -213,18 +213,18 @@ snippet getopt
 # glog = get log
 snippet glog
 	import logging
-	logger = logging.getLogger(${0:__name__})
+	LOGGER = logging.getLogger(${0:__name__})
 snippet le
-	logger.error(${0:msg})
+	LOGGER.error(${0:msg})
 # conflict with lambda=ld, therefor we change into Logger.debuG
 snippet lg
-	logger.debug(${0:msg})
+	LOGGER.debug(${0:msg})
 snippet lw
-	logger.warning(${0:msg})
+	LOGGER.warning(${0:msg})
 snippet lc
-	logger.critical(${0:msg})
+	LOGGER.critical(${0:msg})
 snippet li
-	logger.info(${0:msg})
+	LOGGER.info(${0:msg})
 snippet epydoc
 	"""${1:Description}
 

From 95eeeeefa77e14291bb7aca801a5cb98859bd241 Mon Sep 17 00:00:00 2001
From: pawel-slowik <pawel-slowik@users.noreply.github.com>
Date: Wed, 4 Oct 2017 19:03:54 +0200
Subject: [PATCH 1085/1587] Fix a typo in HTML legend snippet (#987)

---
 UltiSnips/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 04802770d..969bbaa7e 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -318,7 +318,7 @@ snippet label "<label>"
 endsnippet
 
 snippet legend "<legend>"
-<legend>$1</leyend>
+<legend>$1</legend>
 endsnippet
 
 snippet li "list item" w

From 4ea401e9b8f82a511ea7c3b63037c3ac840b97a1 Mon Sep 17 00:00:00 2001
From: Joseph An <an.joseph891@gmail.com>
Date: Wed, 4 Oct 2017 13:04:11 -0400
Subject: [PATCH 1086/1587] IEx.pry snippet for embedded elixir (#988)

---
 snippets/eelixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 6286cee41..84caaba64 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -32,3 +32,5 @@ snippet ff
 
 		<%= submit "Submit" %>
 	<% end %>
+snippet pry
+	<% require IEx; IEx.pry %>

From 92b03cc855f6e7d70a46ec13cc02dd61730ade57 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 9 Oct 2017 17:31:09 +0100
Subject: [PATCH 1087/1587] ReasonML snippets

---
 snippets/reason.snippets | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 snippets/reason.snippets

diff --git a/snippets/reason.snippets b/snippets/reason.snippets
new file mode 100644
index 000000000..f171ffeea
--- /dev/null
+++ b/snippets/reason.snippets
@@ -0,0 +1,38 @@
+snippet doc
+	/*
+		${0}
+	 */
+snippet let
+	let ${1} = ${0};
+snippet fn
+	let ${1} => {
+		${0}
+	};
+snippet fn0
+	let ${1} () => {
+		${0}
+	};
+snippet fun
+	fun ${1} => ${0}
+snippet ty
+	type ${1} = ${1};
+snippet mod
+	module ${1} = {
+		${0}
+	};
+snippet modty
+	module type ${1} = {
+		${0}
+	};
+snippet sw
+	switch ${1} {
+	| ${2} => ${0}
+	}
+snippet |
+	| ${1} => ${0}
+snippet if
+	if (${1}) {
+		${2}
+	} else {
+		${0}
+	}

From 88d93290099df77e392263db96c456a16697ed98 Mon Sep 17 00:00:00 2001
From: Alex Pilon <alp+github@alexpilon.ca>
Date: Thu, 12 Oct 2017 04:26:23 -0400
Subject: [PATCH 1088/1587] Remove unnecessary executable permission from some
 snippets (#990)

These aren't executed; they're parsed. The operating system doesn't
`exec` them or the like.

Fixes: fe8c9a96 (Add snippets for the Processing Programming Language)
Fixes: 4fb78b3a (add MATLAB snippets)
---
 snippets/matlab.snippets     | 0
 snippets/processing.snippets | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 snippets/matlab.snippets
 mode change 100755 => 100644 snippets/processing.snippets

diff --git a/snippets/matlab.snippets b/snippets/matlab.snippets
old mode 100755
new mode 100644
diff --git a/snippets/processing.snippets b/snippets/processing.snippets
old mode 100755
new mode 100644

From 7a250bd0cd250b55ad6d38ace207c41feee2495e Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 12 Oct 2017 21:19:54 +0100
Subject: [PATCH 1089/1587] Purescript doc

---
 snippets/purescript.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/purescript.snippets b/snippets/purescript.snippets
index cdbcbd2ce..1df64af01 100644
--- a/snippets/purescript.snippets
+++ b/snippets/purescript.snippets
@@ -55,3 +55,6 @@ snippet if
 		${2:${VISUAL}}
 	else
 		${0}
+snippet doc
+	{-| ${0}
+	-}

From bd3762c916fbd229fec28fec42024c483e4cd201 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 13 Oct 2017 17:06:34 +0100
Subject: [PATCH 1090/1587] Purescript types, FFI

---
 snippets/purescript.snippets | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/snippets/purescript.snippets b/snippets/purescript.snippets
index 1df64af01..3e3a5bdd5 100644
--- a/snippets/purescript.snippets
+++ b/snippets/purescript.snippets
@@ -58,3 +58,14 @@ snippet if
 snippet doc
 	{-| ${0}
 	-}
+snippet ty
+	type ${1:Type} =
+		${0}
+snippet da
+	data ${1:Type} =
+		${0:$1}
+snippet nty
+	newtype ${1:Type} =
+		${2:$1} ${0:Int}
+snippet fi
+	foreign import ${1} :: ${2}

From 917310b3d66f46b69f077224fd067187b6003326 Mon Sep 17 00:00:00 2001
From: Caleb Bassi <calebjbassi@gmail.com>
Date: Sat, 21 Oct 2017 22:08:41 -0700
Subject: [PATCH 1091/1587] javascript-openui5 Snippet was in wrong folder

---
 .../javascript-openui5.snippets               | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)
 rename {UltiSnips => snippets}/javascript-openui5.snippets (91%)

diff --git a/UltiSnips/javascript-openui5.snippets b/snippets/javascript-openui5.snippets
similarity index 91%
rename from UltiSnips/javascript-openui5.snippets
rename to snippets/javascript-openui5.snippets
index db4481cdc..86122c70c 100644
--- a/UltiSnips/javascript-openui5.snippets
+++ b/snippets/javascript-openui5.snippets
@@ -1,11 +1,11 @@
 snippet sapmlabel
-	var $1 = new sap.m.Label({ 
-				design : $2, 
-				text : $3, 
-				visible : $4, 
-				textAlign : $5, 
-				textDirection : $6, 
-				width : $7, 
+	var $1 = new sap.m.Label({
+				design : $2,
+				text : $3,
+				visible : $4,
+				textAlign : $5,
+				textDirection : $6,
+				width : $7,
 				required : $7
 			});
 
@@ -76,7 +76,7 @@ snippet sapmvbox
 snippet sapcomponent
 	sap.ui.controller("$1", {
 	   onInit: function(){
-	   }, 
+	   },
 	   onAfterRendering: function() {
 	   },
 	   onAfterRendering: function() {
@@ -96,9 +96,9 @@ snippet sapminput
 		placeholder : $8,
 		editable : $9,
 		type : $10,
-		maxLength :$11, 
-		valueStateText :$12, 
-		showValueStateMessage :$13, 
+		maxLength :$11,
+		valueStateText :$12,
+		showValueStateMessage :$13,
 		dateFormat :$14,
 		showValueHelp :$15,
 		showSuggestion :$16,
@@ -114,7 +114,7 @@ snippet sapminput
 		suggestionColumns : [$26],
 		suggestionRows : [$27],
 		liveChange : $28,
-		valueHelpRequest :$29, 
+		valueHelpRequest :$29,
 		suggest : $30,
 		suggestionItemSelected : $31
 	});
@@ -165,41 +165,41 @@ snippet sapicon
 					visible :$11 , //boolean (default: true)
 					decorative : $12 ,//boolean (default: true)
 				});
-snippet extendVerticalL 
+snippet extendVerticalL
 	sap.ui.layout.VerticalLayout.extend("$1", {
 	    metadata: {
 		properties: {
-		  	$2 
+		  	$2
 		},
 		aggregations: {
-			$3	
+			$3
 		},
 		events: {
 			$4
 		}
 	    },
 	   init: function(){
-		$5	
+		$5
 	    },
-	    
+
 	    renderer: "$6"
-	});	
-snippet extendHorizontalL 
+	});
+snippet extendHorizontalL
 	sap.ui.layout.HorizontalLayout.extend("$1", {
 	    metadata: {
 		properties: {
-		  	$2 
+		  	$2
 		},
 		aggregations: {
-			$3	
+			$3
 		},
 		events: {
 			$4
 		}
 	    },
 	   init: function(){
-		$5	
+		$5
 	    },
-	    
+
 	    renderer: "$6"
-	});	
+	});

From cec65178016e6e32675a393846f5a9f48bd91ec1 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 24 Oct 2017 05:42:24 -0400
Subject: [PATCH 1092/1587] Update Dart snippets to 1.0.0 syntax (#997)

* Update dart.snippets

* Update dart.snippets

* Update dart.snippets

* Update dart.snippets

* Update dart.snippets
---
 snippets/dart.snippets | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index 78625c6c8..de5cb6239 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -1,14 +1,15 @@
 snippet lib
-	#library('${1}');
+	library ${1};
 	${0}
 snippet im
-	#import('${1}');
-	${0}
-snippet so
-	#source('${1}');
+	import 'package:${1}/${2}.dart';
 	${0}
+snippet rgx
+	new RegExp(r'${1}')
+snippet var
+	var ${1} = ${2};
 snippet main
-	static void main() {
+	main() {
 	  ${0}
 	}
 snippet st

From 8bad6f5991d2c955c1ad7c464d1d0de716afc970 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 27 Oct 2017 13:23:41 +0100
Subject: [PATCH 1093/1587] Elixir impl

---
 snippets/elixir.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 3ebc5d4f2..83573d3e3 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -228,3 +228,8 @@ snippet genserver: basic genserver structure
 
 	@impl true
 	def init(state), do: {:ok, state}
+snippet impl
+	@impl true
+	def ${1:name} do
+		${0}
+	end

From 7d63514979a635d930ebcc7ed29bcff586b4f461 Mon Sep 17 00:00:00 2001
From: Mohamed Boughaba <mohamed.bgb@gmail.com>
Date: Fri, 27 Oct 2017 23:43:20 +0200
Subject: [PATCH 1094/1587] Add useful vimscript snippets (#999)

---
 snippets/vim.snippets | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index c604d9a6a..ee2af1e1e 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -50,3 +50,19 @@ snippet bun Vundle.vim Plugin definition
 	Plugin '${0}'
 snippet plug Vundle.vim Plugin definition
 	Plugin '${0}'
+snippet let
+	let ${1:variable} = ${0: value}
+snippet se
+	set ${1:setting};
+snippet set
+	set ${1:setting} = ${0:value}
+snippet nn
+	nnoremap ${1} ${2}<CR>
+snippet no
+	noremap ${1} ${2}
+snippet vm
+	vmap ${1} ${2}
+snippet im
+	imap ${1} ${2}
+snippet exe
+	execute ${1}

From 221a77d5c153ee76d854d6b3d8a45a74994e9b86 Mon Sep 17 00:00:00 2001
From: Marcelo D Montu <marcelo.montu@symphony.com>
Date: Fri, 27 Oct 2017 19:43:38 -0200
Subject: [PATCH 1095/1587] Add snippets for Robot Framework (#991)

---
 UltiSnips/robot.snippets | 340 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 340 insertions(+)
 create mode 100644 UltiSnips/robot.snippets

diff --git a/UltiSnips/robot.snippets b/UltiSnips/robot.snippets
new file mode 100644
index 000000000..dacbeee7c
--- /dev/null
+++ b/UltiSnips/robot.snippets
@@ -0,0 +1,340 @@
+##############################################################################
+#                   Robot Framework Snippets for UltiSnips                   #
+##############################################################################
+
+priority -50
+
+######################
+#  Built In library  #
+######################
+snippet cat "Catenate"
+Catenate    SEPARATOR=${1:---}    ${2:Hello}    ${3:world}
+endsnippet
+
+snippet eval "Evaluate"
+\${${1:val}}=    Evaluate    ${2:${x} - 10}
+endsnippet
+
+snippet for "FOR loop" b
+:FOR    ${${1:element}}    IN    ${2:@{ELEMENTS}}
+\    ${0:${VISUAL:Start Element}}    ${$1}
+endsnippet
+
+snippet nop "No Operation"
+No Operation
+endsnippet
+
+snippet rfk "Return From Keyword"
+Return From Keyword    ${1:${optional return value}}
+endsnippet
+
+snippet rfki "Return From Keyword If"
+Return From Keyword If    ${1:${condition}}    ${2:${optional return value}}
+endsnippet
+
+snippet rk "Run Keyword"
+Run Keyword    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rkacof "Run Keyword And Continue On Failure"
+Run Keyword And Continue On Failure    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rkaee "Run Keyword And Expect Error"
+Run Keyword And Expect Error    ${1:My error}    ${2:${kw}}    ${3:${args}}
+endsnippet
+
+snippet rkaie "Run Keyword And Ignore Error"
+Run Keyword And Ignore Error    ${1:${kw}}    ${2:${args}}
+\${${3:result}}    \${${4:return_value}}=    Run Keyword And Ignore Error    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rkar "Run Keyword And Return"
+Run Keyword And Return    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rkari "Run Keyword And Return If"
+Run Keyword And Return If    ${1:{condition}}    ${2:${kw}}    ${3:${args}}
+endsnippet
+
+snippet rkars "Run Keyword And Return Status"
+\${${3:result}}=    Run Keyword And Return Status    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rki "Run Keyword If"
+Run Keyword If    ${1:${rc} < 0}    ${2:${VISUAL:Some keyword returning a value}}
+...    ELSE IF    ${3:'${str}' == 'abc'}    ${4:Another keyword}
+...    ELSE    ${5:Final keyword}
+endsnippet
+
+snippet rkiactf "Run Keyword If Any Critical Tests Failed"
+Run Keyword If Any Critical Tests Failed    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rkiactp "Run Keyword If All Critical Tests Passed"
+Run Keyword If All Critical Tests Passed    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rkiatf "Run Keyword If Any Tests Failed"
+Run Keyword If Any Tests Failed    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rkiatp "Run Keyword If All Tests Passed"
+Run Keyword If All Tests Passed    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rkitf "Run Keyword If Test Failed"
+Run Keyword If Test Failed    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rkitp "Run Keyword If Test Passed"
+Run Keyword If Test Passed    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rkito "Run Keyword If Timeout Occurred"
+Run Keyword If Timeout Occurred    ${1:${kw}}    ${2:${args}}
+endsnippet
+
+snippet rks "Run Keywords"
+Run Keywords
+...    ${1:${VISUAL:Initialize database    $\{DB NAME\}}}    AND
+...    ${2:Clear logs}
+endsnippet
+
+snippet rku "Run Keyword Unless"
+Run Keyword Unless    ${1:${condition}}    ${2:${kw}}    ${3:${args}}
+endsnippet
+
+snippet sgv "Set Global Variable"
+Set Global Variable    \${${1:name}}    ${2:${value}}
+endsnippet
+
+snippet sleep "Sleep"
+Sleep    ${1:2 minutes 10 seconds}
+endsnippet
+
+snippet ssv "Set Suite Variable"
+Set Suite Variable    \${${1:name}}    ${2:${value}}
+endsnippet
+
+snippet stv "Set Test Variable"
+Set Test Variable    \${${1:name}}    ${2:${value}}
+endsnippet
+
+snippet sv "Set Variable"
+Set Variable    \${${1:name}}    ${2:${value}}
+endsnippet
+
+snippet svi "Set Variable If"
+\${${1:var}}=    Set Variable If    ${2:${condition}}    ${3:${value true}}    ${4:${value false}}
+endsnippet
+
+snippet wuks "Wait Until Keyword Succeeds"
+Wait Until Keyword Succeeds    ${1:10x}    ${2:2s}    ${3:${VISUAL:Some Keyword}}
+endsnippet
+
+
+#####################
+#  Dialogs library  #
+#####################
+snippet pause "Pause test execution"
+Import library    Dialogs
+Pause execution
+endsnippet
+
+
+##############################
+#  Selenium2Library library  #
+##############################
+snippet cps "Capture Page Screenshot"
+Capture Page Screenshot    ${1:${optional filename}}
+endsnippet
+
+snippet esbd "Element Should Be Disabled"
+Element Should Be Disabled    \${${1:locator}}
+endsnippet
+
+snippet esbe "Element Should Be Enabled"
+Element Should Be Enabled    ${${1:locator}}
+endsnippet
+
+snippet esbf "Element Should Be Focused"
+Element Should Be Focused    ${${1:locator}}
+endsnippet
+
+snippet esbv "Element Should Be Visible"
+Element Should Be Visible    ${${1:locator}}    ${2:${optional message}}
+endsnippet
+
+snippet esc "Element Should Contain"
+Element Should Contain    ${${1:locator}}    ${2:${expected}}    ${3:${optional message}}
+endsnippet
+
+snippet esnbv "Element Should Not Be Visible"
+Element Should Not Be Visible    ${${1:locator}}    ${2:${optional message}}
+endsnippet
+
+snippet esnc "Element Should Not Contain"
+Element Should Not Contain    ${${1:locator}}    ${2:${expected}}    ${3:${optional message}}
+endsnippet
+
+snippet etsb "Element Text Should Be"
+Element Text Should Be    ${${1:locator}}    ${2:${expected}}    ${3:${optional message}}
+endsnippet
+
+snippet eaj "Execute Async Javascript"
+Execute Async Javascript    ${1:${code line 1}}    ${2:${code line 2}}
+endsnippet
+
+snippet ej "Execute Javascript"
+Execute Javascript    ${1:${code line 1}}    ${2:${code line 2}}
+endsnippet
+
+snippet gwp "Get Window Position"
+\${${1:x}}    \${${2:y}}=    Get Window Position
+endsnippet
+
+snippet gws "Get Window Size"
+\${${1:width}}    \${${2:height}}=    Get Window Size
+endsnippet
+
+snippet mbw "Maximize Browser Window"
+Maximize Browser Window
+endsnippet
+
+snippet md "Mouse Down"
+Mouse Down    ${${1:locator}}
+endsnippet
+
+snippet mdoi "Mouse Down On Image"
+Mouse Down On Image    ${1:${locator}}
+endsnippet
+
+snippet mdol "Mouse Down On Link"
+Mouse Down On Link    ${1:${locator}}
+endsnippet
+
+snippet mout "Mouse Out"
+Mouse Out    ${1:${locator}}
+endsnippet
+
+snippet mover "Mouse Over"
+Mouse Over    ${1:${locator}}
+endsnippet
+
+snippet mu "Mouse Up"
+Mouse Up    ${1:${locator}}
+endsnippet
+
+snippet ob "Open Browser"
+Open Browser    ${1:${url}}    ${2:${browser=firefox}}    ${3:${alias=None}}    ${4:${remote_url=False}}    ${5:${desired_capabilities=None}}    ${6:${ff_profile_dir=None}}
+endsnippet
+
+snippet ocm "Open Context Menu"
+Open Context Menu    ${1:${locator}}
+endsnippet
+
+snippet psc "Page Should Contain"
+Page Should Contain    ${1:${text}}    ${2:loglevel=INFO}
+endsnippet
+
+snippet pscb "Page Should Contain Button"
+Page Should Contain Button    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet pscc "Page Should Contain Checkbox"
+Page Should Contain Checkbox    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet psce "Page Should Contain Element"
+Page Should Contain Element    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet psci "Page Should Contain Image"
+Page Should Contain Image    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet pscl "Page Should Contain Link"
+Page Should Contain Link    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet pscrb "Page Should Contain Radio Button"
+Page Should Contain Radio Button    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet psct "Page Should Contain Textfield"
+Page Should Contain Textfield    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet psnc "Page Should Not Contain"
+Page Should Not Contain    ${1:${text}}    ${2:loglevel=INFO}
+endsnippet
+
+snippet psncb "Page Should Not Contain Button"
+Page Should Not Contain Button    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet psncc "Page Should Not Contain Checkbox"
+Page Should Not Contain Checkbox    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet psnce "Page Should Not Contain Element"
+Page Should Not Contain Element    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet psnci "Page Should Not Contain Image"
+Page Should Not Contain Image    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet psncl "Page Should Not Contain Link"
+Page Should Not Contain Link    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet psncrb "Page Should Not Contain Radio Button"
+Page Should Not Contain Radio Button    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet psnct "Page Should Not Contain Textfield"
+Page Should Not Contain Textfield    ${1:${locator}}    ${2:${message=}}    ${3:loglevel=INFO}
+endsnippet
+
+snippet rktrof "Register Keyword To Run On Failure"
+Register Keyword To Run On Failure    ${1:${kw}}
+endsnippet
+
+snippet wuec "Wait Until Element Contains"
+Wait Until Element Contains    ${1:${locator}}    ${2:${text}}    ${3:${timeout=None}}    ${4:${error=None}}
+endsnippet
+
+snippet wuednc "Wait Until Element Does Not Contain"
+Wait Until Element Does Not Contain    ${1:${locator}}    ${2:${text}}    ${3:${timeout=None}}    ${4:${error=None}}
+endsnippet
+
+snippet wueie "Wait Until Element Is Enabled"
+Wait Until Element Is Enabled    ${1:${locator}}    ${2:${timeout=None}}    ${3:${error=None}}
+endsnippet
+
+snippet wueinv "Wait Until Element Is Not Visible"
+Wait Until Element Is Not Visible    ${1:${locator}}    ${2:${timeout=None}}    ${3:${error=None}}
+endsnippet
+
+snippet wueiv "Wait Until Element Is Visible"
+Wait Until Element Is Visible    ${1:${locator}}    ${2:${timeout=None}}    ${3:${error=None}}
+endsnippet
+
+snippet wupc "Wait Until Page Contains"
+Wait Until Page Contains    ${1:${text}}    ${2:${timeout=None}}    ${3:${error=None}}
+endsnippet
+
+snippet wupce "Wait Until Page Contains Element"
+Wait Until Page Contains Element    ${1:${locator}}    ${2:${timeout=None}}    ${3:${error=None}}
+endsnippet
+
+snippet wupdnc "Wait Until Page Does Not Contain"
+Wait Until Page Does Not Contain    ${1:${text}}    ${2:${timeout=None}}    ${3:${error=None}}
+endsnippet
+
+snippet wupdnce "Wait Until Page Does Not Contain Element"
+Wait Until Page Does Not Contain Element    ${1:${locator}}    ${2:${timeout=None}}    ${3:${error=None}}
+endsnippet
+

From fd938943192d7adf9a6f1509bf6e5f58c16837a3 Mon Sep 17 00:00:00 2001
From: Ernest Rekel <ernestre@users.noreply.github.com>
Date: Sat, 28 Oct 2017 00:44:57 +0300
Subject: [PATCH 1096/1587] Add phpunit v6 snippet (#995)

---
 UltiSnips/php.snippets | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index dde0def92..6cc47ae73 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -257,4 +257,30 @@ snip.rv = re.match(r'.*(?=\.)', fn).group()
 }
 endsnippet
 
+snippet testcase6 "class XYZTest extends TestCase { ... }"
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @author `!v g:snips_author`
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends TestCase
+{
+	public function test$1()
+	{
+		${0:${VISUAL}}
+	}
+}
+endsnippet
+
 # :vim:ft=snippets:

From ad16bdfe438355bc1e5bab4b03583a17f13bd0db Mon Sep 17 00:00:00 2001
From: Ruben De Smet <ruben.de.smet@rubdos.be>
Date: Fri, 27 Oct 2017 23:45:22 +0200
Subject: [PATCH 1097/1587] TeX: Minted snippet (#992)

---
 UltiSnips/tex.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 3dd458857..edf94d5d0 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -145,4 +145,11 @@ endsnippet
 snippet lp "Long parenthesis"
 \left(${1:${VISUAL:contents}}\right)$0
 endsnippet
+
+snippet "mint(ed)?( (\S+))?" "Minted code typeset" br
+\begin{minted}{${1:`!p
+snip.rv = match.group(3) if match.group(2) is not None else "language"`}}
+${2:${VISUAL:code}}
+\end{minted}$0
+endsnippet
 # vim:ft=snippets:

From 91ef7aa3f9fdf5e28b61f674fe14ec67cba2dee4 Mon Sep 17 00:00:00 2001
From: Michael Clayton <mwc@clayto.com>
Date: Thu, 2 Nov 2017 17:09:41 -0400
Subject: [PATCH 1098/1587] remove extra indent from UltiSnips html.snippets

---
 UltiSnips/html.snippets | 44 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 969bbaa7e..17c6ec690 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -258,31 +258,31 @@ snippet hr "<hr>"
 endsnippet
 
 snippet html "HTML basic structure" b
-	<!DOCTYPE html>
-	<html>
-		<head>
-			<meta charset="UTF-8" />
-			<meta name="viewport" content="width=device-width" />
-			<title>${1:`!p snip.rv = snip.basename.replace('-', ' ').capitalize()`}</title>
-		</head>
-		<body>
-			${0:body}
-		</body>
-	</html>
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width" />
+		<title>${1:`!p snip.rv = snip.basename.replace('-', ' ').capitalize()`}</title>
+	</head>
+	<body>
+		${0:body}
+	</body>
+</html>
 endsnippet
 
 snippet htmll "HTML basic structure with the lang attribute" b
-	<!DOCTYPE html>
-	<html lang="${1:es}">
-		<head>
-			<meta charset="UTF-8" />
-			<meta name="viewport" content="width=device-width" />
-			<title>${2:`!p snip.rv = snip.basename.replace('-', ' ').capitalize()`}</title>
-		</head>
-		<body>
-			${0:body}
-		</body>
-	</html>
+<!DOCTYPE html>
+<html lang="${1:es}">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width" />
+		<title>${2:`!p snip.rv = snip.basename.replace('-', ' ').capitalize()`}</title>
+	</head>
+	<body>
+		${0:body}
+	</body>
+</html>
 endsnippet
 
 snippet i "<i>" w

From f03b63a34b42518050fd3bd040429fc8bbb115b5 Mon Sep 17 00:00:00 2001
From: Marcelo D Montu <marcelo.montu@symphony.com>
Date: Sun, 12 Nov 2017 11:37:28 -0200
Subject: [PATCH 1099/1587] robot: fix Set Variable keyword (#1001)

The syntax of `Set Variable` is slightly different from  Set Global
Variable, Set Test Variable, and Set Suite Variable
---
 UltiSnips/robot.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/robot.snippets b/UltiSnips/robot.snippets
index dacbeee7c..0457fd03e 100644
--- a/UltiSnips/robot.snippets
+++ b/UltiSnips/robot.snippets
@@ -122,7 +122,7 @@ Set Test Variable    \${${1:name}}    ${2:${value}}
 endsnippet
 
 snippet sv "Set Variable"
-Set Variable    \${${1:name}}    ${2:${value}}
+\${${1:name}}=    Set Variable    ${2:${value}}
 endsnippet
 
 snippet svi "Set Variable If"

From 410007b0015bcdf8939781e119f83310a36c440d Mon Sep 17 00:00:00 2001
From: Quinn Strahl <qstrahl@gmail.com>
Date: Mon, 13 Nov 2017 12:59:13 -0500
Subject: [PATCH 1100/1587] Remove annoying spaces within <span>

For some reason, the `span` snippets in `UltiSnips/html.snippets` contain these unnecessary spaces around the inner content. This is inconsistent with all the other inline tags - and also with the `span` snippets in `snippets/html.snippets`. This patch removes those spaces.
---
 UltiSnips/html.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 17c6ec690..924f02fd8 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -432,15 +432,15 @@ snippet small "<small>" w
 endsnippet
 
 snippet span "<span>" w
-<span> ${0:${VISUAL}} </span>
+<span>${0:${VISUAL}}</span>
 endsnippet
 
 snippet span# "<span> with ID & class" w
-<span`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`> ${0:${VISUAL}} </span>
+<span`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`>${0:${VISUAL}}</span>
 endsnippet
 
 snippet span. "<span> with class" w
-<span`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`> ${0:${VISUAL}} </span>
+<span`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`>${0:${VISUAL}}</span>
 endsnippet
 
 snippet strong "<strong>" w

From 2b140a7cadc3cb798b5019bc6fa56a43ed2fcecc Mon Sep 17 00:00:00 2001
From: Emerson MX <emersonmx@gmail.com>
Date: Mon, 20 Nov 2017 23:46:06 -0300
Subject: [PATCH 1101/1587] Use quote style when writing slot arguments

---
 UltiSnips/python.snippets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 686226e73..54de91394 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -216,7 +216,9 @@ def write_init_body(args, parents, snip):
 
 
 def write_slots_args(args, snip):
-	args = ['"_%s"' % arg for arg in args]
+	quote = get_quoting_style(snip)
+	arg_format = quote + '_%s' + quote
+	args = [arg_format % arg for arg in args]
 	snip += '__slots__ = (%s,)' % ', '.join(args)
 
 

From 01780cbf49a875c16306306654452b3aca609c13 Mon Sep 17 00:00:00 2001
From: Emerson MX <emersonmx@gmail.com>
Date: Tue, 21 Nov 2017 00:23:39 -0300
Subject: [PATCH 1102/1587] Add ret snippet

---
 snippets/python.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 3e2ebed97..3d4f34fdb 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -103,6 +103,8 @@ snippet cascii
 # Lambda
 snippet ld
 	${1:var} = lambda ${2:vars} : ${0:action}
+snippet ret
+	return ${0}
 snippet .
 	self.
 snippet try Try/Except

From e116db735e54a8e428f8b2c08c842ee52b7230fe Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 5 Dec 2017 23:14:26 +0000
Subject: [PATCH 1103/1587] Scala tweaks

---
 snippets/scala.snippets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/snippets/scala.snippets b/snippets/scala.snippets
index a6c3f3c7b..309c85a38 100644
--- a/snippets/scala.snippets
+++ b/snippets/scala.snippets
@@ -58,6 +58,10 @@ snippet try
 		${0}
 	}
 #match
+snippet mat
+	${1:${VISUAL}} match {
+		case ${2} => ${0}
+	}
 snippet match
 	${1: obj} match {
 		case ${2:e} => ${3}
@@ -65,7 +69,7 @@ snippet match
 	}
 #case
 snippet case
-	case ${1:value} => ${0}
+	case ${1:${VISUAL}} => ${0}
 ############################
 # methods and arguments
 #

From 7ce415ef3c7a42033b4582af390547c3764423e3 Mon Sep 17 00:00:00 2001
From: Florian Heiderich <florian@heiderich.org>
Date: Tue, 19 Dec 2017 14:18:02 +0100
Subject: [PATCH 1104/1587] add snippet for \overline

---
 snippets/tex.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index eecd885b5..7b03ce3c9 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -209,6 +209,8 @@ snippet bf bold face text
 	\\textbf{${1:${VISUAL:text}}} ${0}
 snippet under underline text
 	\\underline{${1:${VISUAL:text}}} ${0}
+snippet over overline text
+	\\overline{${1:${VISUAL:text}}} ${0}
 snippet emp emphasize text
 	\\emph{${1:${VISUAL:text}}} ${0}
 snippet sc small caps text

From d50d05fc25d9ad7f40a81657d87d7f8073ec5fcb Mon Sep 17 00:00:00 2001
From: Marcelo D Montu <marcelo.montu@symphony.com>
Date: Wed, 20 Dec 2017 11:05:35 -0200
Subject: [PATCH 1105/1587] robot: some additions and updates (#1006)

* robot: fix Set Variable keyword

The syntax of `Set Variable` is slightly different from  Set Global
Variable, Set Test Variable, and Set Suite Variable

* robot: reminder about Catenate not changing args

* robot: include 'Should Be Equal' keyword

* robot: include snippet for pause on teardown
---
 UltiSnips/robot.snippets | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/robot.snippets b/UltiSnips/robot.snippets
index 0457fd03e..cc3c86636 100644
--- a/UltiSnips/robot.snippets
+++ b/UltiSnips/robot.snippets
@@ -8,7 +8,7 @@ priority -50
 #  Built In library  #
 ######################
 snippet cat "Catenate"
-Catenate    SEPARATOR=${1:---}    ${2:Hello}    ${3:world}
+\${${1:name}}=    Catenate    SEPARATOR=${2:---}    ${3:Hello}    ${4:world}
 endsnippet
 
 snippet eval "Evaluate"
@@ -109,6 +109,10 @@ snippet sgv "Set Global Variable"
 Set Global Variable    \${${1:name}}    ${2:${value}}
 endsnippet
 
+snippet sbe "Should Be Equal"
+Should Be Equal    "\${${1:var}}"    "${2:expected value}"    ${3:"optional error msg"}	${4:ignore_case=True}
+endsnippet
+
 snippet sleep "Sleep"
 Sleep    ${1:2 minutes 10 seconds}
 endsnippet
@@ -142,6 +146,12 @@ Import library    Dialogs
 Pause execution
 endsnippet
 
+snippet tpause "Teardown Pause - pause test execution only on failure"
+[Teardown]    Run Keyword If Test Failed    Run Keywords
+...    Import library    Dialogs    AND
+...    Pause execution
+endsnippet
+
 
 ##############################
 #  Selenium2Library library  #

From 82e8ea44e84ebf71d91740a7ef56c959b08d53bc Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 22 Dec 2017 22:32:35 +0000
Subject: [PATCH 1106/1587] Haskell mod

---
 snippets/haskell.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index d073bf116..3965f1da5 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -49,6 +49,12 @@ snippet module
 	) where
 	`expand('%') =~ 'Main' ? "\nmain :: IO ()\nmain = undefined" : ""`
 
+snippet mod
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')`
+		( ${1}
+		) where
+
+	`expand('%') =~ 'Main' ? "\nmain :: IO ()\nmain = undefined" : ""`
 snippet main
 	main :: IO ()
 	main = ${0:undefined}

From 0e36a7b078a15a3ff88c84773a7aacb953c466f7 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 23 Dec 2017 18:27:51 +0000
Subject: [PATCH 1107/1587] Kotlin

---
 snippets/kotlin.snippets | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 snippets/kotlin.snippets

diff --git a/snippets/kotlin.snippets b/snippets/kotlin.snippets
new file mode 100644
index 000000000..6d519ea79
--- /dev/null
+++ b/snippets/kotlin.snippets
@@ -0,0 +1,22 @@
+snippet fun
+	fun ${1:name}(${2}): ${3:String} {
+		${4}
+	}
+snippet pfun
+	private fun ${1:name}(${2}): ${3:String} {
+		${4}
+	}
+snippet ret
+	return ${0}
+snippet whe
+	when (${1:${VISUAL}}) {
+		${2} -> ${3}
+	}
+snippet cla
+	class ${1} {
+		${0:${VISUAL}}
+	}
+snippet cobj
+	companion object {
+		${0:${VISUAL}}
+	}

From c3869d4c427dea0f84771d7e52a6ac7765addfa8 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 23 Dec 2017 18:43:52 +0000
Subject: [PATCH 1108/1587] Kotlin if ife

---
 snippets/kotlin.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/snippets/kotlin.snippets b/snippets/kotlin.snippets
index 6d519ea79..39da8feab 100644
--- a/snippets/kotlin.snippets
+++ b/snippets/kotlin.snippets
@@ -20,3 +20,13 @@ snippet cobj
 	companion object {
 		${0:${VISUAL}}
 	}
+snippet if
+	if (${1}) {
+		${0:${VISUAL}}
+	}
+snippet ife
+	if (${1}) {
+		${2:${VISUAL}}
+	} else {
+		${0}
+	}

From 9ca53350d8bcd0f915e21640dc6efb462d716bd2 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 25 Dec 2017 18:20:41 +0000
Subject: [PATCH 1109/1587] Kotlin object

---
 snippets/kotlin.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/kotlin.snippets b/snippets/kotlin.snippets
index 39da8feab..98f8dbc4b 100644
--- a/snippets/kotlin.snippets
+++ b/snippets/kotlin.snippets
@@ -20,6 +20,10 @@ snippet cobj
 	companion object {
 		${0:${VISUAL}}
 	}
+snippet obj
+	object ${1} {
+		${0:${VISUAL}}
+	}
 snippet if
 	if (${1}) {
 		${0:${VISUAL}}

From 765f7ad253626c8014e13a565ac1cf54f04bcf26 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 27 Dec 2017 13:32:31 +0000
Subject: [PATCH 1110/1587] Correct JS React snippets filename

https://github.com/honza/vim-snippets/issues/952#issuecomment-354103164
---
 ...avascript.es6.react.snippets => javascript-es6-react.snippets} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename snippets/{javascript.es6.react.snippets => javascript-es6-react.snippets} (100%)

diff --git a/snippets/javascript.es6.react.snippets b/snippets/javascript-es6-react.snippets
similarity index 100%
rename from snippets/javascript.es6.react.snippets
rename to snippets/javascript-es6-react.snippets

From 931d22b2eb4d5fc1dadc4af88f90d08b1cd204cc Mon Sep 17 00:00:00 2001
From: uinput <uinput@users.noreply.github.com>
Date: Tue, 2 Jan 2018 17:05:14 +0100
Subject: [PATCH 1111/1587] Fix collision for <img> tag in html and
 html_minimal. (#1010)

---
 UltiSnips/html_minimal.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/html_minimal.snippets b/UltiSnips/html_minimal.snippets
index 5fb75223e..38fe61c57 100644
--- a/UltiSnips/html_minimal.snippets
+++ b/UltiSnips/html_minimal.snippets
@@ -1,7 +1,7 @@
 # more can be found in snippets/html_minimal.snippets
 # these UltiSnips override snippets because nested placeholders are being used
 
-priority -50
+priority -49
 
 snippet id
 id="$1"$2

From 0cdfb7db5272fdce39166432bbe555827a30134f Mon Sep 17 00:00:00 2001
From: Yunjong Jeong <yunjong@kaist.ac.kr>
Date: Tue, 9 Jan 2018 21:30:39 +0900
Subject: [PATCH 1112/1587] Add cpp anonymous namespace snippet (#1012)

* Add cpp anonymous namespace snippet

* Remove unnecessary comments
---
 snippets/cpp.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 4c02a47fa..a6459023a 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -138,6 +138,10 @@ snippet ns
 	namespace ${1:`vim_snippets#Filename('', 'my')`} {
 		${0}
 	} /* namespace $1 */
+snippet ans
+	namespace {
+		${0}
+	}
 ##
 ## Input/Output
 # std::cout

From 174f572f79b2ecfed681620d6ae4386bde68a898 Mon Sep 17 00:00:00 2001
From: heiderich <florian@heiderich.org>
Date: Tue, 9 Jan 2018 13:32:21 +0100
Subject: [PATCH 1113/1587] snippet enq for \enquote{} (#1015)

---
 snippets/tex.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 7b03ce3c9..527d07727 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -341,3 +341,6 @@ snippet urlc
 	\\url{`@+`} ${0}
 snippet hrefc
 	\\href{`@+`}{${1}} ${0}
+# enquote from package csquotes
+snippet enq enquote
+	\\enquote{${1:${VISUAL:text}}} ${0}

From c16a74958cabeea820db00b7dd6567ef34698d46 Mon Sep 17 00:00:00 2001
From: Jasen Borisov <tajjada@gmail.com>
Date: Sun, 29 Jan 2017 22:27:33 +0000
Subject: [PATCH 1114/1587] Add "nocxx" snippet.

---
 UltiSnips/c.snippets | 12 ++++++++++++
 snippets/c.snippets  | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 6851a2728..ee1ff5ff4 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -65,6 +65,18 @@ ${VISUAL}$0
 #endif /* end of include guard: $1 */
 endsnippet
 
+snippet nocxx "Disable C++ name mangling in C headers" b
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+${VISUAL}$0
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+endsnippet
+
 snippet fprintf "fprintf ..."
 fprintf(${1:stderr}, "${2:%s}\n"${2/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$3${2/([^%]|%%)*(%.)?.*/(?2:\);)/}
 endsnippet
diff --git a/snippets/c.snippets b/snippets/c.snippets
index 0336a147f..eb996acf3 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -48,6 +48,17 @@ snippet once
 	${0}
 
 	#endif /* end of include guard: $1 */
+# Disable C++ name mangling in C headers
+snippet nocxx
+	#ifdef __cplusplus
+	extern "C" {
+	#endif
+
+	${0}
+
+	#ifdef __cplusplus
+	} /* extern "C" */
+	#endif
 ##
 ## Control Statements
 # if

From 264052b2593f536e5e72adde2c50a0e067da7b8c Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 9 Jan 2018 12:35:49 +0000
Subject: [PATCH 1115/1587] Remove dupe

---
 UltiSnips/c.snippets | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index ee1ff5ff4..6851a2728 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -65,18 +65,6 @@ ${VISUAL}$0
 #endif /* end of include guard: $1 */
 endsnippet
 
-snippet nocxx "Disable C++ name mangling in C headers" b
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-${VISUAL}$0
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-endsnippet
-
 snippet fprintf "fprintf ..."
 fprintf(${1:stderr}, "${2:%s}\n"${2/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$3${2/([^%]|%%)*(%.)?.*/(?2:\);)/}
 endsnippet

From 855f239c735eba9841760f6b76aad9700dd48526 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 12 Jan 2018 23:44:06 +0000
Subject: [PATCH 1116/1587] Markdown code uses visual

---
 snippets/markdown.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index f8000b445..303271ed1 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -97,8 +97,8 @@ snippet blockquote-link
 	{% endblockquote %}
 
 snippet ```
-	\`\`\`
-	${1:code}
+	\`\`\`${1}
+	${0:${VISUAL}}
 	\`\`\`
 
 # Language.

From 9cba5658ac3ddd417557af68da80ed47e6fc0fcd Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 13 Jan 2018 00:20:49 +0000
Subject: [PATCH 1117/1587] Alpaca snippets

---
 snippets/alpaca.snippets | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 snippets/alpaca.snippets

diff --git a/snippets/alpaca.snippets b/snippets/alpaca.snippets
new file mode 100644
index 000000000..7079ae7d7
--- /dev/null
+++ b/snippets/alpaca.snippets
@@ -0,0 +1,38 @@
+snippet mod
+	module ${0:`expand('%:t:r')`}
+snippet imp
+	import ${0:http}
+snippet impt
+	import type ${0:option.option}
+snippet exp
+	export ${0}
+snippet expt
+	export ${0}
+snippet fn
+	val ${1:fn} ${2}: fn ${3:'a} -> ${4:'a}
+	let $1 ${5} =
+		${0:${VISUAL}}
+snippet mat
+	match ${1} with
+	| ${2} -> ${0}
+snippet -
+	| ${1} -> ${0}
+snippet let
+	let ${1} = ${2:${VISUAL}} in
+	${0}
+snippet letf
+	let ${1} =
+		${0:${VISUAL}}
+snippet ty
+	type ${1:msg}
+		= ${0}
+snippet test
+	test "${1}" =
+		${0:${VISUAL}}
+snippet doc
+	{-| ${0}
+	-}
+snippet p
+	|> ${0}
+snippet ae
+	assert.equal ${0}

From d64a49000d71b8f9690c7c677b95852d2ca666a4 Mon Sep 17 00:00:00 2001
From: Shim Won <marocchino@gmail.com>
Date: Thu, 4 Jan 2018 12:59:04 +0900
Subject: [PATCH 1118/1587] Rails Migration Model Class

ref: https://github.com/bbatsov/rails-style-guide#define-model-class-migrations
---
 UltiSnips/rails.snippets | 6 ++++++
 snippets/rails.snippets  | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index 9aefe6675..4f58aef93 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -608,6 +608,12 @@ returning ${1:variable} do${2/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s
 end
 endsnippet
 
+snippet cmm "Create Migration Model Class"
+class Migration${1/(?:^|_)(\w)/\u$1/g} < ApplicationRecord
+	self.table_name = :${1:model_name}s
+end
+endsnippet
+
 snippet t. "t.binary (tcbi)"
 t.binary :${1:title}${2:, :limit => ${3:2}.megabytes}
 t.$0
diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index 6a5c5ff0e..10c2af325 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -347,6 +347,15 @@ snippet mct
 	create_table :${1:table_name} do |t|
 		${0}
 	end
+snippet mrev
+	reversible do |dir|
+		dir.up do
+			${0}
+		end
+
+		dir.down do
+		end
+	end
 snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
 	class `substitute( substitute(vim_snippets#Filename(), '^\d\+_', '',''), '\(_\|^\)\(.\)', '\u\2', 'g')` < ActiveRecord::Migration
 		def up

From 4b3bacfa832b5d88d8eeaf23053e8eceddaa2ee7 Mon Sep 17 00:00:00 2001
From: Shim Won <marocchino@gmail.com>
Date: Wed, 10 Jan 2018 07:35:28 +0900
Subject: [PATCH 1119/1587] Add snipmate version of rails migration model

---
 snippets/rails.snippets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index 10c2af325..3742cd407 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -347,7 +347,7 @@ snippet mct
 	create_table :${1:table_name} do |t|
 		${0}
 	end
-snippet mrev
+snippet mrev reversible do |dir| ... dir.up .. dir.down .. end
 	reversible do |dir|
 		dir.up do
 			${0}
@@ -356,6 +356,10 @@ snippet mrev
 		dir.down do
 		end
 	end
+snippet cmm class Migration... < ApplicationModel .. self.table_name .. end
+	class Migration${1:class_name} < ApplicationRecord
+		self.table_name = :${2:model_name}s
+	end
 snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
 	class `substitute( substitute(vim_snippets#Filename(), '^\d\+_', '',''), '\(_\|^\)\(.\)', '\u\2', 'g')` < ActiveRecord::Migration
 		def up

From 405ea72b571b5f0a4be470c7d36d2db6621f5ff0 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 15 Jan 2018 15:02:45 +0000
Subject: [PATCH 1120/1587] Elixir snippets

---
 snippets/elixir.snippets | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 83573d3e3..9f331b249 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -144,7 +144,7 @@ snippet rec
 			${0}
 	end
 snippet req
-	require ${0:module_name}
+	require ${0:Logger}
 snippet imp
 	import ${0:module_name}
 snippet ali
@@ -153,6 +153,10 @@ snippet test
 	test "${1:test name}" do
 		${0}
 	end
+snippet testc
+	test "${1:test_name}", ctx do
+		${0}
+	end
 snippet testa
 	test "${1:test_name}", %{${2:arg: arg}} do
 		${0}

From 458947b6e4ef20432a0fc4a30376f13393fdfc93 Mon Sep 17 00:00:00 2001
From: Philipp Hansch <dev@phansch.net>
Date: Tue, 9 Jan 2018 11:44:31 +0100
Subject: [PATCH 1121/1587] Rust: Improve pri, pln, and fmt

Using the snippets with format args pretty much always means that the
format args need to be used using `{}` or `{:?}`.

See: https://doc.rust-lang.org/std/fmt/
---
 snippets/rust.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 0969a1cba..33fda8c08 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -42,13 +42,13 @@ snippet lettm "let mut variable declaration with explicit type annotation"
 snippet pri "print!"
 	print!("${1}");
 snippet pri, "print! with format param"
-	print!("${1}", ${2});
+	print!("{${1}}", ${2});
 snippet pln "println!"
 	println!("${1}");
 snippet pln, "println! with format param"
-	println!("${1}", ${2});
+	println!("{${1}}", ${2});
 snippet fmt "format!"
-	format!("${1}", ${2});
+	format!("{${1}}", ${2});
 
 # Modules
 snippet ec "extern crate"

From dd4e82b4ac08b74aeb1adf342fde10884fd67616 Mon Sep 17 00:00:00 2001
From: Philipp Hansch <dev@phansch.net>
Date: Fri, 19 Jan 2018 07:38:56 +0100
Subject: [PATCH 1122/1587] Rust: Add additional jump in front of {}

---
 snippets/rust.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 33fda8c08..8460d4ae9 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -42,13 +42,13 @@ snippet lettm "let mut variable declaration with explicit type annotation"
 snippet pri "print!"
 	print!("${1}");
 snippet pri, "print! with format param"
-	print!("{${1}}", ${2});
+	print!("${1}{${2}}", ${3});
 snippet pln "println!"
 	println!("${1}");
 snippet pln, "println! with format param"
-	println!("{${1}}", ${2});
+	println!("${1}{${2}}", ${3});
 snippet fmt "format!"
-	format!("{${1}}", ${2});
+	format!("${1}{${2}}", ${3});
 
 # Modules
 snippet ec "extern crate"

From 0da44d119f2ed2a6cd6487ef4237cd41b60dfdf6 Mon Sep 17 00:00:00 2001
From: jackofspades707 <jackofspades707@hotmail.com>
Date: Sun, 21 Jan 2018 11:45:49 -0800
Subject: [PATCH 1123/1587]  [!] python.snippets Various Snippet additions

---
 snippets/python.snippets | 180 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 3d4f34fdb..d0cea516f 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -1,6 +1,9 @@
 snippet #!
 	#!/usr/bin/env python
 	# -*- coding: utf-8 -*-
+snippet #!2
+	#!/usr/bin/env python2
+	# -*- coding: utf-8 -*-
 snippet #!3
 	#!/usr/bin/env python3
 	# -*- coding: utf-8 -*-
@@ -211,6 +214,20 @@ snippet getopt
 			${0}
 		elif option in ("-v", "--verbose"):
 			verbose = argument
+# argparse
+snippet addp
+	parser = ${VISUAL:argparse.}ArgumentParser()
+snippet addsp
+	${0:sub_parser} = parser.add_subparsers().add_parser("${1:name}")
+snippet addarg
+	parser.add_argument("${0:short_arg}", "${1:long_arg}", default=${2:None}, help="${3:Help text}")
+snippet addnarg
+	parser.add_argument("${0:arg}", nargs="${1:*}", default"${2:None}, help="${3:Help text}")
+snippet addaarg
+	parser.add_argument("${0:arg}", "${1:long_arg}", action="${2:store_true}", default=${3:False}, help="${4:Help text}")
+snippet pargs
+	"${VISUAL:return }"parser.parse_args()
+	
 # logging
 # glog = get log
 snippet glog
@@ -261,3 +278,166 @@ snippet dcp dict comprehension
 
 snippet scp set comprehension
 	{${1} for ${2} in ${3:${VISUAL}}}${0}
+
+snippet contain "methods for emulating a container type" b
+	def __len__(self):
+		${1:pass}
+
+	def __getitem__(self, key):
+		${2:pass}
+
+	def __setitem__(self, key, value):
+		${3:pass}
+
+	def __delitem__(self, key):
+		${4:pass}
+
+	def __iter__(self):
+		${5:pass}
+
+	def __reversed__(self):
+		${6:pass}
+
+	def __contains__(self, item):
+		${7:pass}
+	
+snippet context "context manager methods" b
+	def __enter__(self):
+		${1:pass}
+
+	def __exit__(self, exc_type, exc_value, traceback):
+		${2:pass}
+	
+snippet attr "methods for customizing attribute access" b
+	def __getattr__(self, name):
+		${1:pass}
+
+	def __setattr__(self, name, value):
+		${2:pass}
+
+	def __delattr__(self, name):
+		${3:pass}
+	
+snippet desc "methods implementing descriptors" b
+	def __get__(self, instance, owner):
+		${1:pass}
+
+	def __set__(self, instance, value):
+		${2:pass}
+
+	def __delete__(self, instance):
+		${3:pass}
+	
+snippet cmp "methods implementing rich comparison"
+	def __eq__(self, other):
+		${1:pass}
+
+	def __ne__(self, other):
+		${2:pass}
+
+	def __lt__(self, other):
+		${3:pass}
+
+	def __le__(self, other):
+		${4:pass}
+
+	def __gt__(self, other):
+		${5:pass}
+
+	def __ge__(self, other):
+		${6:pass}
+
+	def __cmp__(self, other):
+		${7:pass}
+	
+snippet repr "methods implementing string representation"
+	def __repr__(self):
+		${1:pass}
+
+	def __str__(self):
+		${2:pass}
+
+	def __unicode__(self):
+		${3:pass}
+	
+# note: reflected operands and augmented arithmeitc assignements have been
+# intentionally ommited to reduce verbosity.
+snippet numeric "methods for emulating a numeric type" b
+	def __add__(self, other):
+		${1:pass}
+
+	def __sub__(self, other):
+		${2:pass}
+
+	def __mul__(self, other):
+		${3:pass}
+
+	def __div__(self, other):
+		${4:pass}
+
+	def __truediv__(self, other):
+		${5:pass}
+
+	def __floordiv__(self, other):
+		${6:pass}
+
+	def __mod__(self, other):
+		${7:pass}
+
+	def __divmod__(self, other):
+		${8:pass}
+
+	def __pow__(self, other):
+		${9:pass}
+
+	def __lshift__(self, other):
+		${10:pass}
+
+	def __rshift__(self, other):
+		${11:pass}
+
+	def __and__(self, other):
+		${12:pass}
+
+	def __xor__(self, other):
+		${13:pass}
+
+	def __or__(self, other):
+		${14:pass}
+
+	def __neg__(self):
+		${15:pass}
+
+	def __pos__(self):
+		${16:pass}
+
+	def __abs__(self):
+		${17:pass}
+
+	def __invert__(self):
+		${18:pass}
+
+	def __complex__(self):
+		${19:pass}
+
+	def __int__(self):
+		${20:pass}
+
+	def __long__(self):
+		${21:pass}
+
+	def __float__(self):
+		${22:pass}
+
+	def __oct__(self):
+		${22:pass}
+
+	def __hex__(self):
+		${23:pass}
+
+	def __index__(self):
+		${24:pass}
+
+	def __coerce__(self, other):
+		${25:pass}
+	

From 71d91aec383ad3b72d8830db5d50d9bf4a8563f6 Mon Sep 17 00:00:00 2001
From: Ankur Gupta <rukna1000@gmail.com>
Date: Mon, 22 Jan 2018 00:25:31 -0500
Subject: [PATCH 1124/1587] Added dynamic tabular environments

---
 UltiSnips/tex.snippets | 50 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index edf94d5d0..d89f30bcf 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -2,6 +2,48 @@ priority -50
 
 extends texmath
 
+global !p
+
+def create_table(snip):
+	rows = snip.buffer[snip.line].split('x')[0]
+	cols = snip.buffer[snip.line].split('x')[1]
+
+	int_val = lambda string: int(''.join(s for s in string if s.isdigit()))
+	
+	rows = int_val(rows)
+	cols = int_val(cols)
+
+	offset = cols + 1
+	old_spacing = snip.buffer[snip.line][:snip.buffer[snip.line].rfind('\t') + 1]
+	
+	snip.buffer[snip.line] = ''
+	
+	final_str = old_spacing + "\\begin{tabular}{|" + "|".join(['$' + str(i + 1) for i in range(cols)]) + "|}\n"
+
+	for i in range(rows):
+		final_str += old_spacing + '\t'
+		final_str += " & ".join(['$' + str(i * cols + j + offset) for j in range(cols)])
+
+		final_str += " \\\\\\\n"
+
+	final_str += old_spacing + "\\end{tabular}\n$0"
+
+	snip.expand_anon(final_str)
+
+def add_row(snip):
+	row_len = int(''.join(s for s in snip.buffer[snip.line] if s.isdigit()))
+	old_spacing = snip.buffer[snip.line][:snip.buffer[snip.line].rfind('\t') + 1]
+
+	snip.buffer[snip.line] = ''
+	
+	final_str = old_spacing
+	final_str += " & ".join(['$' + str(j + 1) for j in range(row_len)])
+	final_str += " \\\\\\"
+
+	snip.expand_anon(final_str)
+
+endglobal
+
 snippet "b(egin)?" "begin{} / end{}" br
 \begin{${1:something}}
 	${0:${VISUAL}}
@@ -20,6 +62,14 @@ $0${2/(?<=.)(c|l|r)|./(?1: & )/g}
 \end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 endsnippet
 
+pre_expand "create_table(snip)"
+snippet "gentbl(\d+)x(\d+)" "Generate table of *width* by *height*" r  
+endsnippet
+
+pre_expand "add_row(snip)"
+snippet "tr(\d+)" "Add table row of dimension ..." r
+endsnippet
+
 snippet table "Table environment" b
 \begin{table}[${1:htpb}]
 	\centering

From 070892973ee66f2f4ea432252c8bedce57348a7b Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@Aleksandars-iMac.local>
Date: Thu, 15 Feb 2018 13:16:46 +0100
Subject: [PATCH 1125/1587] Escape the newline after sectioning snippets

A comment marker escapes the newline after a sectioning command like
`\chapter`. This way the `\label` command follows the sectioning command
immediately as far as LaTeX is concerned, avoiding possible problems
with page references. A warning about the newline was issued by the
chktex linter:

    > Delete this space to maintain correct pagereferences.
---
 UltiSnips/tex.snippets | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index d89f30bcf..e54c2c720 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -113,28 +113,28 @@ snippet it "Individual item" b
 endsnippet
 
 snippet part "Part" b
-\part{${1:part name}}
+\part{${1:part name}}%
 \label{prt:${2:${1/(\w+)|\W+/(?1:\L$0\E:_)/ga}}}
 
 $0
 endsnippet
 
 snippet cha "Chapter" b
-\chapter{${1:chapter name}}
+\chapter{${1:chapter name}}%
 \label{cha:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0
 endsnippet
 
 snippet sec "Section" b
-\section{${1:section name}}
+\section{${1:section name}}%
 \label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0
 endsnippet
 
 snippet sec* "Section" b
-\section*{${1:section name}}
+\section*{${1:section name}}%
 \label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
@@ -142,42 +142,42 @@ endsnippet
 
 
 snippet sub "Subsection" b
-\subsection{${1:subsection name}}
+\subsection{${1:subsection name}}%
 \label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0
 endsnippet
 
 snippet sub* "Subsection" b
-\subsection*{${1:subsection name}}
+\subsection*{${1:subsection name}}%
 \label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
 endsnippet
 
 snippet ssub "Subsubsection" b
-\subsubsection{${1:subsubsection name}}
+\subsubsection{${1:subsubsection name}}%
 \label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0
 endsnippet
 
 snippet ssub* "Subsubsection" b
-\subsubsection*{${1:subsubsection name}}
+\subsubsection*{${1:subsubsection name}}%
 \label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
 endsnippet
 
 snippet par "Paragraph" b
-\paragraph{${1:paragraph name}}
+\paragraph{${1:paragraph name}}%
 \label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0
 endsnippet
 
 snippet subp "Subparagraph" b
-\subparagraph{${1:subparagraph name}}
+\subparagraph{${1:subparagraph name}}%
 \label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0

From 00021fdd1f59993e1581170f968300fbf1eb29b7 Mon Sep 17 00:00:00 2001
From: Aboobacker MK <aboobacker@redpanthers.co>
Date: Thu, 1 Mar 2018 10:24:42 +0530
Subject: [PATCH 1126/1587] Prefer json over xml

Nowadays json is the widely used standard and default rails configuration. I think it is better to stick with that
---
 snippets/rails.snippets | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index 3742cd407..4678de921 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -42,10 +42,10 @@ snippet defcreate
 			if @$1.save
 				flash[:notice] = '$2 was successfully created.'
 				format.html { redirect_to(@$1) }
-				format.xml  { render xml: @$1, status: :created, location: @$1 }
+				format.json  { render json: @$1, status: :created, location: @$1 }
 			else
 				format.html { render action: 'new' }
-				format.xml  { render xml: @$1.errors, status: :unprocessable_entity }
+				format.json  { render json: @$1.errors, status: :unprocessable_entity }
 			end
 		end
 	end
@@ -56,7 +56,7 @@ snippet defdestroy
 
 		respond_to do |format|
 			format.html { redirect_to($1s_url) }
-			format.xml  { head :ok }
+			format.json  { head :ok }
 		end
 	end
 snippet defedit
@@ -69,7 +69,7 @@ snippet defindex
 
 		respond_to do |format|
 			format.html # index.html.erb
-			format.xml  { render xml: @$1s }
+			format.json  { render json: @$1s }
 		end
 	end
 snippet defnew
@@ -78,7 +78,7 @@ snippet defnew
 
 		respond_to do |format|
 			format.html # new.html.erb
-			format.xml  { render xml: @$1 }
+			format.json  { render json: @$1 }
 		end
 	end
 snippet defshow
@@ -87,7 +87,7 @@ snippet defshow
 
 		respond_to do |format|
 			format.html # show.html.erb
-			format.xml  { render xml: @$1 }
+			format.json  { render json: @$1 }
 		end
 	end
 snippet defupdate
@@ -98,10 +98,10 @@ snippet defupdate
 			if @$1.update($1_params)
 				flash[:notice] = '$2 was successfully updated.'
 				format.html { redirect_to(@$1) }
-				format.xml  { head :ok }
+				format.json  { head :ok }
 			else
 				format.html { render action: 'edit' }
-				format.xml  { render xml: @$1.errors, status: :unprocessable_entity }
+				format.json  { render json: @$1.errors, status: :unprocessable_entity }
 			end
 		end
 	end

From 8bb7a146c3c4eb95d58a7d83ab3d8872e34291b9 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 2 Mar 2018 13:09:06 +0000
Subject: [PATCH 1127/1587] C++ auto function snippet

---
 UltiSnips/cpp.snippets |  2 +-
 snippets/cpp.snippets  | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index bb79a0e1f..1abd50963 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -104,7 +104,7 @@ snippet fnc "Basic c++ doxygen function template" b
 */
 ${1:ReturnType} ${2:FunctionName}(${3:param})
 {
-  ${0:FunctionBody}
+	${0:FunctionBody}
 }
 endsnippet
 # vim:ft=snippets:
diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index a6459023a..9496555eb 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -200,10 +200,12 @@ snippet lld
 # snippets exception
 snippet try
 	try {
-		
-	}catch(${1}) {
-		
-	}
-
 
+	}catch(${1}) {
 
+	}
+snippet af auto function
+	auto ${1:name}(${2}) -> ${3:void}
+	{
+		${0}
+	};

From b7540c3bef5cdf31bc916a4dea67ac9fd320bd41 Mon Sep 17 00:00:00 2001
From: Fabian Hinz <fabian.hinz@de.clara.net>
Date: Fri, 2 Mar 2018 09:50:45 +0100
Subject: [PATCH 1128/1587] Rename identically named `try` snippets in
 python.snippets

---
 snippets/python.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index d0cea516f..3c67125ca 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -115,21 +115,21 @@ snippet try Try/Except
 		${1:${VISUAL}}
 	except ${2:Exception} as ${3:e}:
 		${0:raise $3}
-snippet try Try/Except/Else
+snippet trye Try/Except/Else
 	try:
 		${1:${VISUAL}}
 	except ${2:Exception} as ${3:e}:
 		${4:raise $3}
 	else:
 		${0}
-snippet try Try/Except/Finally
+snippet tryf Try/Except/Finally
 	try:
 		${1:${VISUAL}}
 	except ${2:Exception} as ${3:e}:
 		${4:raise $3}
 	finally:
 		${0}
-snippet try Try/Except/Else/Finally
+snippet tryef Try/Except/Else/Finally
 	try:
 		${1:${VISUAL}}
 	except ${2:Exception} as ${3:e}:

From 4d9d9c48f29c247efb70ff2b9e5f9d3466221967 Mon Sep 17 00:00:00 2001
From: fenuks <fenuks@protonmail.com>
Date: Sun, 4 Mar 2018 22:20:17 +0100
Subject: [PATCH 1129/1587] Add snippet generating random UUID, fixes #1028

---
 UltiSnips/all.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 6d77cc590..d956e0e87 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -100,4 +100,11 @@ snippet todo "TODO comment" bw
 `!p snip.rv=get_comment_format()[0]` ${2:TODO}: $0${3: <${4:`!v strftime('%d-%m-%y')`}${5:, `!v g:snips_author`}>} `!p snip.rv=get_comment_format()[2]`
 endsnippet
 
+##########
+#  Misc  #
+##########
+snippet uuid "Random UUID" w
+`!p if not snip.c: import uuid; snip.rv = uuid.uuid4()`
+endsnippet
+
 # vim:ft=snippets:

From b3e2ebe17c978b26f9e451c87472ad599764e68e Mon Sep 17 00:00:00 2001
From: Florian Heiderich <florian@heiderich.org>
Date: Mon, 5 Mar 2018 12:37:28 +0100
Subject: [PATCH 1130/1587] added snippet for \alert{}

also changed snippet name "alert" into "alertblock"
---
 snippets/tex.snippets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 527d07727..d1b352616 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -292,7 +292,9 @@ snippet block block environment
 	\\begin{block}{${1:title}}
 		${0:${VISUAL}}
 	\\end{block}
-snippet alert alertblock environment
+snippet alert alert text
+	\\alert{${1:${VISUAL:text}}} ${0}
+snippet alertblock alertblock environment
 	\\begin{alertblock}{${1:title}}
 		${0:${VISUAL}}
 	\\end{alertblock}

From f02955d40b64c9db6f6bdeee40d0f44a00c58865 Mon Sep 17 00:00:00 2001
From: Florian Heiderich <florian@heiderich.org>
Date: Mon, 5 Mar 2018 12:44:02 +0100
Subject: [PATCH 1131/1587] add snippet "multicol2"

it creates a multicols environment with two columns
---
 snippets/tex.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index d1b352616..f304a56e6 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -311,6 +311,12 @@ snippet col2 two-column environment
 			${0}
 		\\end{column}
 	\\end{columns}
+snippet multicol2 two-column environment with multicol
+	\\begin{multicols}{2}
+		${1}
+		\columnbreak
+		${0}
+	\\end{multicols}
 snippet \{ \{ \}
 	\\{ ${0} \\}
 #delimiter

From 1b242212562594cf41986fea0aa7406f52b90319 Mon Sep 17 00:00:00 2001
From: Mike Murray <mikemurray86@users.noreply.github.com>
Date: Wed, 21 Mar 2018 06:25:09 -0600
Subject: [PATCH 1132/1587] Work on ps1 snippets (#1032)

* corrected placeholder numbers. Added two new snips

Numbered placeholders from 1 instead of 0 for proper order when pressing <Tab> added snips for export-csv and foreach

* added snippets

additional snippets for if..else, comment based help, and a switch statement
---
 snippets/ps1.snippets | 76 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 60 insertions(+), 16 deletions(-)

diff --git a/snippets/ps1.snippets b/snippets/ps1.snippets
index acab10cc3..41099d9d9 100644
--- a/snippets/ps1.snippets
+++ b/snippets/ps1.snippets
@@ -1,19 +1,19 @@
-# Snippets for 
+# Snippets for
 # Authored by Trevor Sullivan <trevor@trevorsullivan.net>
 
 # PowerShell Class
 snippet class
 	class {
-		[string] ${0:FirstName}
+		[string] ${1:FirstName}
 	}
 
-# PowerShell Advanced Function 
+# PowerShell Advanced Function
 snippet function
-	function {0:name} {
+	function ${1:name} {
 		[CmdletBinding()]
 		param (
 			[Parameter(Mandatory = $true)]
-			[string] $Param1
+			[string] ${2:Param}
 		)
 
 		begin {
@@ -29,30 +29,74 @@ snippet function
 # PowerShell Splatting
 snippet splatting
 	$Params = @{
-		${0:Param1} = 'Value1'
-		${1:Param2} = 'Value2'
+		${1:Param1} = '{2:Value1}'
+		${3:Param2} = '{4:Value2}'
 	}
-	${3:CommandName}
+	${5:CommandName} @Params
 
 # PowerShell Enumeration
 snippet enum
-	enum ${0:name} {
-		${1:item1}
-		${2:item2}
+	enum ${1:name} {
+		${2:item1}
+		${3:item2}
 	}
 
 # PowerShell if..then
 snippet if
-	if (${0:condition}) {
-		${1:statement}
+	if (${1:condition}) {
+		${2:statement}
+	}
+
+# PowerShell if..else
+snippet ife
+	if ( ${1:condition} ) {
+		${2}
+	}
+	else {
+		${3}
 	}
 
 # PowerShell While Loop
 snippet while
-	while (${0:condition}) {
-		${1:statement}
+	while (${1:condition}) {
+		${2:statement}
 	}
 
 # PowerShell Filter..Sort
 snippet filtersort
-	${0:command} | Where-Object -FilterScript { $PSItem.${1:property} -${2:operator} '${3:expression}' } | Sort-Object -Property ${4:sortproperty}
+	${1:command} | Where-Object -FilterScript { $PSItem.${2:property} -${3:operator} '${4:expression}' } | Sort-Object -Property ${5:sortproperty}
+
+# PowerShell foreach
+snippet foreach
+	foreach ( $${1:iterator} in $${2:collection} ) {
+		${3:statement}
+	}
+
+# PowerShell export-csv
+snippet epcsv
+	Export-CSV -NoTypeInformation -Path ${1:path}
+
+# Powershell Comment Based Help
+snippet help
+	<#
+	.SYNOPSIS
+		${1:Short Description}
+	.DESCRIPTION
+		${2:Full Description}
+	.PARAMETER ${3:Param1}
+		${4: $3 usage}
+	.EXAMPLE
+		${5:Example}
+	.NOTES
+		${6:notes}
+	.LINK
+		${7:online help}
+	#>
+
+# Powershell switch statement
+snippet switch
+	switch ( ${1:test} ){
+		${2:condition1} { ${3:action} }
+		${4:condition2} { ${5:action} }
+		default { ${6:action} }
+

From 3be398cd0414932ecd743c5a2bfeba0c9eaa1d66 Mon Sep 17 00:00:00 2001
From: Jorge Vidal <jvidal@syspixel.com>
Date: Wed, 21 Mar 2018 13:25:19 +0100
Subject: [PATCH 1133/1587] classheader and defheader using puppet strings
 (#1031)

* classheader and defheader using puppet strings

* Begin dollar in parameters
---
 snippets/puppet.snippets | 95 ++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 61 deletions(-)

diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index 838861121..7d8e6d8a3 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -1,87 +1,60 @@
 # Snippets for use with VIM and http://www.vim.org/scripts/script.php?script_id=2540
 #
-# Please contact R.I.Pienaar <rip@devco.net> for additions and feedback,
+# Please contact Jorge Vidal <im@jor.ge> for additions and feedback,
 # see it in action @ http://www.devco.net/archives/2009/09/22/vim_and_puppet.php
+# Many thanks to the original author R.I.Pienaar <rip@devco.net>
 
-# Header to match http://docs.puppetlabs.com/guides/style_guide.html#puppet-doc
+# Header using Puppet Strings (YARD tags) https://puppet.com/docs/puppet/latest/modules_documentation.html
+# More info: https://github.com/puppetlabs/puppet-strings
 snippet classheader
-	# == Class: ${1:`vim_snippets#Filename(expand('%:p:s?.*modules/??:h:h'), 'name')`}
+	# ${1:`vim_snippets#Filename(expand('%:p:s?.*modules/??:h:h'), 'class-name')`}
+	# ${2:A description of what this class does}
 	#
-	# ${2:Full description of class $1 here}
+	# @summary ${3:A short summary of the purpose of this class}
 	#
-	# === Parameters
+	# @param ${4:parameter1} [${5:String}]
+	#   ${6:Explanation of what this parameter affects.}
 	#
-	# Document parameters here.
+	# @example Simple use
+	#   class { '$1': }
 	#
-	# [*parameter1*]
-	#   Explanation of what this parameter affects and what it defaults to.
-	#   e.g. "Specify one or more upstream ntp servers as an array."
-	#
-	# === Variables
-	#
-	# Here you should define a list of variables that this module would require.
-	#
-	# [*variable1*]
-	#   Explanation of how this variable affects the funtion of this class and
-	#   if it has a default. e.g. "The parameter enc_ntp_servers must be set by the
-	#   External Node Classifier as a comma separated list of hostnames."
-	#
-	# === Examples
-	#
-	#  class { '$1':
-	#    parameter1 => [ 'just', 'an', 'example', ]
-	#  }
-	#
-	# === Authors
-	#
-	# `g:snips_author` <`g:snips_email`>
+	# @example Use with params
+	#   class { '$1':
+	#     $$4 => '${7:undef}',
+	#   }
 	#
-	# === Copyright
+	# @author ${8:`g:snips_author`} <${9:`g:snips_email`}>
 	#
-	# Copyright `strftime("%Y")` `g:snips_author`
+	# @note Copyright `strftime("%Y")` $8
 	#
-	class $1 (${3}){
-		${4}
+	class $1(
+		$$4 = undef,
+	) {
+		${0}
 	}
 
 snippet defheader
-	# == Define: ${1:`vim_snippets#Filename(expand('%:p:s?.*modules/??:r:s?/manifests/?::?'), 'name')`}
+	# ${1:`vim_snippets#Filename(expand('%:p:s?.*modules/??:h:h'), 'define-name')`}
+	# ${2:A description of what this define does}
 	#
-	# ${2:Full description of defined resource type $1 here}
+	# @summary ${3:A short summary of the purpose of this define}
 	#
-	# === Parameters
-	#
-	# Document parameters here
-	#
-	# [*namevar*]
-	#   If there is a parameter that defaults to the value of the title string
-	#   when not explicitly set, you must always say so.  This parameter can be
-	#   referred to as a "namevar," since it's functionally equivalent to the
-	#   namevar of a core resource type.
-	#
-	# [*basedir*]
-	#   Description of this variable.  For example, "This parameter sets the
-	#   base directory for this resource type.  It should not contain a trailing
-	#   slash."
-	#
-	# === Examples
-	#
-	# Provide some examples on how to use this type:
+	# @param ${4:parameter1} [${5:String}]
+	#   ${6:Explanation of what this parameter affects.}
 	#
+	# @example Simple use
 	#   $1 { 'namevar':
-	#     basedir => '/tmp/src',
+	#     $$4 => '${7:undef}',
 	#   }
 	#
-	# === Authors
-	#
-	# `g:snips_author` <`g:snips_email`>
+	# @author ${8:`g:snips_author`} <${9:`g:snips_email`}>
 	#
-	# === Copyright
+	# @note Copyright `strftime("%Y")` $8
 	#
-	# Copyright `strftime("%Y")` `g:snips_author`
-	#
-	define $1(${3}) {
-		${4}
+	define $1(
+		$$4 = undef,
+	) {
+		${0}
 	}
 
 # Language Constructs

From 8817da525732b9039bb64014ff412a29bf79c519 Mon Sep 17 00:00:00 2001
From: Marcelo D Montu <marcelo.montu@symphony.com>
Date: Tue, 27 Mar 2018 08:22:37 -0300
Subject: [PATCH 1134/1587] Small improvements (#1037)

* robot: Improve the condition snippets

Improved the condition snippet by providing more placeholders. Also
included quotes on all the conditions, as they are necessary for string
comparison and doesn't hurt on numeric comparison, as explained in
http://robotframework.org/robotframework/latest/libraries/BuiltIn.html#Evaluating%20expressions

* robot: break one line ifs

Changed some snippets to have the condition and else/else if separated
from the keyword in the body, to make the code easier to read.
---
 UltiSnips/robot.snippets | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/UltiSnips/robot.snippets b/UltiSnips/robot.snippets
index cc3c86636..955ecdd60 100644
--- a/UltiSnips/robot.snippets
+++ b/UltiSnips/robot.snippets
@@ -29,7 +29,7 @@ Return From Keyword    ${1:${optional return value}}
 endsnippet
 
 snippet rfki "Return From Keyword If"
-Return From Keyword If    ${1:${condition}}    ${2:${optional return value}}
+Return From Keyword If    '\${${1:rc}}' != '${2:abc}'    ${3:${optional return value}}
 endsnippet
 
 snippet rk "Run Keyword"
@@ -54,7 +54,7 @@ Run Keyword And Return    ${1:${kw}}    ${2:${args}}
 endsnippet
 
 snippet rkari "Run Keyword And Return If"
-Run Keyword And Return If    ${1:{condition}}    ${2:${kw}}    ${3:${args}}
+Run Keyword And Return If    '\${${1:rc}}' != '${2:abc}'    ${3:${kw}}    ${4:${args}}
 endsnippet
 
 snippet rkars "Run Keyword And Return Status"
@@ -62,9 +62,12 @@ snippet rkars "Run Keyword And Return Status"
 endsnippet
 
 snippet rki "Run Keyword If"
-Run Keyword If    ${1:${rc} < 0}    ${2:${VISUAL:Some keyword returning a value}}
-...    ELSE IF    ${3:'${str}' == 'abc'}    ${4:Another keyword}
-...    ELSE    ${5:Final keyword}
+Run Keyword If    '\${${1:rc}}' != '${2:abc}'
+...               ${3:${VISUAL:Some keyword returning a value}}
+...    ELSE IF    '\${${4:str}}' != '${5:def}'
+...               ${6:Another keyword}
+...    ELSE
+...               ${7:Final keyword}
 endsnippet
 
 snippet rkiactf "Run Keyword If Any Critical Tests Failed"
@@ -102,7 +105,7 @@ Run Keywords
 endsnippet
 
 snippet rku "Run Keyword Unless"
-Run Keyword Unless    ${1:${condition}}    ${2:${kw}}    ${3:${args}}
+Run Keyword Unless    '\${${1:rc}}' != '${2:abc}'    ${3:${kw}}    ${4:${args}}
 endsnippet
 
 snippet sgv "Set Global Variable"
@@ -130,7 +133,9 @@ snippet sv "Set Variable"
 endsnippet
 
 snippet svi "Set Variable If"
-\${${1:var}}=    Set Variable If    ${2:${condition}}    ${3:${value true}}    ${4:${value false}}
+\${${1:var}}=    Set Variable If    '\${${2:rc}}' != '${3:abc}'
+`!p snip.rv = '...' + ' ' * (len(t[1]) + 23)` ${4:${value true}}
+`!p snip.rv = '...' + ' ' * (len(t[1]) + 23)` ${5:${value false}}
 endsnippet
 
 snippet wuks "Wait Until Keyword Succeeds"

From b518322762864b6b2dd8b318ba8c497ad441fa3b Mon Sep 17 00:00:00 2001
From: Amit Maindola <maindola.amit@gmail.com>
Date: Wed, 28 Mar 2018 15:57:57 +0530
Subject: [PATCH 1135/1587] Added PLSQL snippet file (#1036)

* Added PLSQL snippet file

* Changes spaces to Tab
---
 UltiSnips/plsql.snippets | 733 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 733 insertions(+)
 create mode 100644 UltiSnips/plsql.snippets

diff --git a/UltiSnips/plsql.snippets b/UltiSnips/plsql.snippets
new file mode 100644
index 000000000..4bc7d7b61
--- /dev/null
+++ b/UltiSnips/plsql.snippets
@@ -0,0 +1,733 @@
+###########################################################################
+#							 PLSQL SNIPPETS								  #
+###########################################################################
+
+global !p
+# Import package
+import datetime
+
+# Return the doc string for PLSQL script
+def docstring_plsql(params):
+	comment = ""
+	if params:
+		comment = "/** Parameters\n"
+		# Split the arguments
+		args = [arg.strip() for arg in params.split(',')]
+		for arg in args:
+			comment += "* {0:30} : \n".format(arg.split(' ')[0].upper())
+		comment += "*/\n"
+	# Return the comment string
+	return comment
+
+def hdr_params(params, level=0, gap="	 "):
+	line = level * gap + "-- -----------------------------------------------"
+	comment = line
+	if params:
+		# Split the arguments
+		args = [arg.strip() for arg in params.split(',')]
+		for arg in args:
+			comment += "\n" + level * gap + "-- {0:20} : ".format(arg.split(' ')[0].upper())
+	# comment += line
+	# Return the comment string
+	return comment
+
+def dyear():
+	""" Returns the current Year in YYYY format
+	"""
+	now = datetime.datetime.now()
+	rv=now.year
+	return rv
+
+def today():
+	""" Returns the current Date in DD-MON-YYYY format
+	"""
+	now = datetime.datetime.now()
+	rv=now.strftime("%d-%b-%Y")
+	return rv
+
+def param(var):
+	""" Returns the string name wrapped value """
+	return "'" + var + " : ' || "
+	
+endglobal
+
+########################################
+#		 SQL Snippets				   #
+########################################
+snippet doc "Document comment"
+	/*
+	 *	${0: comment ...}
+	 */
+endsnippet
+
+snippet hdr "Header Documentation"
+-- #############################################################################
+-- #	  Copyright (c) `!p snip.rv = dyear()` ${1:company}
+-- #				All rights reserved
+-- #
+-- ############################################################################
+-- # Application   : ${2:schema}
+-- # File Name:	   : ${3:`!p snip.rv=snip.fn`}
+-- # Type		   : Table																					 
+-- # Exec Method   : PL/SQL File
+-- # Description   : This script ${5:create} under the schema $2
+-- #										  
+-- # Change History
+-- # -----------------------------------------------------------------------
+-- # Version	 Date		  Author			Remarks
+-- # =======  ===========  ================		============================
+-- # 1.0	  `!p snip.rv = today()`	Amit Maindola		 Initial Version
+-- #############################################################################
+
+endsnippet
+
+snippet pkggbl	"Package Global variables"
+   -- Declare Global Variables
+   g_sysdate									DATE := SYSDATE;
+   g_delimiter									VARCHAR2( 30 ) := '	  ';
+   g_err_length_limit						NUMBER := 1500;
+   g_package_name					   CONSTANT VARCHAR2(30) := '${0}';
+   g_proc_name VARCHAR2(100)					:= NULL;
+   excp_custom									EXCEPTION;
+
+   -- Declare User Global Types
+
+endsnippet
+
+snippet flushca "Flush Cache"
+ALTER SYSTEM FLUSH BUFFER_CACHE;
+endsnippet
+
+snippet flushsp "Flush Shared Pool"
+ALTER SYSTEM FLUSH SHARED_POOL;
+endsnippet
+
+snippet err
+	show errors;
+endsnippet
+
+snippet sel "Select statement"
+SELECT ${0:*} FROM ${1} WHERE 1 = 1;
+endsnippet
+
+snippet selc "Select statement"
+SELECT COUNT(1) FROM ${1} WHERE ${0};
+endsnippet
+
+snippet wrn "Where ROWNNUM"
+WHERE ROWNUM <= 10 ${0:AND}
+endsnippet
+
+snippet arn "AND ROWNNUM"
+AND ROWNUM <= 10 ${0:;}
+endsnippet
+
+snippet ppram "Retuns param in wrapped format"
+	||`!p snip.rv = param(t[1].upper())`$1 $0
+endsnippet
+
+snippet dbo "Show output "
+	DBMS_OUTPUT.put_line('${0}');
+endsnippet
+
+snippet dbop "Show Parameter output "
+	DBMS_OUTPUT.put_line(`!p snip.rv = param(t[1].upper())`$1 $0);
+endsnippet
+
+snippet dbl "Log message in Log Table, Change procedure as defined by you"
+	DEBUG_LOG_PKG.WRITE_LOG(${1:'Test'},${2:$1} ,$0 );
+endsnippet
+
+snippet plog "Print Log output "
+	printlog(`!p snip.rv = param(t[1].upper())`$1 $0);
+endsnippet
+
+snippet dut "DBMS_OUTPUT.put_line"
+	DBMS_UTILITY.get_time;
+endsnippet
+
+snippet bc "Bulk collect into"
+	bulk collect into ${0}
+endsnippet
+
+snippet ei "Execute Immediate"
+	EXECUTE IMMEDIATE '${0:statement}' ;
+endsnippet
+
+snippet eitt "Execute Immediate TRUNCATE Table"
+	EXECUTE IMMEDIATE( 'TRUNCATE TABLE ${0:table}');
+endsnippet
+
+snippet eitp "Execute Immediate ALTER Table Truncate partition"
+	EXECUTE IMMEDIATE( 'ALTER TABLE ${1:table} TRUNCATE PARTITION ${0:partition}');
+endsnippet
+
+snippet prmpt "Prompt message"
+PROMPT ${1:Creating }...
+endsnippet
+
+snippet crseq "Create Sequence"
+DROP SEQUENCE ${1:schema}.${2:name}_s;
+
+CREATE SEQUENCE $1.$2_s
+   START WITH ${3:1}
+   MAXVALUE 999999999999999999999999999
+   MINVALUE 1
+   NOCYCLE
+   NOCACHE
+   NOORDER;
+endsnippet
+
+snippet crsyn "Create Synonym"
+
+CREATE OR REPLACE SYNONYM ${1:schema}.${2:name} FOR ${3:target}.${0};
+
+endsnippet
+
+snippet crind "Create Index"
+DROP INDEX $1.$4;
+
+CREATE INDEX $1.${4:$2_${5}}
+ON ${1:schema}.${2:table}(${3}) ${6:TABLESPACE ${0} };
+endsnippet
+
+########################################
+#		 Table Operation			   #
+########################################
+
+snippet drtab "Drop Table"
+DROP TABLE ${1:schema}.${2:name} CASCADE CONSTRAINTS ${3:PURGE};
+
+endsnippet
+
+snippet crtab "Create Table"
+
+DROP TABLE ${1:schema}.${2:name} CASCADE CONSTRAINTS PURGE;
+
+CREATE TABLE $1.$2
+(
+   ${0}
+)
+${3:TABLESPACE ${4}}
+;
+endsnippet
+
+snippet ccol  "Add VARCHAR2 column to table"
+	${1:,} ${2:name}	VARCHAR2(${0:100})
+endsnippet
+  
+snippet dcol  "Add DATE column to table"
+	${1:,} ${0:name}	DATE
+endsnippet
+  
+snippet ncol  "Add NUMBER column to table"
+	${1:,} ${0:name}	NUMBER
+endsnippet
+
+snippet at "Alter Table"
+	ALTER TABLE ${1:table} ${0}
+endsnippet
+
+
+#########################################
+#	Declare Types and local variable	#
+#########################################
+  
+snippet tr "Type record"
+	TYPE t_${1:rec} IS RECORD (${0:/* columns */} );
+endsnippet
+   
+snippet tt "Type Table"
+	TYPE t_${1:tbl} IS TABLE OF ${0:table_name}%ROWTYPE INDEX BY BINARY_INTEGER;
+endsnippet
+
+snippet tc "Type Cursor"
+	TYPE t_${1:tbl} IS TABLE OF ${0:cur}%ROWTYPE INDEX BY BINARY_INTEGER;
+endsnippet
+
+snippet pn
+	p_${1}		${2:IN}		NUMBER ${3:DEFAULT ${0:NULL}}
+endsnippet
+
+snippet pd
+	p_${1}		${2:IN}		DATE ${3:DEFAULT ${0:SYSDATE}}
+endsnippet
+
+snippet pc
+	P_${1}		${2:IN}		VARCHAR2 ${3:DEFAULT ${0:NULL}}
+endsnippet
+
+snippet ln
+	l_${1}		NUMBER ${2: := ${3} };
+endsnippet
+
+snippet ld
+	l_${1}		DATE ${2: := ${3} };
+endsnippet
+
+snippet lc
+	l_${1}		VARCHAR2(${2:100}) ${3: := ${4} };
+endsnippet
+
+snippet gn
+	g_${1}		NUMBER ${2: := ${3:10} };
+endsnippet
+
+snippet gd
+	g_${1}		DATE ${2: := ${3:SYSDATE} };
+endsnippet
+
+snippet gc
+	g_${1}		VARCHAR2(${2:100}) ${3: := ${4} };
+endsnippet
+
+snippet ltbl
+	l_tbl_${1}		${0};
+endsnippet
+
+snippet lrec
+	l_rec_${1}		${0};
+endsnippet
+
+#########################################
+#		   Condition, Loops				#
+#########################################
+snippet if "If Condition"
+	IF(${1}) THEN
+		${0};
+	END IF;
+endsnippet
+
+snippet ife "IF-Else Condition"
+	IF(${1}) THEN
+		${2};
+	ELSIF
+		${0};
+	END IF;
+endsnippet
+
+snippet els "Else Condition"
+	ELSIF ${1:condition} THEN
+		${0};
+endsnippet
+
+snippet case "Case statement"
+	CASE WHEN (${1}) THEN
+		${2}
+	WHEN (${3}) THEN
+		${4}
+	${0:ELSE}
+	END 
+endsnippet
+
+snippet while "While Loop"
+	WHILE ${1:a} ${2:condition} ${3:b}	LOOP
+		${0};
+	END LOOP;
+endsnippet
+
+snippet fori "For Loop"
+	FOR ${1:indx} in ${2:1}..${3:10}  LOOP
+		${4};
+	END LOOP;
+endsnippet
+
+snippet fort "Table For Loop"
+	FOR ${1:indx} in 1..${2:ttb}.count LOOP
+		${0};
+	END LOOP;
+endsnippet
+
+snippet loop "Loop statement"
+	LOOP
+		${0};
+	END LOOP;
+endsnippet
+
+snippet fora "For All Loop"
+	  IF ( ${1:ttbl}.COUNT > 0 ) THEN
+		 BEGIN
+			FORALL ${2:indx} IN 1 .. $1.COUNT
+				-- Insert/Update
+				${0}
+		 EXCEPTION --Exception Block
+			WHEN OTHERS THEN
+			   l_errmsg	  := 'Error while Bulk updating, Error : ' || SQLERRM;
+			   RAISE excp_custom;
+		 END;
+	  END IF;
+endsnippet
+
+snippet forc "For Cursor Loop"
+	FOR $1_rec IN ${1:cur} ${2:(${3:param})}
+	LOOP
+		${0}
+	END LOOP; -- End $1
+endsnippet
+
+#########################################
+#		  Cursor Operations				#
+#########################################
+snippet dcur "Cursor declaration"
+	CURSOR ${1:cur} IS
+	SELECT ${0}
+		FROM $1
+		WHERE 1 = 1;
+endsnippet
+
+snippet copen "Open Cursor"
+	OPEN ${1:cursor} ${2:( ${3:param} )};
+	FETCH $1
+	INTO ${4:record};
+	${0}
+	IF ( $1 %NOTFOUND ) THEN
+		CLOSE $1;
+		l_errmsg := 'No records fetched in cursor : $1.';
+		RAISE excp_custom;
+	END IF;
+	CLOSE $1;
+endsnippet
+
+snippet copenbc "Open Cursor Bulk collect"
+	OPEN ${1:cursor} ${2:( ${3:param} )};
+	FETCH $1
+	BULK COLLECT INTO ${4:ttbl};
+	CLOSE $1;
+
+	IF ( $4.count = 0 ) THEN
+		l_errmsg := 'No records fetched in cursor : $1.';
+		RAISE excp_custom;{0}
+	END IF;
+endsnippet
+
+#########################################
+#		BEGIN/DECLARE Blocks			#
+#########################################
+snippet decl "Declare Begin block"
+DECLARE
+	${1}
+BEGIN	   
+	${0:null}
+EXCEPTION --Exception Block	  
+   WHEN NO_DATA_FOUND THEN
+		dbms_output.put_line('No Data Found');
+   WHEN OTHERS THEN
+	  dbms_output.put_line('Error while . Error : '||sqlerrm);
+END;
+endsnippet
+
+snippet begin "Begin block"
+BEGIN	   
+   ${0}
+EXCEPTION --Exception Block	  
+   WHEN NO_DATA_FOUND THEN
+	  printlog('No Data Found');
+   WHEN OTHERS THEN
+	  printlog('Error while . Error : '||sqlerrm);
+END;
+endsnippet
+
+snippet excp "Exception Block"
+	EXCEPTION --Exception Block
+	${0}
+		WHEN OTHERS THEN
+		${1};
+	END;
+endsnippet
+
+snippet rae "Raise Application Error"
+RAISE_APPLICATION_ERROR(${1:-20000},${0:''});
+endsnippet
+
+#########################################
+#	   Procedure/Function calling		#
+#########################################
+snippet crjob "Submit DBMS Job"
+-- Submit the job to get the output
+BEGIN
+	DECLARE
+		vjob		  INTEGER;
+	BEGIN
+		DBMS_JOB.submit( vjob, '${1:procedure}${0:('''')};', SYSDATE );
+		DBMS_OUTPUT.put_line( 'Job id : ' || vjob );
+		COMMIT;
+	END;
+END;
+endsnippet
+
+snippet whilejob "Submit DBMS Job with While Loop"
+-- Submit the job to get the output
+
+BEGIN
+	DECLARE
+		vjob		  INTEGER;
+	BEGIN
+		DBMS_JOB.submit ( vjob , '
+DECLARE
+	l_start_date		  DATE := ''${1:01-Jan-2017}'';
+BEGIN
+	WHILE l_start_date < ''${2:01-Jan-2017}''
+	LOOP
+		${3:Procedure}${0:( to_char(l_start_date,''YYYYMMDD'') )};
+		l_start_date		  := TRUNC( l_start_date + 1 );
+	END LOOP;
+EXCEPTION --Exception Block
+	WHEN OTHERS THEN
+		DBMS_OUTPUT.put_line( ''Error while . Error : '' || SQLERRM );
+END;
+			'
+		  , SYSDATE
+		);
+		DBMS_OUTPUT.put_line( 'Job id : ' || vjob );
+		COMMIT;
+	END;
+END;
+endsnippet
+
+  
+#########################################
+#		Function creation scripts		#
+#########################################
+snippet crprintlog "Create Printlog Procedure"
+	------------------------------------------------------------------------------------------------
+	-- PROCEDURE	: PRINTLOG
+	-- Description	: This procedure is used to print log messages in Log file, Table and Console
+	------------------------------------------------------------------------------------------------
+	PROCEDURE printlog (p_message IN VARCHAR2)
+	IS
+		l_errmsg									 VARCHAR2 (10000);
+	BEGIN
+		l_errmsg := SUBSTR ( p_message, 1, g_err_length_limit);
+		fnd_file.put_line ( fnd_file.LOG, l_errmsg); -- Debug log file
+		DBMS_OUTPUT.put_line (l_errmsg); -- Console output
+		DEBUG_LOG_PKG.WRITE_LOG(g_package_name,g_proc_name,p_message); -- Debug table
+	END printlog;
+endsnippet
+
+snippet crgeterr "Create get_errmsg function"
+   -- Form the error message for when others
+   FUNCTION get_errmsg( p_message IN VARCHAR2 DEFAULT NULL )
+	  RETURN VARCHAR2
+   IS
+   BEGIN
+	  RETURN 'Error occured in ' || g_package_name || '.' || g_proc_name || '. ' || NVL( p_message, '' ) || ' Error : ' || SQLERRM;
+   EXCEPTION --Exception Block
+	  WHEN OTHERS THEN
+		 printlog( 'Error while forming messgage. Error : ' || SQLERRM );
+		 RETURN NULL;
+   END;
+endsnippet
+
+snippet crpksfunc "Create package specification function"
+------------------------------------------------------------------------------------------------
+-- Function		: `!p snip.rv = t[1].upper()`
+-- Description	: This Function will ${4:description}.
+`!p snip.rv=hdr_params(t[3]) `
+------------------------------------------------------------------------------------------------
+FUNCTION ${1:func} ${2:(${3:params})} 
+	  RETURN ${0};
+endsnippet
+
+snippet crpksproc "Create package specification procedure"
+------------------------------------------------------------------------------------------------
+-- PROCEDURE	: `!p snip.rv = t[1].upper()`
+-- Description	: This Procedure will ${4:description}.
+`!p snip.rv=hdr_params(t[3],0) `
+------------------------------------------------------------------------------------------------
+PROCEDURE ${1:proc} ${2:(${3:params})} ;
+endsnippet
+
+snippet crpkbfunc "Create package body function"
+	------------------------------------------------------------------------------------------------
+	-- Function		: `!p snip.rv = t[1].upper()`
+	-- Description	: This Function will ${8:description}.
+	`!p snip.rv=hdr_params(t[3],2) `
+	------------------------------------------------------------------------------------------------
+   FUNCTION ${1:func} ${2:(${3:params})} 
+	  RETURN ${4}
+   IS
+	  -- Declare Cursors
+	  -- Declare Variables
+	  ${5:l_}							 $4 ${6:( ${7:length} )};
+   BEGIN
+	  -- Initialize 
+	  g_proc_name								:= '`!p snip.rv = t[1].upper()`';
+	  ${0}
+	  -- Return value
+	  RETURN $5 ;
+   EXCEPTION
+	  WHEN OTHERS
+	  THEN
+		 RETURN NULL;
+   END $1;
+endsnippet
+
+snippet crpkbproc "Create package body procedure"
+
+------------------------------------------------------------------------------------------------
+-- PROCEDURE	: `!p snip.rv = t[1].upper()`
+-- Description	: This Procedure will ${4:description}.
+`!p snip.rv=hdr_params(t[3]) `
+------------------------------------------------------------------------------------------------
+PROCEDURE ${1:proc} ${2:(${3:params})} 
+IS
+   -- Declare cursors
+   -- Declare Out and exception variables
+   l_errmsg										VARCHAR2( 10000 ) := null;
+   excp_skip									EXCEPTION;
+-- Declare Varibales
+
+BEGIN
+   -- Initializing out parameters
+   g_proc_name									:= '`!p snip.rv = t[1].upper()`';
+
+   ${0}
+EXCEPTION -- Exception block of Procedure
+   WHEN excp_custom THEN
+	  ROLLBACK;
+	  printlog( l_errmsg );
+   WHEN OTHERS THEN
+	  ROLLBACK;
+	  l_errmsg									  := get_errmsg;
+	  printlog( l_errmsg );
+END $1;
+
+endsnippet
+
+snippet crpks "Create Package specification"
+CREATE OR REPLACE PACKAGE ${1}.${2}
+AS
+-- #############################################################################
+-- #	  Copyright (c) `!p snip.rv = dyear()` ${3}
+-- #				All rights reserved
+-- #
+-- ############################################################################
+-- #
+-- # Application   : $1
+-- # File Name:	   : `!p snip.rv = t[2].upper()`.pks
+-- # Exec Method   : PL/SQL Stored - Procedure
+-- # Description   : Package used for ${4}
+-- #
+-- # Change History
+-- # -----------------------------------------------------------------------
+-- # Version	 Date		  Author		   Remarks
+-- # =======  ===========  =============	============================
+-- # 1.0	  `!p snip.rv = today()`  Amit Maindola	   Initial Version
+-- #
+-- #
+-- ############################################################################
+   ${0}
+END $2;
+/
+
+SHOW ERROR
+/
+endsnippet
+
+snippet crpkb  "Create package body"
+CREATE OR REPLACE PACKAGE BODY ${1}.${2}
+IS
+-- #############################################################################
+-- #	  Copyright (c) `!p snip.rv = dyear()` ${3}
+-- #				All rights reserved
+-- #
+-- ############################################################################
+-- #
+-- # Application   : $1
+-- # File Name:	   : `!p snip.rv = t[2].upper()`.pkb
+-- # Exec Method   : PL/SQL Stored - Procedure
+-- # Description   : Package used for ${4}
+-- #
+-- # Change History
+-- # -----------------------------------------------------------------------
+-- # Version	 Date		  Author		   Remarks
+-- # =======  ===========  =============	============================
+-- # 1.0	  `!p snip.rv = today()`  Amit Maindola	   Initial Version
+-- #
+-- #
+-- ############################################################################ 
+   -- Declare Global Variables
+   g_sysdate									DATE := SYSDATE;
+   g_delimiter									VARCHAR2( 30 ) := '	  ';
+   g_err_length_limit						NUMBER := 1500;
+   g_package_name					   CONSTANT VARCHAR2(30) := '`!p snip.rv = t[2].upper()`';
+   g_proc_name VARCHAR2(100)					:= NULL;
+   excp_custom									EXCEPTION;
+
+   -- Declare User Global Types
+
+   ------------------------------------------------------------------------------------------------
+   -- PROCEDURE	   : PRINTLOG
+   -- Description  : This procedure is used to print log messages
+   ------------------------------------------------------------------------------------------------
+   PROCEDURE printlog( p_message IN VARCHAR2 )
+   IS
+   BEGIN
+	  DBMS_OUTPUT.PUT_LINE( p_message );
+	  DEBUG_LOG_PKG.WRITE_LOG(g_package_name,g_proc_name,p_message);
+   END printlog;
+
+   -- Form the error message for when others
+   FUNCTION get_errmsg( p_message IN VARCHAR2 DEFAULT NULL )
+	  RETURN VARCHAR2
+   IS
+   BEGIN
+	  RETURN 'Error occured in ' || g_package_name || '.' || g_proc_name || '. ' || NVL( p_message, '' ) || ' Error : ' || SQLERRM;
+   EXCEPTION --Exception Block
+	  WHEN OTHERS THEN
+		 printlog( 'Error while forming messgage. Error : ' || SQLERRM );
+		 RETURN NULL;
+   END;
+
+END $2;
+/
+
+SHOW ERROR
+/
+
+endsnippet
+
+snippet crproc "Create procedure"
+
+CREATE OR REPLACE PROCEDURE ${1:schema}.${2:name} ${3:( ${4:prams} )}
+-- #############################################################################
+-- #	  Copyright (c) `!p snip.rv = dyear()` ${5}
+-- #				All rights reserved
+-- #
+-- ############################################################################
+-- #
+-- # Application   : $1
+-- # File Name:	   : `!p snip.rv = t[2].upper()`.prc
+-- # Exec Method   : PL/SQL Stored - Procedure
+-- # Description   : Package used for ${6}
+-- #
+-- # Change History
+-- # -----------------------------------------------------------------------
+-- # Version	 Date		  Author		   Remarks
+-- # =======  ===========  =============	============================
+-- # 1.0	  `!p snip.rv = today()`  Amit Maindola	   Initial Version
+-- #
+-- #
+-- ############################################################################
+is
+	g_proc_name									 VARCHAR2(30)	   := '`!p snip.rv = t[2].upper()`';
+	l_errmsg									 VARCHAR2( 10000 ) := null;
+	excp_custom									 EXCEPTION;
+	-- Declare cursors
+	-- Declare Varibales
+BEGIN
+   -- Initializing out parameters
+
+   ${0}
+EXCEPTION -- Exception block of Procedure
+   WHEN excp_custom THEN
+	  ROLLBACK;
+	  DEBUG_LOG_PKG.WRITE_LOG(g_proc_name,g_proc_name ,l_errmsg );
+   WHEN OTHERS THEN
+	  ROLLBACK;
+	  l_errmsg									  := 'Exception in procedure. '||SQLERRM;
+	  DEBUG_LOG_PKG.WRITE_LOG(g_proc_name,g_proc_name ,l_errmsg );
+END $2;
+
+endsnippet
+

From 3733ca9f1dae9b38d68eb9aaadf41dc9a9c9a01c Mon Sep 17 00:00:00 2001
From: Fabian Pijcke <fabian.pijcke@gmail.com>
Date: Mon, 2 Apr 2018 01:03:35 +0200
Subject: [PATCH 1136/1587] Spurious line break in eqann snippet (#1039)

---
 UltiSnips/texmath.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/texmath.snippets b/UltiSnips/texmath.snippets
index d0a25e9aa..ca618027a 100644
--- a/UltiSnips/texmath.snippets
+++ b/UltiSnips/texmath.snippets
@@ -25,8 +25,8 @@ snippet eqann "Equation array without numbers" b
 \begin{eqnarray*}
 	$1 & $2 & $0
 \end{eqnarray*}
-
 endsnippet
+
 snippet frac "Fraction" w
 \frac{${1:${VISUAL:nom}}}{${2:denom}}
 endsnippet

From 35ad75a40d568cadfd79d5c272f3203c880a9698 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 13 Apr 2018 12:00:36 +0100
Subject: [PATCH 1137/1587] Update ReasonML to new syntax

---
 snippets/reason.snippets | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/snippets/reason.snippets b/snippets/reason.snippets
index f171ffeea..025f0383d 100644
--- a/snippets/reason.snippets
+++ b/snippets/reason.snippets
@@ -5,17 +5,13 @@ snippet doc
 snippet let
 	let ${1} = ${0};
 snippet fn
-	let ${1} => {
-		${0}
-	};
-snippet fn0
-	let ${1} () => {
+	let ${1} = (${2}) => {
 		${0}
 	};
 snippet fun
 	fun ${1} => ${0}
 snippet ty
-	type ${1} = ${1};
+	type ${1} = ${0};
 snippet mod
 	module ${1} = {
 		${0}
@@ -30,6 +26,8 @@ snippet sw
 	}
 snippet |
 	| ${1} => ${0}
+snippet p
+	|> ${0}
 snippet if
 	if (${1}) {
 		${2}

From d081fa5117acdd972bd0a3ec1c0424e79ef6121e Mon Sep 17 00:00:00 2001
From: Denis Kolodin <deniskolodin@gmail.com>
Date: Mon, 16 Apr 2018 08:56:12 +0300
Subject: [PATCH 1138/1587] Add AsRef and AsMut implementations to rust.snippet

---
 snippets/rust.snippets | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 8460d4ae9..24193db4f 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -191,3 +191,16 @@ snippet as "assert!"
 	assert!(${1:predicate});
 snippet ase "assert_eq!"
 	assert_eq!(${1:expected}, ${2:actual});
+# Implementations
+snippet asref "AsRef trait implementation"
+	impl AsRef<${1:Ref}> for ${2:Type} {
+		fn as_ref(&self) -> &${3:$1} {
+			&self.${0:field}
+		}
+	}
+snippet asmut "AsMut trait implementation"
+	impl AsMut<${1:Ref}> for ${2:Type} {
+		fn as_mut(&mut self) -> &mut ${3:$1} {
+			&mut self.${0:field}
+		}
+	}

From 4e4d080aeed65caed68a949aa6eeb5a4a8aa37ea Mon Sep 17 00:00:00 2001
From: Chris Dueck <chris.dueck@wattpad.com>
Date: Tue, 17 Apr 2018 14:02:53 -0400
Subject: [PATCH 1139/1587] Add a go snippet for HTTP handler methods

Following the pattern of the existing `func`/`funch` snippets, this
commit adds a `fumh` snippet to go along with `fum`.
---
 snippets/go.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 47125f8aa..5e0e44381 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -133,6 +133,11 @@ snippet fum
 		${6}
 	}
 	${0}
+# http handler function on reciever
+snippet fumh
+	func (${1:receiver} ${2:type}) ${3:funcName}(${4:w} http.ResponseWriter, ${5:r} *http.Request) {
+		${0:${VISUAL}}
+	}
 # log printf
 snippet lf
 	log.Printf("%${1:s}", ${2:var})

From b77cdcc9ba9a5f8e14cba3823dca706a03b87397 Mon Sep 17 00:00:00 2001
From: Norbu Tsering <ntsering91@gmail.com>
Date: Tue, 24 Apr 2018 12:05:57 -0400
Subject: [PATCH 1140/1587] fixed typo: two -> three

---
 snippets/c.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index eb996acf3..614a48827 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -198,13 +198,13 @@ snippet dfun2
 	{
 		${12}
 	}
-# function definition with two parameters
+# function definition with three parameters
 snippet fun3
 	${1:void} ${2:function_name}(${3:Type} ${4:Parameter}, ${5:Type} ${6:Parameter}, ${7:Type} ${8:Parameter})
 	{
 		${9}
 	}
-# function definition with two parameters with  Doxygen documentation
+# function definition with three parameters with  Doxygen documentation
 snippet dfun3
 	/*! \brief ${1:Brief function description here}
 	 *

From 498e6638c8e1bc42d1c433506b22b49f01b6bdea Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 29 Apr 2018 18:05:31 +0100
Subject: [PATCH 1141/1587] Correct Reason switch

---
 snippets/reason.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/reason.snippets b/snippets/reason.snippets
index 025f0383d..24db4766c 100644
--- a/snippets/reason.snippets
+++ b/snippets/reason.snippets
@@ -21,7 +21,7 @@ snippet modty
 		${0}
 	};
 snippet sw
-	switch ${1} {
+	switch (${1}) {
 	| ${2} => ${0}
 	}
 snippet |

From c54452df8d060bd64a73c1cde4b6113cbccb0ddf Mon Sep 17 00:00:00 2001
From: "Viet (Drake) Tran" <phuocviet89@gmail.com>
Date: Thu, 3 May 2018 13:54:40 +0700
Subject: [PATCH 1142/1587] Add rspec allow snippets

Snippet for rspec `allow(object).to ...`
---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 3f909a0c8..793098d24 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -688,6 +688,8 @@ snippet expb
 	expect { ${1:object} }.to ${0}
 snippet experr
 	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/
+snippet allow
+	allow(${1:object}).to ${0}
 snippet shared
 	shared_examples ${0:'shared examples name'}
 snippet ibl

From b902dd1a2fa57f892db6ce95c76990118f1b0741 Mon Sep 17 00:00:00 2001
From: pascalwhoop <accounts@pascalbrokmeier.de>
Date: Tue, 1 May 2018 22:30:09 +0200
Subject: [PATCH 1143/1587] added acronym and minted extension

---
 UltiSnips/tex.snippets | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index e54c2c720..ddd5b55bc 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -183,6 +183,18 @@ snippet subp "Subparagraph" b
 $0
 endsnippet
 
+snippet ac "Acroynm normal" b
+\ac{${1:acronym}}
+$0
+endsnippet
+
+snippet acl "Acroynm expanded" b
+\acl{${1:acronym}}
+$0
+endsnippet
+
+
+
 snippet ni "Non-indented paragraph" b
 \noindent
 $0
@@ -197,9 +209,15 @@ snippet lp "Long parenthesis"
 endsnippet
 
 snippet "mint(ed)?( (\S+))?" "Minted code typeset" br
-\begin{minted}{${1:`!p
+\begin{listing}
+\begin{minted}[linenos,numbersep=5pt,frame=lines,framesep=2mm]{${1:`!p
 snip.rv = match.group(3) if match.group(2) is not None else "language"`}}
 ${2:${VISUAL:code}}
-\end{minted}$0
+\end{minted}
+\caption{${3:caption name}}
+\label{lst:${4:${3/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+\end{listing}
+
+$0
 endsnippet
 # vim:ft=snippets:

From 1abd3dfea6002af159057c36f2648da533ea5e06 Mon Sep 17 00:00:00 2001
From: James Hartman <hartman.james.p@gmail.com>
Date: Thu, 3 May 2018 14:48:20 -0400
Subject: [PATCH 1144/1587] fixed quotes on html 5 video snippet

---
 snippets/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index e91b07169..3c17e09e1 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -872,7 +872,7 @@ snippet ul+
 snippet var
 	<var>${0}</var>
 snippet video
-	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>
+	<video src="${1}" height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}">${7}</video>
 snippet wbr
 	<wbr />
 snippet viewport

From 96eba28697197cda73c8f26034eb34444c3a5b38 Mon Sep 17 00:00:00 2001
From: James Hartman <hartman.james.p@gmail.com>
Date: Thu, 3 May 2018 15:05:12 -0400
Subject: [PATCH 1145/1587] added video with class snippet

---
 snippets/html.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 3c17e09e1..84f8eea04 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -873,6 +873,8 @@ snippet var
 	<var>${0}</var>
 snippet video
 	<video src="${1}" height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}">${7}</video>
+snippet video.
+	<video class="${1}" src="${2}" height="${3}" width="${4}" preload="${6:none}" autoplay="${7:autoplay}">${8}</video>
 snippet wbr
 	<wbr />
 snippet viewport

From 954929daacf73ce12df91de205b99c5ab9ec1d9d Mon Sep 17 00:00:00 2001
From: James Hartman <hartman.james.p@gmail.com>
Date: Thu, 3 May 2018 15:30:38 -0400
Subject: [PATCH 1146/1587] fixed tabstop numbering

---
 snippets/html.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 84f8eea04..b57f6b5e1 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -872,9 +872,9 @@ snippet ul+
 snippet var
 	<var>${0}</var>
 snippet video
-	<video src="${1}" height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}">${7}</video>
+	<video src="${1}" height="${2}" width="${3}" preload="${4:none}" autoplay="${5:autoplay}">${6}</video>
 snippet video.
-	<video class="${1}" src="${2}" height="${3}" width="${4}" preload="${6:none}" autoplay="${7:autoplay}">${8}</video>
+	<video class="${1}" src="${2}" height="${3}" width="${4}" preload="${5:none}" autoplay="${6:autoplay}">${7}</video>
 snippet wbr
 	<wbr />
 snippet viewport

From 3dd8f06c7fe72c9d8ce9261ab5bcd577784956bd Mon Sep 17 00:00:00 2001
From: junkdeck <fred@mslsr.com>
Date: Thu, 29 Mar 2018 14:17:05 +0200
Subject: [PATCH 1147/1587] added 'getElementsByClassName' by 'c' in
 'javascript'

---
 UltiSnips/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index b6a654c7e..e97469f60 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -26,7 +26,7 @@ endglobal
 #                            TextMate Snippets                            #
 ###########################################################################
 snippet get "Get Elements"
-getElement${1/(T)|.*/(?1:s)/}By${1:T}${1/(T)|(I)|.*/(?1:agName)(?2:d)/}('$2')
+getElement${1/(T)|(C)|.*/(?1:s)(?2:s)/}By${1:T}${1/(T)|(I)|(C).*/(?1:agName)(?2:d)(?3:lassName)/}('$2')
 endsnippet
 
 snippet '':f "object method string"

From 359cf9d25b000db3c4e301f010b49dd4568e491d Mon Sep 17 00:00:00 2001
From: junkdeck <fred@mslsr.com>
Date: Thu, 29 Mar 2018 14:18:20 +0200
Subject: [PATCH 1148/1587] 'irc' snipper for React, {Component}

---
 snippets/javascript/javascript-react.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index 9deae796c..011c5c1f0 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -1,5 +1,7 @@
 snippet ir
 	import React from 'react';
+snippet irc
+	import React, {Component} from 'react';
 snippet ird
 	import ReactDOM from 'react-dom';
 snippet cdm

From 9e48a8aa8b5c1dba9321d5ef06349f48046520b6 Mon Sep 17 00:00:00 2001
From: junkdeck <fred@mslsr.com>
Date: Thu, 29 Mar 2018 14:34:49 +0200
Subject: [PATCH 1149/1587] renamed 'f' to 'anf' (anonymous function)

---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index df0669bdb..0dc5783e0 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -10,7 +10,7 @@ snippet fun
 		${0:${VISUAL}}
 	}
 # Anonymous Function
-snippet f "" w
+snippet anf "" w
 	function(${1}) {
 		${0:${VISUAL}}
 	}

From 880c57c0a063c73caaacb9638abe23f763c6ece2 Mon Sep 17 00:00:00 2001
From: junkdeck <fred@mslsr.com>
Date: Thu, 29 Mar 2018 14:35:56 +0200
Subject: [PATCH 1150/1587] renamed UltiSnip 'af' to 'anf' (anonymous function)
 to avoid conflict with ES6 'af' (arrow-function)

---
 UltiSnips/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index e97469f60..602a56b99 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -68,7 +68,7 @@ ${1:var }${2:function_name} = function $2`!p snip.rv = space_before_function_par
 }`!p snip.rv = semi(snip)`
 endsnippet
 
-snippet af "Anonymous Function" i
+snippet anf "Anonymous Function" i
 function`!p snip.rv = space_before_function_paren(snip)`($1) {
 	${VISUAL}$0
 }

From 87dd0531825ad90539a49d3e73e44f90fcb5a0f7 Mon Sep 17 00:00:00 2001
From: Florian Heiderich <florian@heiderich.org>
Date: Wed, 16 May 2018 14:19:14 +0200
Subject: [PATCH 1151/1587] add VISUAL placeholder; remove option "b"

---
 UltiSnips/tex.snippets | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index ddd5b55bc..b3383aec7 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -126,58 +126,58 @@ snippet cha "Chapter" b
 $0
 endsnippet
 
-snippet sec "Section" b
-\section{${1:section name}}%
+snippet sec "Section"
+\section{${1:${VISUAL:section name}}}%
 \label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0
 endsnippet
 
-snippet sec* "Section" b
-\section*{${1:section name}}%
+snippet sec* "Section"
+\section*{${1:${VISUAL:section name}}}%
 \label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
 endsnippet
 
 
-snippet sub "Subsection" b
-\subsection{${1:subsection name}}%
+snippet sub "Subsection"
+\subsection{${1:${VISUAL:subsection name}}}%
 \label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0
 endsnippet
 
-snippet sub* "Subsection" b
-\subsection*{${1:subsection name}}%
+snippet sub* "Subsection"
+\subsection*{${1:${VISUAL:subsection name}}}%
 \label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
 endsnippet
 
-snippet ssub "Subsubsection" b
-\subsubsection{${1:subsubsection name}}%
+snippet ssub "Subsubsection"
+\subsubsection{${1:${VISUAL:subsubsection name}}}%
 \label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0
 endsnippet
 
-snippet ssub* "Subsubsection" b
-\subsubsection*{${1:subsubsection name}}%
+snippet ssub* "Subsubsection"
+\subsubsection*{${1:${VISUAL:subsubsection name}}}%
 \label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 ${0}
 endsnippet
 
-snippet par "Paragraph" b
-\paragraph{${1:paragraph name}}%
+snippet par "Paragraph"
+\paragraph{${1:${VISUAL:paragraph name}}}%
 \label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0
 endsnippet
 
-snippet subp "Subparagraph" b
-\subparagraph{${1:subparagraph name}}%
+snippet subp "Subparagraph"
+\subparagraph{${1:${VISUAL:subparagraph name}}}%
 \label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
 
 $0

From 3d4006f3dae841fb53c99b621394c80543fbdd5a Mon Sep 17 00:00:00 2001
From: Fabian Hinz <hallo@naibafo.de>
Date: Fri, 25 May 2018 00:08:33 +0200
Subject: [PATCH 1152/1587] remove duplicate doctype snippets in html

---
 snippets/html.snippets | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index b57f6b5e1..64ef70016 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -50,27 +50,6 @@ snippet esc
 # comment
 snippet //
 	<!-- ${1} -->${0}
-# Generic Doctype
-snippet doctype HTML 4.01 Strict
-	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-	"http://www.w3.org/TR/html4/strict.dtd">
-snippet doctype HTML 4.01 Transitional
-	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-	"http://www.w3.org/TR/html4/loose.dtd">
-snippet doctype HTML 5
-	<!DOCTYPE HTML>
-snippet doctype XHTML 1.0 Frameset
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-snippet doctype XHTML 1.0 Strict
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-snippet doctype XHTML 1.0 Transitional
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-snippet doctype XHTML 1.1
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 # HTML Doctype 4.01 Strict
 snippet docts
 	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"

From 571e260b18901d62c2c719c82fee294d14a8d52b Mon Sep 17 00:00:00 2001
From: Yongwen Zhuang <zYeoman@users.noreply.github.com>
Date: Fri, 25 May 2018 13:02:22 +0800
Subject: [PATCH 1153/1587] all.snippets - %F not work on windows

%F is equivalent to %Y-%m-%d
---
 UltiSnips/all.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index d956e0e87..c50e69132 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -77,7 +77,7 @@ endsnippet
 # DATES #
 #########
 snippet date "YYYY-MM-DD" w
-`!v strftime("%F")`
+`!v strftime("%Y-%m-%d")`
 endsnippet
 
 snippet ddate "Month DD, YYYY" w
@@ -85,7 +85,7 @@ snippet ddate "Month DD, YYYY" w
 endsnippet
 
 snippet diso "ISO format datetime" w
-`!v strftime("%F %H:%M:%S%z")`
+`!v strftime("%Y-%m-%d %H:%M:%S%z")`
 endsnippet
 
 snippet time "hh:mm" w

From 15115294a744a1e13b23b50f6ae67fcc2fa387ad Mon Sep 17 00:00:00 2001
From: ToruIwashita <toru.iwashita@crowdworks.co.jp>
Date: Mon, 28 May 2018 16:21:26 +0900
Subject: [PATCH 1154/1587] Add new snippets for python

---
 snippets/python.snippets | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 3c67125ca..a425c323a 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -47,6 +47,14 @@ snippet cl
 			${5:super($1, self).__init__()}
 			self.$4 = $4
 			${0}
+snippet cla
+	class ${1:class_name}:
+		"""${0:description}"""
+snippet clai
+	class ${1:class_name}:
+		"""${2:description}"""
+		def __init__(self, ${3:args}):
+			${0}
 # New Function
 snippet def
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
@@ -63,6 +71,9 @@ snippet adeff
 	async def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
 		${0}
 # New Method
+snippet defi
+	def __init__(self, ${1:args}):
+		${0}
 snippet defm
 	def ${1:mname}(self, ${2:arg}):
 		${0}

From 05fc5b4c8e125f36752c42f49cbc3f83f9dbe1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20H=C3=B6rl?= <bernhard-hoerl@gmx.at>
Date: Thu, 7 Jun 2018 17:26:33 +0200
Subject: [PATCH 1155/1587] added physics related snippets

---
 UltiSnips/texmath.snippets | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/texmath.snippets b/UltiSnips/texmath.snippets
index ca618027a..de8ef0131 100644
--- a/UltiSnips/texmath.snippets
+++ b/UltiSnips/texmath.snippets
@@ -28,7 +28,7 @@ snippet eqann "Equation array without numbers" b
 endsnippet
 
 snippet frac "Fraction" w
-\frac{${1:${VISUAL:nom}}}{${2:denom}}
+\frac{${1:${VISUAL}}}{${2}}
 endsnippet
 
 snippet mat "Smart Matrix"
@@ -53,4 +53,23 @@ snippet lr[ "left[ right]" w
 \left[ ${1:${VISUAL}} \right]
 endsnippet
 
+#################
+# PHYSICS STUFF #
+#################
+snippet dv "Derivative" w
+\dv[${1:${VISUAL}}]{${2}}{${3}}
+endsnippet
+
+snippet pdv "Partial Derivative" w
+\pdv[${1:${VISUAL}}]{${2}}{${3}}
+endsnippet
+
+snippet SI "SI-Unit" w
+\SI{${1:${VISUAL}}}{${2}}
+endsnippet
+
+snippet qm "Quick Math" b
+\[ $0 \]
+endsnippet
+
 # vim:ft=snippets:

From 62f46770378ab899f40c334de264ccd64dc2db57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20H=C3=B6rl?= <bernhard-hoerl@gmx.at>
Date: Thu, 7 Jun 2018 19:11:04 +0200
Subject: [PATCH 1156/1587] added align align*

---
 UltiSnips/texmath.snippets | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/texmath.snippets b/UltiSnips/texmath.snippets
index de8ef0131..27f3a2408 100644
--- a/UltiSnips/texmath.snippets
+++ b/UltiSnips/texmath.snippets
@@ -3,6 +3,7 @@ priority -50
 ##############
 # MATH STUFF #
 ##############
+
 snippet eq "Equation" b
 \begin{equation}
 	$0
@@ -15,6 +16,18 @@ snippet eqnn "Equation without number" b
 \end{equation*}
 endsnippet
 
+snippet al "Align" b
+\begin{align}
+	$0
+\end{align}
+endsnippet
+
+snippet alnn "Align without numbers" b
+\begin{align*}
+	$0
+\end{align*}
+endsnippet
+
 snippet eqa "Equation array" b
 \begin{eqnarray}
 	$1 & $2 & $0
@@ -56,6 +69,7 @@ endsnippet
 #################
 # PHYSICS STUFF #
 #################
+
 snippet dv "Derivative" w
 \dv[${1:${VISUAL}}]{${2}}{${3}}
 endsnippet
@@ -68,8 +82,4 @@ snippet SI "SI-Unit" w
 \SI{${1:${VISUAL}}}{${2}}
 endsnippet
 
-snippet qm "Quick Math" b
-\[ $0 \]
-endsnippet
-
 # vim:ft=snippets:

From 54552eabbaf085ed930ddea48e0a2341a58400ff Mon Sep 17 00:00:00 2001
From: Rightpeter <rightpeter.lu@gmail.com>
Date: Wed, 27 Jun 2018 17:58:59 +0800
Subject: [PATCH 1157/1587] Use 'plug 'for vim-plug in vim.snippets

---
 snippets/vim.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index ee2af1e1e..6c0c0cd3c 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -48,8 +48,8 @@ snippet au augroup ... autocmd block
 	augroup end
 snippet bun Vundle.vim Plugin definition
 	Plugin '${0}'
-snippet plug Vundle.vim Plugin definition
-	Plugin '${0}'
+snippet plug vim-plug Plugin definition
+	Plug '${0}'
 snippet let
 	let ${1:variable} = ${0: value}
 snippet se

From 34ae91eb537af6758bf638f9669b9b4087a96c49 Mon Sep 17 00:00:00 2001
From: Rightpeter <rightpeter.lu@gmail.com>
Date: Wed, 27 Jun 2018 21:24:11 +0800
Subject: [PATCH 1158/1587] Add more snippets for vim-plug in vim.snippets

---
 snippets/vim.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index 6c0c0cd3c..435ea1f34 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -50,6 +50,16 @@ snippet bun Vundle.vim Plugin definition
 	Plugin '${0}'
 snippet plug vim-plug Plugin definition
 	Plug '${0}'
+snippet plugdo vim-plug Plugin definition with { 'do': '' }
+        Plug '${1}', { 'do': '${0}' }
+snippet plugon vim-plug Plugin definition with { 'on': '' }
+        Plug '${1}', { 'on': '${0}' }
+snippet plugfor vim-plug Plugin definition with { 'for': '' }
+        Plug '${1}', { 'for': '${0}' }
+snippet plugbr vim-plug Plugin definition with { 'branch': '' }
+        Plug '${1}', { 'branch': '${0}' }
+snippet plugtag vim-plug Plugin definition with { 'tag': '' }
+        Plug '${1}', { 'tag': '${0}' }
 snippet let
 	let ${1:variable} = ${0: value}
 snippet se

From 6d6cc25570fc44b5cba8ea3ba051926eaed81087 Mon Sep 17 00:00:00 2001
From: Rightpeter <rightpeter.lu@gmail.com>
Date: Wed, 27 Jun 2018 21:37:36 +0800
Subject: [PATCH 1159/1587] Fix space identation error

---
 snippets/vim.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index 435ea1f34..6822b8a98 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -51,15 +51,15 @@ snippet bun Vundle.vim Plugin definition
 snippet plug vim-plug Plugin definition
 	Plug '${0}'
 snippet plugdo vim-plug Plugin definition with { 'do': '' }
-        Plug '${1}', { 'do': '${0}' }
+	Plug '${1}', { 'do': '${0}' }
 snippet plugon vim-plug Plugin definition with { 'on': '' }
-        Plug '${1}', { 'on': '${0}' }
+	Plug '${1}', { 'on': '${0}' }
 snippet plugfor vim-plug Plugin definition with { 'for': '' }
-        Plug '${1}', { 'for': '${0}' }
+	Plug '${1}', { 'for': '${0}' }
 snippet plugbr vim-plug Plugin definition with { 'branch': '' }
-        Plug '${1}', { 'branch': '${0}' }
+	Plug '${1}', { 'branch': '${0}' }
 snippet plugtag vim-plug Plugin definition with { 'tag': '' }
-        Plug '${1}', { 'tag': '${0}' }
+	Plug '${1}', { 'tag': '${0}' }
 snippet let
 	let ${1:variable} = ${0: value}
 snippet se

From e3ca7f0f46c3d1aefd2e0c47eb9c0073ccb426fe Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 12 Jul 2018 12:21:38 +0100
Subject: [PATCH 1160/1587] Dedupe Erlang snippets

---
 UltiSnips/erlang.snippets |  84 -------------------------
 snippets/erlang.snippets  | 128 +++++++++++++++++++++-----------------
 2 files changed, 71 insertions(+), 141 deletions(-)

diff --git a/UltiSnips/erlang.snippets b/UltiSnips/erlang.snippets
index f317685c0..0ac9f5cd7 100644
--- a/UltiSnips/erlang.snippets
+++ b/UltiSnips/erlang.snippets
@@ -9,94 +9,10 @@ ${1:pattern}${2: when ${3:guard}} ->
 	${4:body}
 endsnippet
 
-snippet beh "Behaviour Directive" b
--behaviour(${1:behaviour}).
-endsnippet
-
-snippet case "Case Expression"
-case ${1:expression} of
-	${2:pattern}${3: when ${4:guard}} ->
-		${5:body}
-end
-endsnippet
-
-snippet def "Define Directive" b
--define(${1:macro}${2: (${3:param})}, ${4:body}).
-endsnippet
-
-snippet exp "Export Directive" b
--export([${1:function}/${2:arity}]).
-endsnippet
-
-snippet fun "Fun Expression"
-fun
-	(${1:pattern})${2: when ${3:guard}} ->
-		${4:body}
-end
-endsnippet
-
-snippet fu "Function"
-${1:function}(${2:param})${3: when ${4:guard}} ->
-	${5:body}
-endsnippet
-
-snippet if "If Expression"
-if
-	${1:guard} ->
-		${2:body}
-end
-endsnippet
-
-snippet ifdef "Ifdef Directive" b
--ifdef(${1:macro}).
-endsnippet
-
-snippet ifndef "Ifndef Directive" b
--ifndef(${1:macro}).
-endsnippet
-
-snippet imp "Import Directive" b
--import(${1:module}, [${2:function}/${3:arity}]).
-endsnippet
-
-snippet inc "Include Directive" b
--include("${1:file}").
-endsnippet
-
 snippet mod "Module Directive" b
 -module(${1:`!p snip.rv = snip.basename or "module"`}).
 endsnippet
 
-snippet rcv "Receive Expression"
-receive
-${1:	${2:pattern}${3: when ${4:guard}} ->
-		${5:body}}
-${6:after
-	${7:expression} ->
-		${8:body}}
-end
-endsnippet
-
-snippet rec "Record Directive" b
--record(${1:record}, {${2:field}${3: = ${4:value}}}).
-endsnippet
-
-snippet try "Try Expression"
-try${1: ${2:expression}${3: of
-	${4:pattern}${5: when ${6:guard}} ->
-		${7:body}}}
-${8:catch
-	${9:pattern}${10: when ${11:guard}} ->
-		${12:body}}
-${13:after
-	${14:body}}
-end
-endsnippet
-
-snippet undef "Undef Directive" b
--undef(${1:macro}).
-endsnippet
-
 snippet || "List Comprehension"
 [${1:X} || ${2:X} <- ${3:List}${4:, gen}]
 endsnippet
diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index 960c8e762..7a0a6116a 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -5,12 +5,16 @@ snippet mod
 snippet modall
 	-module(${1:`vim_snippets#Filename()`}).
 	-compile([export_all]).
-	 
+
 	start() ->
 		${0}
-	 
+
 	stop() ->
 		ok.
+snippet d
+	erlang:display(${0}),
+snippet dt
+	erlang:display({${1}, ${0}}),
 # define directive
 snippet def
 	-define(${1:macro}, ${2:body}).
@@ -30,17 +34,23 @@ snippet ifd
 	-ifdef(${1:TEST}).
 	${0}
 	-endif.
+snippet ifnd
+	-ifndef(${1:TEST}).
+	${0}
+	-endif.
+snippet undef
+	-undef(${1:macro}).
 # if expression
 snippet if
 	if
-	    ${1:guard} ->
-	        ${0:body}
+		${1:guard} ->
+			${0:body}
 	end
 # case expression
 snippet case
 	case ${1:expression} of
-	    ${2:pattern} ->
-	        ${0:body};
+		${2:pattern} ->
+			${0:body};
 	end
 # anonymous function
 snippet fun
@@ -48,14 +58,21 @@ snippet fun
 # try...catch
 snippet try
 	try
-	    ${1:${VISUAL}}
+		${1:${VISUAL}}
 	catch
-	    ${2:_:_} -> ${0:got_some_exception}
+		${2:_:_} -> ${0:got_some_exception}
+	end
+snippet rcv "Receive Expression"
+	receive
+	${1:	${2:pattern}${3: when ${4:guard}} ->
+			${5:body}}
+	${6:after
+		${7:expression} ->
+			${8:body}}
 	end
 # record directive
 snippet rec
-	-record(${1:record}, {
-	    ${2:field}=${3:value}}).
+	-record(${1:record}, {${2:field}=${3:value}}).
 # todo comment
 snippet todo
 	%% TODO: ${0}
@@ -82,15 +99,15 @@ snippet application
 	-export([start/2, stop/1]).
 
 	start(_Type, _StartArgs) ->
-	    case ${0:root_supervisor}:start_link() of
-	        {ok, Pid} ->
-	            {ok, Pid};
-	        Other ->
-		          {error, Other}
-	    end.
+		case ${0:root_supervisor}:start_link() of
+			{ok, Pid} ->
+				{ok, Pid};
+			Other ->
+				{error, Other}
+		end.
 
 	stop(_State) ->
-	    ok.
+		ok.
 # OTP supervisor
 snippet supervisor
 	-module(${1:`vim_snippets#Filename()`}).
@@ -106,14 +123,14 @@ snippet supervisor
 	-define(SERVER, ?MODULE).
 
 	start_link() ->
-	    supervisor:start_link({local, ?SERVER}, ?MODULE, []).
+			supervisor:start_link({local, ?SERVER}, ?MODULE, []).
 
 	init([]) ->
-	    Server = {${0:my_server}, {${2}, start_link, []},
-	      permanent, 2000, worker, [${2}]},
-	    Children = [Server],
-	    RestartStrategy = {one_for_one, 0, 1},
-	    {ok, {RestartStrategy, Children}}.
+		Server = {${0:my_server}, {${2}, start_link, []},
+			permanent, 2000, worker, [${2}]},
+		Children = [Server],
+		RestartStrategy = {one_for_one, 0, 1},
+		{ok, {RestartStrategy, Children}}.
 # OTP gen_server
 snippet gen_server
 	-module(${0:`vim_snippets#Filename()`}).
@@ -121,17 +138,10 @@ snippet gen_server
 	-behaviour(gen_server).
 
 	%% API
-	-export([
-	         start_link/0
-	        ]).
+	-export([start_link/0]).
 
 	%% gen_server callbacks
-	-export([init/1,
-	         handle_call/3,
-	         handle_cast/2,
-	         handle_info/2,
-	         terminate/2,
-	         code_change/3]).
+	-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
 
 	-define(SERVER, ?MODULE).
 
@@ -142,30 +152,30 @@ snippet gen_server
 	%%%===================================================================
 
 	start_link() ->
-	    gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
+		gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
 
 	%%%===================================================================
 	%%% gen_server callbacks
 	%%%===================================================================
 
 	init([]) ->
-	    {ok, #state{}}.
+		{ok, #state{}}.
 
 	handle_call(_Request, _From, State) ->
-	    Reply = ok,
-	    {reply, Reply, State}.
+		Reply = ok,
+		{reply, Reply, State}.
 
 	handle_cast(_Msg, State) ->
-	    {noreply, State}.
+		{noreply, State}.
 
 	handle_info(_Info, State) ->
-	    {noreply, State}.
+		{noreply, State}.
 
 	terminate(_Reason, _State) ->
-	    ok.
+		ok.
 
 	code_change(_OldVsn, State, _Extra) ->
-	    {ok, State}.
+		{ok, State}.
 
 	%%%===================================================================
 	%%% Internal functions
@@ -180,14 +190,8 @@ snippet gen_fsm
 	-export([start_link/0]).
 
 	%% gen_fsm callbacks
-	-export([init/1,
-			 state_name/2,
-			 state_name/3,
-			 handle_event/3,
-			 handle_sync_event/4,
-			 handle_info/3,
-			 terminate/3,
-			 code_change/4]).
+	-export([init/1, state_name/2, state_name/3, handle_event/3, handle_sync_event/4,
+		handle_info/3, terminate/3, code_change/4]).
 
 	-record(state, {}).
 
@@ -356,15 +360,15 @@ snippet gen_event
 
 	%% API
 	-export([start_link/0,
-			 add_handler/2]).
+		add_handler/2]).
 
 	%% gen_event callbacks
 	-export([init/1,
-			 handle_event/2,
-			 handle_call/2,
-			 handle_info/2,
-			 terminate/2,
-			 code_change/3]).
+		handle_event/2,
+		handle_call/2,
+		handle_info/2,
+		terminate/2,
+		code_change/3]).
 
 	-record(state, {}).
 
@@ -497,6 +501,16 @@ snippet ieunit
 	${0}
 
 	-endif.
+snippet itest
+	-ifdef(TEST).
+
+	${1}_test() ->
+		${0}
+
+	-endif.
+snippet test
+	${1}_test() ->
+		${0}
 snippet as
 	?assert(${0})
 snippet asn
@@ -523,9 +537,9 @@ snippet testsuite
 
 	%% Test server callbacks
 	-export([suite/0, all/0, groups/0,
-		 init_per_suite/1, end_per_suite/1,
-		 init_per_group/2, end_per_group/2,
-		 init_per_testcase/2, end_per_testcase/2]).
+		init_per_suite/1, end_per_suite/1,
+		init_per_group/2, end_per_group/2,
+		init_per_testcase/2, end_per_testcase/2]).
 
 	%% Test cases
 	-export([

From 10bfa99c7f2a2f0ab2d4b965698c4a1d576bdaa4 Mon Sep 17 00:00:00 2001
From: Broly CJW <brolycjw@gmail.com>
Date: Sat, 14 Jul 2018 11:49:48 +0800
Subject: [PATCH 1161/1587] Add typescriptreact snippets to extend typescript

---
 snippets/typescriptreact.snippets | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 snippets/typescriptreact.snippets

diff --git a/snippets/typescriptreact.snippets b/snippets/typescriptreact.snippets
new file mode 100644
index 000000000..da015d5f0
--- /dev/null
+++ b/snippets/typescriptreact.snippets
@@ -0,0 +1 @@
+extends typescript

From 103523dbc5e0482365d5f6f9bc8ccf4101433c43 Mon Sep 17 00:00:00 2001
From: Florian Heiderich <florian@heiderich.org>
Date: Sun, 15 Jul 2018 14:31:22 +0200
Subject: [PATCH 1162/1587] VISUAL in the t and ti snippets

---
 UltiSnips/xml.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/xml.snippets b/UltiSnips/xml.snippets
index 92dfb6e1b..066208bd3 100644
--- a/UltiSnips/xml.snippets
+++ b/UltiSnips/xml.snippets
@@ -7,10 +7,10 @@ endsnippet
 
 snippet t "Simple tag" b
 <${1:tag}>
-	${2:content}
+	${2:${VISUAL}}
 </${1/([\w:._-]+).*/$1/}>
 endsnippet
 
 snippet ti "Inline tag" b
-<${1:tag}>${2:content}</${1/([\w:._-]+).*/$1/}>
+<${1:tag}>${2:${VISUAL}}</${1/([\w:._-]+).*/$1/}>
 endsnippet

From 0b73ea2558e17557ae6678525d9d5aac27330d0b Mon Sep 17 00:00:00 2001
From: Florian Heiderich <florian@heiderich.org>
Date: Sun, 15 Jul 2018 14:13:38 +0200
Subject: [PATCH 1163/1587] markdown text formatting

*foo*
**foo**
***foo***
---
 UltiSnips/markdown.snippets | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index 0c844eccf..7ac7f5f21 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -50,6 +50,23 @@ snippet spar "Paragraph" b
 $0
 endsnippet
 
+###################
+# Text formatting #
+###################
+
+snippet * "cursive"
+*${1:${VISUAL}}*$0
+endsnippet
+
+snippet ** "bold"
+**${1:${VISUAL}}**$0
+endsnippet
+
+snippet *** "bold"
+***${1:${VISUAL}}***$0
+endsnippet
+
+
 ################
 # Common stuff #
 ################

From 1143432afdb3a97b606b081700eead5b4f499d4d Mon Sep 17 00:00:00 2001
From: Florian Heiderich <florian@heiderich.org>
Date: Mon, 16 Jul 2018 18:49:29 +0200
Subject: [PATCH 1164/1587] corrected descriptions

---
 UltiSnips/markdown.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index 7ac7f5f21..577554c36 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -54,7 +54,7 @@ endsnippet
 # Text formatting #
 ###################
 
-snippet * "cursive"
+snippet * "italics"
 *${1:${VISUAL}}*$0
 endsnippet
 
@@ -62,7 +62,7 @@ snippet ** "bold"
 **${1:${VISUAL}}**$0
 endsnippet
 
-snippet *** "bold"
+snippet *** "bold italics"
 ***${1:${VISUAL}}***$0
 endsnippet
 

From 7c7e7d47ecb51813de7573f056af99e1790d5eff Mon Sep 17 00:00:00 2001
From: Solomon GU <skyosf@gmail.com>
Date: Tue, 21 Aug 2018 10:47:05 +0800
Subject: [PATCH 1165/1587] fix duplicated 'ast'

---
 snippets/php.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index fb313b848..8c4a3e323 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -617,7 +617,7 @@ snippet ascha "$this->assertClassHasAttribute($name, Example::class)"
 	$this->assertClassHasAttribute(${1:$attributeName}, ${2:Example}::class);
 snippet asi "$this->assertInstanceOf(Example::class, $actual)"
 	$this->assertInstanceOf(${1:Example}::class, ${2:$actual});
-snippet ast "$this->assertInternalType('string', $actual)"
+snippet asit "$this->assertInternalType('string', $actual)"
 	$this->assertInternalType(${1:'string'}, ${2:actual});
 snippet asco "$this->assertCount($count, $haystack)"
 	$this->assertCount(${1:$expectedCount}, ${2:$haystack});

From 1c02caa550d38d1d3db6edc89e7e3fc8cf12268e Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 27 Aug 2018 11:57:56 +0100
Subject: [PATCH 1166/1587] Basic OCaml snippets

Part of https://github.com/honza/vim-snippets/issues/1067
---
 snippets/ocaml.snippets | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 snippets/ocaml.snippets

diff --git a/snippets/ocaml.snippets b/snippets/ocaml.snippets
new file mode 100644
index 000000000..465dec026
--- /dev/null
+++ b/snippets/ocaml.snippets
@@ -0,0 +1,30 @@
+snippet doc
+	(*
+		${0}
+	 *)
+snippet let
+	let ${1} = ${2} in ${0}
+snippet fn
+	let ${1} = ${0}
+snippet fun
+	type ${1} = ${0}
+snippet mod
+	module ${1} = struct
+		${0}
+	end
+snippet modty
+	module type ${1} = sig
+		${0}
+	end;
+snippet sw
+	match ${1} with
+	| ${2} -> ${0}
+snippet |
+	| ${1} -> ${0}
+snippet p
+	|> ${0}
+snippet if
+	if ${1} then
+		${2}
+	else
+		${0}

From fbd78a8ae44e864361f3c50e9d3374c26baad7ec Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 27 Aug 2018 11:59:03 +0100
Subject: [PATCH 1167/1587] Remove semicolon

---
 snippets/ocaml.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ocaml.snippets b/snippets/ocaml.snippets
index 465dec026..cbb7c005e 100644
--- a/snippets/ocaml.snippets
+++ b/snippets/ocaml.snippets
@@ -15,7 +15,7 @@ snippet mod
 snippet modty
 	module type ${1} = sig
 		${0}
-	end;
+	end
 snippet sw
 	match ${1} with
 	| ${2} -> ${0}

From 1a08e283d48b4a1ada1fbcc7c363ee040aeec0c9 Mon Sep 17 00:00:00 2001
From: Muhammed Alkan <dev.mhlkan@gmail.com>
Date: Mon, 3 Sep 2018 14:02:14 +0300
Subject: [PATCH 1168/1587] New snippets and improvements

---
 snippets/ocaml.snippets | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/snippets/ocaml.snippets b/snippets/ocaml.snippets
index cbb7c005e..eb5a799cf 100644
--- a/snippets/ocaml.snippets
+++ b/snippets/ocaml.snippets
@@ -3,9 +3,11 @@ snippet doc
 		${0}
 	 *)
 snippet let
-	let ${1} = ${2} in ${0}
+	let ${1} = ${2} in
+	${0}
 snippet fn
-	let ${1} = ${0}
+	let ${1} =
+		${0}
 snippet fun
 	type ${1} = ${0}
 snippet mod
@@ -28,3 +30,10 @@ snippet if
 		${2}
 	else
 		${0}
+snippet fnr
+	let rec ${1} =
+		${0}
+snippet try
+	try
+		${1}
+	with ${0}

From 225647b65522b7421a22f138b9b0a10833d39551 Mon Sep 17 00:00:00 2001
From: Muhammed Alkan <dev.mhlkan@gmail.com>
Date: Tue, 11 Sep 2018 15:35:50 +0300
Subject: [PATCH 1169/1587] Add Many Racket Snippets (#1069)

* Add conditionals

* Add few more snippets

* Spaces to tabs
---
 snippets/racket.snippets | 72 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 snippets/racket.snippets

diff --git a/snippets/racket.snippets b/snippets/racket.snippets
new file mode 100644
index 000000000..723d7383a
--- /dev/null
+++ b/snippets/racket.snippets
@@ -0,0 +1,72 @@
+snippet #r
+	#lang racket
+snippet #tr
+	#lang typed/racket
+snippet #rg
+	#lang racket/gui
+snippet #sb
+	#lang scribble/base
+snippet #d
+	#lang datalog
+snippet #wi
+	#lang web-server/insta
+snippet def
+	(define ${1} ${0})
+snippet defun
+	(define (${1})
+		${0})
+snippet if
+	(if ${1} ${2} ${0})
+snippet ifn
+	(if (not ${1}) ${2} {0})
+snippet ifl
+	(if ${1}
+		(let ()
+			${2})
+		${0})
+snippet ifnl
+	(if (not ${1})
+		(let ()
+			${2})
+		${0})
+snippet when
+	(when ${1}
+		${0})
+snippet cond
+	(cond
+		[(${1})
+			${0}])
+snippet case
+	(case ${1}
+		[(${2})
+			${0}])
+snippet match
+	(match ${1}
+		[(${2})
+			${0}])
+snippet letcc
+	(let/cc here (set! ${1} here) ${0})
+snippet for
+	(for ([${1} ${2}])
+		${0})
+snippet req
+	(require ${0})
+snippet unless
+	(unless ${1} ${2} ${0})
+snippet let
+	(let ([${1}]) ${0})
+snippet begin
+	(begin
+		${0})
+snippet lambda
+	(lambda (${1}) ${0})
+snippet ifb
+	(if ${1}
+		(begin
+			${2})
+		${0})
+snippet ifnb
+	(if (not ${1})
+		(begin
+			${2})
+		${0})

From 2af1ffe88d3de3fbe40a6e74fb626b18a6548cbd Mon Sep 17 00:00:00 2001
From: Justin Proffitt <justindproffitt@gmail.com>
Date: Fri, 14 Sep 2018 15:19:16 -0400
Subject: [PATCH 1170/1587] Add cpp make_shared and make_unique snippets
 (#1072)

---
 snippets/cpp.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 9496555eb..f47a6834d 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -58,6 +58,14 @@ snippet queue
 snippet pqueue
 	std::priority_queue<${1:T}> ${2};
 ##
+## STL smart pointers
+# std::shared_ptr
+snippet msp
+	std::shared_ptr<${1:T}> ${2} = std::make_shared<$1>(${3});
+# std::unique_ptr
+snippet mup
+	std::unique_ptr<${1:T}> ${2} = std::make_unique<$1>(${3});
+##
 ## Access Modifiers
 # private
 snippet pri

From 5d6e3f13b7ed84bb49b5f1d69d25a25abf4c0c62 Mon Sep 17 00:00:00 2001
From: woutersioen <wouter.sioen@gmail.com>
Date: Fri, 11 May 2018 16:09:59 +0200
Subject: [PATCH 1171/1587] Respect optional typehints in PHP Constructors

In modern php, almost all constructor dependencies will have a type
hint, which should be copied over in the PHPDoc and omitted in the
implementation.

This change will handle both cases with a typehint and without a
typehint gracefully.
---
 UltiSnips/php.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 6cc47ae73..f27ac8be5 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -224,10 +224,10 @@ endsnippet
 
 snippet construct "__construct()" b
 /**
- * @param $2mixed ${1/, /\n     * \@param mixed /g}
+ * @param$2 ${1/, /\n     * \@param /g}
  */
 public function __construct(${1:$dependencies})
-{${1/\$(\w+)(, )*/\n        $this->$1 = $$1;/g}
+{${1/\w* ?\$(\w+)(, )*/\n        $this->$1 = $$1;/g}
 }
 $0
 endsnippet

From b0c528e9e1d03ed9debca03ad98a5124accb0f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= <malekpatryk@gmail.com>
Date: Sat, 19 May 2018 14:03:11 +0200
Subject: [PATCH 1172/1587] Add error handling snippet for Go using
 errors.Wrap()

---
 snippets/go.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 5e0e44381..2c4084a8d 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -257,3 +257,8 @@ snippet ja
 	func (p *$1) MarshalJSON() ([]byte, error) {
 		return json.Marshal(&struct{ *$1Alias }{(*$1Alias)(p)})
 	}
+
+snippet errwr # Error handling with errors.Wrap
+	if ${1}err != nil {
+		return errors.Wrap(err, "${2}")
+	}

From 0ee73907775e9434f64ffea4b7033d03cab4547a Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 17 Sep 2018 15:29:15 +0100
Subject: [PATCH 1173/1587] Correct scheme indention

Closes https://github.com/honza/vim-snippets/issues/1073
---
 snippets/scheme.snippets | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/snippets/scheme.snippets b/snippets/scheme.snippets
index 035d53483..bdd445f91 100644
--- a/snippets/scheme.snippets
+++ b/snippets/scheme.snippets
@@ -1,17 +1,17 @@
 snippet +
-	(+	${1}
+	(+ ${1}
 		${0})
 
 snippet -
-	(-	${1}
+	(- ${1}
 		${0})
 
 snippet /
-	(/	${1}
+	(/ ${1}
 		${0})
 
 snippet *
-	(*	${1}
+	(* ${1}
 		${0})
 
 # Definition
@@ -22,12 +22,12 @@ snippet def
 # Definition with lambda
 snippet defl
 	(define ${1:name}
-			(lambda (x)(${0:definition})))
+		(lambda (x)(${0:definition})))
 
 # Condition
 snippet cond
-	(cond	((${1:predicate}) (${2:action}))
-			((${3:predicate}) (${0:action})))
+	(cond ((${1:predicate}) (${2:action}))
+		((${3:predicate}) (${0:action})))
 
 # If statement
 snippet if

From a4147d3169d8cd3835ba6b95c5e613795ca9d40d Mon Sep 17 00:00:00 2001
From: Honza Pokorny <me@honza.ca>
Date: Tue, 18 Sep 2018 13:21:59 -0300
Subject: [PATCH 1174/1587] Remove trailing whitespace from README

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5567c5d98..1d7ce0f10 100644
--- a/README.md
+++ b/README.md
@@ -20,12 +20,12 @@ Snippet engines supporting vim-snippets
 There are different forks of snippet engines which allow the user to insert
 snippets by typing the name of a snippet hitting the expansion mapping.
 
-- [github.com/SirVer/ultisnips](https://github.com/SirVer/ultisnips):   
+- [github.com/SirVer/ultisnips](https://github.com/SirVer/ultisnips):
   python, supports all snippets in this repo.
-- [github.com/garbas/vim-snipmate](https://github.com/garbas/vim-snipmate):   
+- [github.com/garbas/vim-snipmate](https://github.com/garbas/vim-snipmate):
   VimL, snipmate-snippets, engine sometimes behaves strange. Supports
   snippets/*
-- [github.com/Shougo/neosnippet](https://github.com/Shougo/neosnippet.vim):   
+- [github.com/Shougo/neosnippet](https://github.com/Shougo/neosnippet.vim):
   VimL, supports snippets/* with some configuration.
 - [github.com/drmingdrmer/xptemplate](https://github.com/drmingdrmer/xptemplate):
   Totally different syntax, does not read snippets contained in this file, but

From 4e38009264fc15eed8f7e7a0de04d506b3fe8108 Mon Sep 17 00:00:00 2001
From: Honza Pokorny <me@honza.ca>
Date: Tue, 18 Sep 2018 13:32:28 -0300
Subject: [PATCH 1175/1587] Use references instead of inline links in README

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1d7ce0f10..02d7c41eb 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Snippet engines supporting vim-snippets
 There are different forks of snippet engines which allow the user to insert
 snippets by typing the name of a snippet hitting the expansion mapping.
 
-- [github.com/SirVer/ultisnips](https://github.com/SirVer/ultisnips):
+- [github.com/SirVer/ultisnips][7]:
   python, supports all snippets in this repo.
 - [github.com/garbas/vim-snipmate](https://github.com/garbas/vim-snipmate):
   VimL, snipmate-snippets, engine sometimes behaves strange. Supports
@@ -39,9 +39,8 @@ UltiSnips has additional features such as high speed, nesting snippets,
 expanding snippets in snippets and offers powerful transformations on text in
 snippets (like visual selections or placeholder texts).
 
-Which one to use? If you have python give
-[SirVer/ultisnips](https://github.com/SirVer/ultisnips) a try because its fast
-and has the most features.
+Which one to use? If you have python give [SirVer/ultisnips][7] a try because
+its fast and has the most features.
 
 If you have VimL only (vim without python support) your best option is using
 [garbas/vim-snipmate](https://github.com/garbas/vim-snipmate) and cope with the

From bc4fceb20c2cbc8440a304364723b511538dc166 Mon Sep 17 00:00:00 2001
From: Honza Pokorny <me@honza.ca>
Date: Tue, 18 Sep 2018 13:33:02 -0300
Subject: [PATCH 1176/1587] Tidy up a few things in the README

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 02d7c41eb..b9380651f 100644
--- a/README.md
+++ b/README.md
@@ -46,9 +46,9 @@ If you have VimL only (vim without python support) your best option is using
 [garbas/vim-snipmate](https://github.com/garbas/vim-snipmate) and cope with the
 minor bugs found in the engine.
 
-Q: Should "snipMate be deprecated in favour of UltiSnips"?
+**Q**: Should snipMate be deprecated in favour of UltiSnips?
 
-A: No, because snipMate is VimL, and UltiSnips requires Python.
+**A**: No, because snipMate is VimL, and UltiSnips requires Python.
 Some people want to use snippets without having to install Vim with Python
 support. Yes - this sucks.
 
@@ -106,8 +106,8 @@ About how to install snipMate see [snipmate@garbas](https://github.com/garbas/vi
 I know that I should be reading the docs of the snippet engine, just let me copy paste into my `.vimrc`:
 [See this pull request](https://github.com/honza/vim-snippets/pull/307/files).
 
-TROUBLE
-=======
+Getting help
+------------
 
 If you still have trouble getting this to work create a GitHub ticket, ask on
 IRC or the mailing list.
@@ -176,7 +176,7 @@ so that all users can benefit from them.  People can list their snippet reposito
 
 Installation using VAM: https://github.com/MarcWeber/vim-addon-manager
 
-Future - ideas - examples
+Future ideas and examples
 -------------------------
 
 [overview snippet engines](http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html)

From 39219ca29234a7e28e56379308f59e7190358092 Mon Sep 17 00:00:00 2001
From: Honza Pokorny <me@honza.ca>
Date: Tue, 18 Sep 2018 16:35:06 -0300
Subject: [PATCH 1177/1587] Make the README a bit more user friendly

---
 README.md | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index b9380651f..e79d25e8e 100644
--- a/README.md
+++ b/README.md
@@ -82,15 +82,15 @@ For more see the UltiSnips docs (`:help UltiSnips`).
 Installation
 ------------
 
-First be aware that there are many options, see "Snippet engines" above.
-Second be aware than there are [tons of plugin managers](http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html)
-which is why Marc Weber thinks that it doesn't make sense to repeat the same
-repetitive information everywhere.
+First be aware that there are many options, see "Snippet engines" above.  Second
+be aware than there are [tons of plugin managers][8] which is why Marc Weber
+thinks that it doesn't make sense to repeat the same repetitive information
+everywhere.
 
-*Recommended way:*
-[vim-addon-manager](https://github.com/MarcWeber/vim-addon-manager) (because Marc Weber wrote it for exactly
-this reason, it supports simple dependency management). E.g. you're done by this
-line in your `.vimrc`:
+The recommended way to install these snippets is by using
+[vim-addon-manager][9].  Marc Weber wrote it for exactly this reason, it
+supports simple dependency management. E.g. all you need is this line in your
+`.vimrc`:
 
 ```vim
 " assuming you want to use snipmate snippet engine
@@ -100,20 +100,18 @@ ActivateAddons vim-snippets snipmate
 [vim-pi](https://bitbucket.org/vimcommunity/vim-pi/issue/90/we-really-need-a-web-interface)
 Is the place to discuss plugin managers and repository resources.
 
-About how to install snipMate see [snipmate@garbas](https://github.com/garbas/vim-snipmate)
+For snipMate installation instructions, please see [snipmate@garbas][1].
 
-(Bundle, Pathogen, git clone - keywords to make people find this link by ctrl-f search)
-I know that I should be reading the docs of the snippet engine, just let me copy paste into my `.vimrc`:
-[See this pull request](https://github.com/honza/vim-snippets/pull/307/files).
+Pull requests adding installation instructions for Pathogen, Bundle, git clone,
+etc. are welcome and much appreciated.
 
 Getting help
 ------------
 
-If you still have trouble getting this to work create a GitHub ticket, ask on
-IRC or the mailing list.
+If you still have trouble getting this to work, please create a GitHub issue.
 
-Policies / for contributors
----------------------------
+Things to consider when contributing
+------------------------------------
 
 Some snippets are useful for almost all languages, so let's try to have the same
 triggers for them:
@@ -251,3 +249,5 @@ terms of the MIT license.
 [3]: http://github.com/garbas
 [4]: http://github.com/garbas/vim-snipmate
 [7]: http://github.com/SirVer/ultisnips
+[8]: http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html
+[9]: https://github.com/MarcWeber/vim-addon-manager

From 15c00724e69c179e2589a969df413f1404eb860d Mon Sep 17 00:00:00 2001
From: "alessandro.candini" <candini@ariadne.it>
Date: Tue, 18 Sep 2018 08:50:38 +0200
Subject: [PATCH 1178/1587] Add freemarker snippets

---
 snippets/freemarker.snippets | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 snippets/freemarker.snippets

diff --git a/snippets/freemarker.snippets b/snippets/freemarker.snippets
new file mode 100644
index 000000000..e7b2c2e2f
--- /dev/null
+++ b/snippets/freemarker.snippets
@@ -0,0 +1,32 @@
+extends html
+
+snippet assign "<#assign/>"
+<#assign ${1} = ${0:${VISUAL}} />
+endsnippet
+
+snippet if "<#if>...</#if>"
+<#if ${1}>
+	${0:${VISUAL}}
+</#if>
+endsnippet
+
+snippet ife "<#if>...<#else>...</#if>"
+<#if ${1}>
+	${2:${VISUAL}}
+<#else>
+	${0}
+</#if>
+endsnippet
+
+snippet list "<#list>...</#list>"
+<#list ${1} as ${2}>
+	${0:${VISUAL}}
+</#list>
+endsnippet
+
+snippet attempt "<#attempt>...<#recover></#attempt>"
+<#attempt>
+	${0:${VISUAL}}
+<#recover>
+</#attempt>
+endsnippet

From 66f7f86e23ae9c7cae704d364dc19c78802ef333 Mon Sep 17 00:00:00 2001
From: Ruben De Smet <ruben.de.smet@rubdos.be>
Date: Thu, 4 Jan 2018 15:19:33 +0100
Subject: [PATCH 1179/1587] Comment out the EOL in LaTeX section-like commands.

In very rare circumstances, those newlines may lead to mismatched
labels.
---
 snippets/tex.snippets | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index f304a56e6..8351b393c 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -119,53 +119,53 @@ snippet spl split environment
 	\\end{split}
 # Part
 snippet part document \part
-	\\part{${1:part name}} % (fold)
+	\\part{${1:part name}} % (fold)%
 	\\label{prt:${2:$1}}
 	${0}
 	% part $2 (end)
 # Chapter
 snippet cha \chapter
-	\\chapter{${1:chapter name}}
+	\\chapter{${1:chapter name}}%
 	\\label{cha:${2:$1}}
 	${0}
 # Section
 snippet sec \section
-	\\section{${1:section name}}
+	\\section{${1:section name}}%
 	\\label{sec:${2:$1}}
 	${0}
 # Section without number
 snippet sec* \section*
-	\\section*{${1:section name}}
+	\\section*{${1:section name}}%
 	\\label{sec:${2:$1}}
 	${0}
 # Sub Section
 snippet sub \subsection
-	\\subsection{${1:subsection name}}
+	\\subsection{${1:subsection name}}%
 	\\label{sub:${2:$1}}
 	${0}
 # Sub Section without number
 snippet sub* \subsection*
-	\\subsection*{${1:subsection name}}
+	\\subsection*{${1:subsection name}}%
 	\\label{sub:${2:$1}}
 	${0}
 # Sub Sub Section
 snippet ssub \subsubsection
-	\\subsubsection{${1:subsubsection name}}
+	\\subsubsection{${1:subsubsection name}}%
 	\\label{ssub:${2:$1}}
 	${0}
 # Sub Sub Section without number
 snippet ssub* \subsubsection*
-	\\subsubsection*{${1:subsubsection name}}
+	\\subsubsection*{${1:subsubsection name}}%
 	\\label{ssub:${2:$1}}
 	${0}
 # Paragraph
 snippet par \paragraph
-	\\paragraph{${1:paragraph name}}
+	\\paragraph{${1:paragraph name}}%
 	\\label{par:${2:$1}}
 	${0}
 # Sub Paragraph
 snippet subp \subparagraph
-	\\subparagraph{${1:subparagraph name}}
+	\\subparagraph{${1:subparagraph name}}%
 	\\label{subp:${2:$1}}
 	${0}
 snippet ni \noindent

From f1e4604a3e56ff2a2a62869b5a43373ce4f494ef Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 24 Sep 2018 15:38:09 +0100
Subject: [PATCH 1180/1587] Elm element

---
 snippets/elm.snippets | 56 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index d2bace3db..f967f512b 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -58,7 +58,7 @@ snippet doc
 	-}
 snippet p
 	|> ${0}
-snippet program
+snippet program Elm 0.18 program
 	import Html exposing (Html)
 
 
@@ -100,3 +100,57 @@ snippet program
 	view : Model -> Html Msg
 	view model =
 		Html.text "Hello, sailor!"
+snippet element
+	module Main exposing (Model, Msg(..), init, main, subscriptions, update, view)
+
+	import Browser
+	import Html exposing (..)
+	import Json.Encode
+
+
+	main : Program Flags Model Msg
+	main =
+		Browser.element
+			{ init = init
+			, update = update
+			, subscriptions = subscriptions
+			, view = view
+			}
+
+
+	type alias Model =
+		{}
+
+
+	type alias Flags =
+		Json.Encode.Value
+
+
+	init : Flags -> ( Model, Cmd Msg )
+	init flags_ =
+		( {}
+		, Cmd.none
+		)
+
+
+	type Msg
+		= Noop
+
+
+	update : Msg -> Model -> ( Model, Cmd Msg )
+	update msg model =
+		case msg of
+			Noop ->
+				( model
+				, Cmd.none
+				)
+
+
+	subscriptions : Model -> Sub Msg
+	subscriptions model =
+		Sub.none
+
+
+	view : Model -> Html Msg
+	view model =
+		h1 [] [ text "Hello, world!" ]

From cd463f36f3d449fcb6f21b1385b79c9cbcb16f36 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Mon, 24 Sep 2018 15:41:29 +0100
Subject: [PATCH 1181/1587] Correct invalid Freemarker snippets

Closes https://github.com/honza/vim-snippets/issues/1076
---
 snippets/freemarker.snippets | 47 ++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/snippets/freemarker.snippets b/snippets/freemarker.snippets
index e7b2c2e2f..0114ac4c7 100644
--- a/snippets/freemarker.snippets
+++ b/snippets/freemarker.snippets
@@ -1,32 +1,27 @@
 extends html
 
-snippet assign "<#assign/>"
-<#assign ${1} = ${0:${VISUAL}} />
-endsnippet
+snippet assign
+	<#assign ${1} = ${0:${VISUAL}} />
 
-snippet if "<#if>...</#if>"
-<#if ${1}>
-	${0:${VISUAL}}
-</#if>
-endsnippet
+snippet if
+	<#if ${1}>
+		${0:${VISUAL}}
+	</#if>
 
-snippet ife "<#if>...<#else>...</#if>"
-<#if ${1}>
-	${2:${VISUAL}}
-<#else>
-	${0}
-</#if>
-endsnippet
+snippet ife
+	<#if ${1}>
+		${2:${VISUAL}}
+	<#else>
+		${0}
+	</#if>
 
-snippet list "<#list>...</#list>"
-<#list ${1} as ${2}>
-	${0:${VISUAL}}
-</#list>
-endsnippet
+snippet list
+	<#list ${1} as ${2}>
+		${0:${VISUAL}}
+	</#list>
 
-snippet attempt "<#attempt>...<#recover></#attempt>"
-<#attempt>
-	${0:${VISUAL}}
-<#recover>
-</#attempt>
-endsnippet
+snippet attempt
+	<#attempt>
+		${0:${VISUAL}}
+	<#recover>
+	</#attempt>

From b51c01137259ac7cd59381001279fa36baefbc5f Mon Sep 17 00:00:00 2001
From: Tai <letientai299@gmail.com>
Date: Wed, 26 Sep 2018 00:50:14 +0800
Subject: [PATCH 1182/1587] Turn comments into descriptions for go.snippets

---
 snippets/go.snippets | 243 ++++++++++++++++++++++---------------------
 1 file changed, 124 insertions(+), 119 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 2c4084a8d..7cbbf5e21 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -1,204 +1,205 @@
-# shorthand variable declaration
-snippet v
+snippet v "shorthand variable declaration"
 	${1} := ${2}
-# variable initialization
-snippet vr
+
+snippet vr "variable initialization"
 	var ${1:t} ${0:string}
-# variable declaration
-snippet var
+
+snippet var "variable declaration"
 	var ${1} ${2} = ${3}
-# variables declaration
-snippet vars
+
+snippet vars "variables declaration"
 	var (
 		${1} ${2} = ${3}
 	)
-# append
-snippet ap
+
+snippet ap "append"
 	append(${1:slice}, ${0:value})
-# bool
-snippet bl
+
+snippet bl "bool"
 	bool
-# byte
-snippet bt
+
+snippet bt "byte"
 	byte
-# break
-snippet br
+
+snippet br "break"
 	break
-# channel
-snippet ch
+
+snippet ch "channel"
 	chan ${0:int}
-# case
-snippet cs
+
+snippet cs "case"
 	case ${1:value}:
 		${0:${VISUAL}}
-# const
-snippet c
+
+snippet c "const"
 	const ${1:NAME} = ${0:0}
-# constants with iota
-snippet co
+
+snippet co "constants with iota"
 	const (
 		${1:NAME1} = iota
 		${0:NAME2}
 	)
-# continue
-snippet cn
+
+snippet cn "continue"
 	continue
-# defer
-snippet df
+
+snippet df "defer"
 	defer ${0:func}()
-# defer recover
-snippet dfr
+
+snippet dfr "defer recover"
 	defer func() {
 		if err := recover(); err != nil {
 			${0:${VISUAL}}
 		}
 	}()
-# int
-snippet i
+
+snippet i "int"
 	int
-# import
-snippet im
+
+snippet im "import"
 	import (
 		"${1:package}"
 	)
-# interface
-snippet in
+
+snippet in "interface"
 	interface{}
-# full interface snippet
-snippet inf
+
+snippet inf "full interface "
 	interface ${1:name} {
 		${2:/* methods */}
 	}
-# if condition
-snippet if
+
+snippet if "if condition"
 	if ${1:/* condition */} {
 		${2:${VISUAL}}
 	}
-snippet ife
+
+
+snippet ife "if else condition"
 	if ${1:/* condition */} {
 		${2:${VISUAL}}
 	} else {
 		${0}
 	}
-# else snippet
-snippet el
+
+snippet el "else"
 	else {
 		${0:${VISUAL}}
 	}
-# error snippet
-snippet ir
+
+snippet ir "if error not nil, return err"
 	if err != nil {
 		return err
 	}
 	${0}
-# false
-snippet f
+
+snippet f "false"
 	false
-# fallthrough
-snippet ft
+
+snippet ft "fallthrough"
 	fallthrough
-# float
-snippet fl
+
+snippet fl "float"
 	float32
-# float32
-snippet f3
+
+snippet f3 "float32"
 	float32
-# float64
-snippet f6
+
+snippet f6 "float64"
 	float64
-# for int loop
-snippet for
+
+snippet for "for loop"
 	for ${1}{
 		${0:${VISUAL}}
 	}
-# for int loop
-snippet fori
+
+snippet fori "for int loop"
 	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
 		${0:${VISUAL}}
 	}
-# for range loop
-snippet forr
+
+snippet forr "for range loop"
 	for ${1:e} := range ${2:collection} {
 		${0:${VISUAL}}
 	}
-# function simple
-snippet fun
+
+snippet fun "function"
 	func ${1:funcName}(${2}) ${3:error} {
 		${4}
 	}
 	${0}
-# function on receiver
-snippet fum
+
+snippet fum "method"
 	func (${1:receiver} ${2:type}) ${3:funcName}(${4}) ${5:error} {
 		${6}
 	}
 	${0}
-# http handler function on reciever
-snippet fumh
+
+snippet fumh "http handler function on reciever"
 	func (${1:receiver} ${2:type}) ${3:funcName}(${4:w} http.ResponseWriter, ${5:r} *http.Request) {
 		${0:${VISUAL}}
 	}
-# log printf
-snippet lf
+
+snippet lf "log printf"
 	log.Printf("%${1:s}", ${2:var})
-# log printf
-snippet lp
+
+snippet lp "log println"
 	log.Println("${1}")
-# make
-snippet mk
+
+snippet mk "make"
 	make(${1:[]string}, ${0:0})
-# map
-snippet mp
+
+snippet mp "map"
 	map[${1:string}]${0:int}
-# main()
-snippet main
+
+snippet main "func main()"
 	func main() {
 		${1}
 	}
 	${0}
-# new
-snippet nw
+
+snippet nw "new"
 	new(${0:type})
-# package
-snippet pa
+
+snippet pa "package"
 	package ${1:main}
-# panic
-snippet pn
+
+snippet pn "panic"
 	panic("${0:msg}")
-# print
-snippet pr
+
+snippet pf "fmt.Printf()"
 	fmt.Printf("%${1:s}\n", ${2:var})
-# println
-snippet pl
+
+snippet pl "fmt.Println()"
 	fmt.Println("${1:s}")
-# range
-snippet rn
+
+snippet rn "range"
 	range ${0}
-# return
-snippet rt
+
+snippet rt "return"
 	return ${0}
-# result
-snippet rs
+
+snippet rs "result"
 	result
-# select
-snippet sl
+
+snippet sl "select"
 	select {
 	case ${1:v1} := <-${2:chan1}
 		${3}
 	default:
 		${0}
 	}
-# string
-snippet sr
+
+snippet sr "string"
 	string
-# struct
-snippet st
+
+snippet st "struct"
 	struct ${1:name} {
 		${2:/* data */}
 	}
 	${0}
-# switch
-snippet sw
+
+snippet sw "switch"
 	switch ${1:var} {
 	case ${2:value1}:
 		${3}
@@ -207,58 +208,62 @@ snippet sw
 	default:
 		${0}
 	}
-snippet sp
+
+snippet ps "fmt.Sprintf"
 	fmt.Sprintf("%${1:s}", ${2:var})
-# true
-snippet t
+
+snippet t "true"
 	true
-# goroutine named function
-snippet g
+
+snippet g "goroutine named function"
 	go ${1:funcName}(${0})
-# goroutine anonymous function
-snippet ga
+
+snippet ga "goroutine anonymous function"
 	go func(${1} ${2:type}) {
 		${3:/* code */}
 	}(${0})
-snippet test test function
+
+snippet test "test function"
 	func Test${1:name}(t *testing.T) {
 		${0:${VISUAL}}
 	}
-snippet bench benchmark function
+
+snippet bench "benchmark function"
 	func Benchmark${1:name}(b *testing.B) {
 		for i := 0; i < b.N; i++ {
 			${2}
 		}
 	}
 	${0}
-# composite literals
-snippet cl
+
+snippet cl "composite literals"
 	type ${1:name} struct {
 		${2:attrName} ${3:attrType}
 	}
-# if key in a map
-snippet om
+
+snippet om "if key in a map"
 	if ${1:value}, ok := ${2:map}[${3:key}]; ok == true {
 		${4:/* code */}
 	}
 
-# Grouped globals with anonymous struct
-snippet gg
+
+snippet gg "Grouped globals with anonymous struct"
 	var ${1:var} = struct{
 		${2:name} ${3:type}
 	}{
 		$2: ${4:value},
 	}
 
-# Marshalable json alias
-snippet ja
+
+snippet ja "Marshalable json alias"
 	type ${1:parentType}Alias $1
 
 	func (p *$1) MarshalJSON() ([]byte, error) {
 		return json.Marshal(&struct{ *$1Alias }{(*$1Alias)(p)})
 	}
 
-snippet errwr # Error handling with errors.Wrap
+
+snippet errwr "Error handling with errors.Wrap"
 	if ${1}err != nil {
 		return errors.Wrap(err, "${2}")
 	}

From 2573abcb676ec771b35681e754dc8fc79b5a33a2 Mon Sep 17 00:00:00 2001
From: xiguichen <chenxigui_192930@163.com>
Date: Thu, 4 Oct 2018 11:44:56 -0400
Subject: [PATCH 1183/1587] fix C0326: Exactly one space required after comma
 (bad-whitespace) for python snip (#1078)

---
 UltiSnips/python.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 54de91394..79e7aff96 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -637,7 +637,7 @@ endsnippet
 ######################
 
 snippet ae "Assert equal" b
-self.assertEqual(${1:${VISUAL:first}},${2:second})
+self.assertEqual(${1:${VISUAL:first}}, ${2:second})
 endsnippet
 
 snippet at "Assert True" b
@@ -649,7 +649,7 @@ self.assertFalse(${1:${VISUAL:expression}})
 endsnippet
 
 snippet aae "Assert almost equal" b
-self.assertAlmostEqual(${1:${VISUAL:first}},${2:second})
+self.assertAlmostEqual(${1:${VISUAL:first}}, ${2:second})
 endsnippet
 
 snippet ar "Assert raises" b

From 4b1fb31ca8f1f189cf5dace15446c736f0439d76 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 19 Oct 2018 15:55:12 +0000
Subject: [PATCH 1184/1587] eelixir gettext

---
 UltiSnips/eelixir.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/eelixir.snippets b/UltiSnips/eelixir.snippets
index 72fb7ceee..3c490dbba 100644
--- a/UltiSnips/eelixir.snippets
+++ b/UltiSnips/eelixir.snippets
@@ -37,3 +37,7 @@ snippet ff "form_for" w
 	<%= submit "Submit" %>
 <% end %>
 endsnippet
+
+snippet gt "gettext" w
+<%= gettext("${0:${VISUAL}}") %>
+endsnippet

From 65d61d8c55d37362bb7fbc50a62136adb9dc7f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BB=BA=E9=94=8B=20zhangjianfeng?=
 <jaydenzhang@live.cn>
Date: Sun, 21 Oct 2018 02:12:33 +0800
Subject: [PATCH 1185/1587] fix same sinppet name issue (#1080)

---
 snippets/cs.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/cs.snippets b/snippets/cs.snippets
index 110c85f42..ebca0f73a 100644
--- a/snippets/cs.snippets
+++ b/snippets/cs.snippets
@@ -486,7 +486,7 @@ snippet namespace
 		${0}
 	}
 # property
-snippet prop
+snippet propr
 	public ${1:int} ${2:MyProperty} { get; set; }
 snippet propf
 	private ${1:int} ${2:myVar};

From 936ac51771170876ae126a5b59b0205705c1d500 Mon Sep 17 00:00:00 2001
From: sedrubal <sedrubal@users.noreply.github.com>
Date: Sun, 21 Oct 2018 21:35:03 +0200
Subject: [PATCH 1186/1587] Remove trailing slash from auto-closing tags
 (#1081)

This breaks compatibility with XHTML (see #845).
The slashes are even forbidden in HTML4 (but optional in HTML5).
Source: <http://xahlee.info/js/html5_non-closing_tag.html>
---
 snippets/html.snippets | 133 ++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 68 deletions(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 64ef70016..0410d2237 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -138,18 +138,18 @@ snippet address
 		${0}
 	</address>
 snippet area
-	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}" />
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}">
 snippet area+
-	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}" />
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}">
 	area+
 snippet area:c
-	<area shape="circle" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="circle" coords="${1}" href="${2}" alt="${0}">
 snippet area:d
-	<area shape="default" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="default" coords="${1}" href="${2}" alt="${0}">
 snippet area:p
-	<area shape="poly" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="poly" coords="${1}" href="${2}" alt="${0}">
 snippet area:r
-	<area shape="rect" coords="${1}" href="${2}" alt="${0}" />
+	<area shape="rect" coords="${1}" href="${2}" alt="${0}">
 snippet article
 	<article>
 		${0}
@@ -179,7 +179,7 @@ snippet audio
 snippet b
 	<b>${0}</b>
 snippet base
-	<base href="${1}" target="${0}" />
+	<base href="${1}" target="${0}">
 snippet bdi
 	<bdi>${0}</bdo>
 snippet bdo
@@ -197,7 +197,7 @@ snippet body
 		${0}
 	</body>
 snippet br
-	<br />
+	<br>
 snippet button
 	<button type="${1:submit}">${0}</button>
 snippet button.
@@ -219,17 +219,14 @@ snippet cite
 snippet code
 	<code>${0}</code>
 snippet col
-	<col />
-snippet col+
-	<col />
-	col+
+	<col>
 snippet colgroup
 	<colgroup>
 		${0}
 	</colgroup>
 snippet colgroup+
 	<colgroup>
-		<col />
+		<col>
 		col+${0}
 	</colgroup>
 snippet command
@@ -309,7 +306,7 @@ snippet dt+
 snippet em
 	<em>${0}</em>
 snippet embed
-	<embed src="${1}" type="${0}" />
+	<embed src="${1}" type="${0}">
 snippet fieldset
 	<fieldset>
 		${0}
@@ -402,7 +399,7 @@ snippet h6#
 	<h6 id="${1}">${0}</h6>
 snippet head
 	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+		<meta http-equiv="content-type" content="text/html; charset=utf-8">
 
 		<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 		${0}
@@ -428,7 +425,7 @@ snippet hgroup.
 		${0}
 	</hgroup>
 snippet hr
-	<hr />
+	<hr>
 snippet html
 	<html>
 	${0}
@@ -441,8 +438,8 @@ snippet html5
 	<!DOCTYPE html>
 	<html>
 		<head>
-			<meta charset="utf-8" />
-			<meta name="viewport" content="width=device-width" />
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width">
 			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${2:link}
 		</head>
@@ -454,8 +451,8 @@ snippet html5l
 	<!DOCTYPE html>
 	<html lang="${1:es}">
 		<head>
-			<meta charset="utf-8" />
-			<meta name="viewport" content="width=device-width" />
+			<meta charset="utf-8">
+			<meta name="viewport" content="width=device-width">
 			<title>${2:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 			${3:link}
 		</head>
@@ -472,59 +469,59 @@ snippet iframe.
 snippet iframe#
 	<iframe id="${1}" src="${2}" frameborder="0"></iframe>
 snippet img
-	<img src="${1}" alt="${2}" />
+	<img src="${1}" alt="${2}">
 snippet img.
-	<img class="${1}" src="${2}" alt="${3}" />
+	<img class="${1}" src="${2}" alt="${3}">
 snippet img#
-	<img id="${1}" src="${2}" alt="${3}" />
+	<img id="${1}" src="${2}" alt="${3}">
 snippet input
-	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}" />
+	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}">
 snippet input.
-	<input class="${1}" type="${2:text/submit/hidden/button/image}" name="${3}" id="${4:$3}" value="${5}" />
+	<input class="${1}" type="${2:text/submit/hidden/button/image}" name="${3}" id="${4:$3}" value="${5}">
 snippet input:text
-	<input type="text" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="text" name="${1}" id="${2:$1}" value="${3}">
 snippet input:submit
-	<input type="submit" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="submit" name="${1}" id="${2:$1}" value="${3}">
 snippet input:hidden
-	<input type="hidden" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="hidden" name="${1}" id="${2:$1}" value="${3}">
 snippet input:button
-	<input type="button" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="button" name="${1}" id="${2:$1}" value="${3}">
 snippet input:image
-	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}" />
+	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}">
 snippet input:checkbox
-	<input type="checkbox" name="${1}" id="${2:$1}" />
+	<input type="checkbox" name="${1}" id="${2:$1}">
 snippet input:radio
-	<input type="radio" name="${1}" id="${2:$1}" />
+	<input type="radio" name="${1}" id="${2:$1}">
 snippet input:color
-	<input type="color" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="color" name="${1}" id="${2:$1}" value="${3}">
 snippet input:date
-	<input type="date" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="date" name="${1}" id="${2:$1}" value="${3}">
 snippet input:datetime
-	<input type="datetime" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="datetime" name="${1}" id="${2:$1}" value="${3}">
 snippet input:datetime-local
-	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}">
 snippet input:email
-	<input type="email" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="email" name="${1}" id="${2:$1}" value="${3}">
 snippet input:file
-	<input type="file" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="file" name="${1}" id="${2:$1}" value="${3}">
 snippet input:month
-	<input type="month" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="month" name="${1}" id="${2:$1}" value="${3}">
 snippet input:number
-	<input type="number" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="number" name="${1}" id="${2:$1}" value="${3}">
 snippet input:password
-	<input type="password" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="password" name="${1}" id="${2:$1}" value="${3}">
 snippet input:range
-	<input type="range" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="range" name="${1}" id="${2:$1}" value="${3}">
 snippet input:reset
-	<input type="reset" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="reset" name="${1}" id="${2:$1}" value="${3}">
 snippet input:search
-	<input type="search" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="search" name="${1}" id="${2:$1}" value="${3}">
 snippet input:time
-	<input type="time" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="time" name="${1}" id="${2:$1}" value="${3}">
 snippet input:url
-	<input type="url" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="url" name="${1}" id="${2:$1}" value="${3}">
 snippet input:week
-	<input type="week" name="${1}" id="${2:$1}" value="${3}" />
+	<input type="week" name="${1}" id="${2:$1}" value="${3}">
 snippet ins
 	<ins>${0}</ins>
 snippet kbd
@@ -556,19 +553,19 @@ snippet lia+
 	<li><a href="${2:#}">${1}</a></li>
 	lia+
 snippet link
-	<link rel="${1}" href="${2}" title="${3}" type="${4}" />
+	<link rel="${1}" href="${2}" title="${3}" type="${4}">
 snippet link:atom
-	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml" />
+	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml">
 snippet link:s
-	<link rel="stylesheet" href="${1:style.css}" />
+	<link rel="stylesheet" href="${1:style.css}">
 snippet link:css
-	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}">
 snippet link:favicon
-	<link rel="shortcut icon" href="${1:favicon.ico}" type="image/x-icon" />
+	<link rel="shortcut icon" href="${1:favicon.ico}" type="image/x-icon">
 snippet link:rss
-	<link rel="alternate" href="${1:rss.xml}" title="RSS" type="application/atom+xml" />
+	<link rel="alternate" href="${1:rss.xml}" title="RSS" type="application/atom+xml">
 snippet link:touch
-	<link rel="apple-touch-icon" href="${1:favicon.png}" />
+	<link rel="apple-touch-icon" href="${1:favicon.png}">
 snippet main
 	<main role="main">
 		${0}
@@ -604,17 +601,17 @@ snippet menu:t
 		${0}
 	</menu>
 snippet meta
-	<meta http-equiv="${1}" content="${2}" />
+	<meta http-equiv="${1}" content="${2}">
 snippet meta:s
-	<meta ${0} />
+	<meta ${0}>
 snippet meta:d
-	<meta name="description" content="${0}" />
+	<meta name="description" content="${0}">
 snippet meta:compat
-	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}" />
+	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}">
 snippet meta:refresh
-	<meta http-equiv="refresh" content="text/html;charset=UTF-8" />
+	<meta http-equiv="refresh" content="text/html;charset=UTF-8">
 snippet meta:utf
-	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+	<meta http-equiv="content-type" content="text/html;charset=UTF-8">
 snippet meter
 	<meter>${0}</meter>
 snippet nav
@@ -641,14 +638,14 @@ snippet object
 snippet movie
 	<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
 	codebase="http://www.apple.com/qtactivex/qtplugin.cab">
-		<param name="src" value="$1" />
-		<param name="controller" value="$4" />
-		<param name="autoplay" value="$5" />
+		<param name="src" value="$1">
+		<param name="controller" value="$4">
+		<param name="autoplay" value="$5">
 		<embed src="${1:movie.mov}"
 			width="${2:320}" height="${3:240}"
 			controller="${4:true}" autoplay="${5:true}"
 			scale="tofit" cache="true"
-			pluginspage="http://www.apple.com/quicktime/download/" />
+			pluginspage="http://www.apple.com/quicktime/download/">
 	</object>
 snippet ol
 	<ol>
@@ -688,7 +685,7 @@ snippet p.
 snippet p#
 	<p id="${1}">${0}</p>
 snippet param
-	<param name="${1}" value="${2}" />
+	<param name="${1}" value="${2}">
 snippet pre
 	<pre>
 		${0}
@@ -751,7 +748,7 @@ snippet select+
 snippet small
 	<small>${0}</small>
 snippet source
-	<source src="${1}" type="${2}" media="${0}" />
+	<source src="${1}" type="${2}" media="${0}">
 snippet span
 	<span>${0}</span>
 snippet span.
@@ -830,7 +827,7 @@ snippet tr+
 		td+${0}
 	</tr>
 snippet track
-	<track src="${1}" srclang="${2}" label="${3}" default="${4:default} />${5}
+	<track src="${1}" srclang="${2}" label="${3}" default="${4:default}>${5}
 snippet ul
 	<ul>
 		${0}
@@ -855,6 +852,6 @@ snippet video
 snippet video.
 	<video class="${1}" src="${2}" height="${3}" width="${4}" preload="${5:none}" autoplay="${6:autoplay}">${7}</video>
 snippet wbr
-	<wbr />
+	<wbr>
 snippet viewport
 	<meta name="viewport" content="width=device-width, initial-scale=1">

From 6fc0f80fe7896217e9897522860057de356a22d1 Mon Sep 17 00:00:00 2001
From: sedrubal <dev@sedrubal.de>
Date: Sat, 27 Oct 2018 20:51:40 +0200
Subject: [PATCH 1187/1587] Replace unversioned python shebang with python3
 shebang

In order to make it easier to switch to a new python version nobody
should use unversioned shebangs any more.
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3#Phase_1:_Eliminate_the_python-_prefix_from_the_Python_2_package_names_and_.2Fusr.2Fbin.2Fpython_from_shebangs
---
 snippets/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index a425c323a..17b4ce302 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -1,5 +1,5 @@
 snippet #!
-	#!/usr/bin/env python
+	#!/usr/bin/env python3
 	# -*- coding: utf-8 -*-
 snippet #!2
 	#!/usr/bin/env python2

From 37d54451e2ac7a2a9e99d3bbcd1dea9221d92193 Mon Sep 17 00:00:00 2001
From: sedrubal <dev@sedrubal.de>
Date: Sat, 27 Oct 2018 20:53:23 +0200
Subject: [PATCH 1188/1587] Remove default file encoding from python3 shebangs

Python3 uses UTF-8 by default. We don't have to add it explicitly.
See `python3 -c 'import sys; print(sys.getdefaultencoding())'`.
---
 snippets/python.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 17b4ce302..c1b930ab3 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -1,12 +1,10 @@
 snippet #!
 	#!/usr/bin/env python3
-	# -*- coding: utf-8 -*-
 snippet #!2
 	#!/usr/bin/env python2
 	# -*- coding: utf-8 -*-
 snippet #!3
 	#!/usr/bin/env python3
-	# -*- coding: utf-8 -*-
 snippet imp
 	import ${0:module}
 snippet uni

From 8c66615df722d50183d2d035919486c5e04b6c22 Mon Sep 17 00:00:00 2001
From: Florian Sonner <florian.sonner@math.fau.de>
Date: Mon, 5 Nov 2018 22:58:25 +0100
Subject: [PATCH 1189/1587] Remove/merge duplicate UltiSnip tex math snippets

Remove UltiSnip tex snippets already contained in the normal
tex.snippets file to reduce duplication. Merge visual
selection behavior for bracket snippets.

Fixes #10833
---
 UltiSnips/texmath.snippets | 70 --------------------------------------
 snippets/tex.snippets      | 12 +++----
 2 files changed, 6 insertions(+), 76 deletions(-)

diff --git a/UltiSnips/texmath.snippets b/UltiSnips/texmath.snippets
index 27f3a2408..1241a3e46 100644
--- a/UltiSnips/texmath.snippets
+++ b/UltiSnips/texmath.snippets
@@ -1,75 +1,5 @@
 priority -50
 
-##############
-# MATH STUFF #
-##############
-
-snippet eq "Equation" b
-\begin{equation}
-	$0
-\end{equation}
-endsnippet
-
-snippet eqnn "Equation without number" b
-\begin{equation*}
-	$0
-\end{equation*}
-endsnippet
-
-snippet al "Align" b
-\begin{align}
-	$0
-\end{align}
-endsnippet
-
-snippet alnn "Align without numbers" b
-\begin{align*}
-	$0
-\end{align*}
-endsnippet
-
-snippet eqa "Equation array" b
-\begin{eqnarray}
-	$1 & $2 & $0
-\end{eqnarray}
-endsnippet
-
-snippet eqann "Equation array without numbers" b
-\begin{eqnarray*}
-	$1 & $2 & $0
-\end{eqnarray*}
-endsnippet
-
-snippet frac "Fraction" w
-\frac{${1:${VISUAL}}}{${2}}
-endsnippet
-
-snippet mat "Smart Matrix"
-\begin{${1:p/b/v/V/B/small}matrix}
-	$0
-\end{$1matrix}
-endsnippet
-
-snippet lr( "left( right)" w
-\left( ${1:${VISUAL}} \right)
-endsnippet
-
-snippet lr| "left| right|" w
-\left| ${1:${VISUAL}} \right|
-endsnippet
-
-snippet lr{ "left\{ right\}" w
-\left\\{ ${1:${VISUAL}} \right\\}
-endsnippet
-
-snippet lr[ "left[ right]" w
-\left[ ${1:${VISUAL}} \right]
-endsnippet
-
-#################
-# PHYSICS STUFF #
-#################
-
 snippet dv "Derivative" w
 \dv[${1:${VISUAL}}]{${2}}{${3}}
 endsnippet
diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 8351b393c..49d3104f1 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -321,17 +321,17 @@ snippet \{ \{ \}
 	\\{ ${0} \\}
 #delimiter
 snippet lr left right
-	\\left${1} ${0} \\right$1
+	\\left${1} ${0:${VISUAL}} \\right$1
 snippet lr( left( right)
-	\\left( ${0} \\right)
+	\\left( ${0:${VISUAL}} \\right)
 snippet lr| left| right|
-	\\left| ${0} \\right|
+	\\left| ${0:${VISUAL}} \\right|
 snippet lr{ left\{ right\}
-	\\left\\{ ${0} \\right\\}
+	\\left\\{ ${0:${VISUAL}} \\right\\}
 snippet lr[ left[ right]
-	\\left[ ${0} \\right]
+	\\left[ ${0:${VISUAL}} \\right]
 snippet lra langle rangle
-	\\langle ${0} \\rangle
+	\\langle ${0:${VISUAL}} \\rangle
 # Code listings
 snippet lst
 	\\begin{listing}[language=${1:language}]

From bdefc3d4ebfac87fc551403200d17b419083481f Mon Sep 17 00:00:00 2001
From: Jaeho Lee <jaeho.lee@snu.ac.kr>
Date: Fri, 16 Nov 2018 00:49:05 +0900
Subject: [PATCH 1190/1587] :bug: Re-added some UltiSnips TeX math snippets

Re-added UltiSnips snippets in `UltiSnips/texmath.snippets` that have different snippet names with the ones in `snippets/tex.snippets`.
Also added tabstops.

Fixes #1083 and #1084
---
 UltiSnips/texmath.snippets | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/UltiSnips/texmath.snippets b/UltiSnips/texmath.snippets
index 1241a3e46..ccb4ec118 100644
--- a/UltiSnips/texmath.snippets
+++ b/UltiSnips/texmath.snippets
@@ -1,5 +1,43 @@
 priority -50
 
+##############
+# MATH STUFF #
+##############
+
+snippet eqnn "Equation without a number" b
+\begin{equation*}
+	${0:${VISUAL}}
+\end{equation*}
+endsnippet
+
+snippet al "Align" b
+\begin{align}
+	${0:${VISUAL}}
+\end{align}
+endsnippet
+
+snippet alnn "Align without a number" b
+\begin{align*}
+	${0:${VISUAL}}
+\end{align*}
+endsnippet
+
+snippet eqa "Equation array" b
+\begin{eqnarray}
+	${1:${VISUAL}} & ${2:${VISUAL}} & ${0:${VISUAL}}
+\end{eqnarray}
+endsnippet
+
+snippet eqann "Equation array without a number" b
+\begin{eqnarray*}
+	${1:${VISUAL}} & ${2:${VISUAL}} & ${0:${VISUAL}}
+\end{eqnarray*}
+endsnippet
+
+#################
+# PHYSICS STUFF #
+#################
+
 snippet dv "Derivative" w
 \dv[${1:${VISUAL}}]{${2}}{${3}}
 endsnippet

From ce0e93cb1924f0447319478cb3fa706c56c13650 Mon Sep 17 00:00:00 2001
From: Andy <andys8@users.noreply.github.com>
Date: Tue, 27 Nov 2018 12:58:14 +0100
Subject: [PATCH 1191/1587] [Elm] Snippet for describe

---
 snippets/elm.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/elm.snippets b/snippets/elm.snippets
index f967f512b..8ae1d7d32 100644
--- a/snippets/elm.snippets
+++ b/snippets/elm.snippets
@@ -53,6 +53,8 @@ snippet tya
 		${0}
 snippet test
 	test "${1}" <| \_ -> $0
+snippet desc
+	describe "${1}" [ $0 ]
 snippet doc
 	{-| ${0}
 	-}

From 1ba2120c16fe54860a7b449c73beb28004aa1c91 Mon Sep 17 00:00:00 2001
From: Vinod Halaharvi <vinod.halaharvi@greensmithenergy.com>
Date: Thu, 6 Dec 2018 11:25:32 -0500
Subject: [PATCH 1192/1587]  snippets/jenkins.snippets added ..

---
 snippets/jenkins.snippets | 258 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 258 insertions(+)
 create mode 100644 snippets/jenkins.snippets

diff --git a/snippets/jenkins.snippets b/snippets/jenkins.snippets
new file mode 100644
index 000000000..51bfa617e
--- /dev/null
+++ b/snippets/jenkins.snippets
@@ -0,0 +1,258 @@
+snippet steps
+	steps {
+		sh '${1:make check}'
+		junit '${2:reports/**/*.xml}' 
+	}
+	${0}
+
+snippet stage
+	stage('${1:Test}'){
+		steps {
+			sh '${2:make check}'
+			junit '${3:reports/**/*.xml}' 
+		}
+	}
+	${0}
+
+snippet pipeline
+	pipeline {
+		agent any 
+		stages {
+			stage('${1:Build}') { 
+				steps { 
+					sh '${2:make}' 
+				}
+			}
+		}
+	}
+	${0}
+
+snippet pipeline_sample
+	pipeline {
+		agent any 
+		stages {
+			stage('${1:Build}') { 
+				steps { 
+					sh '${2:make}' 
+				}
+			}
+			stage('${3:Test}'){
+				steps {
+					sh '${4:make check}'
+					junit '${5:reports/**/*.xml}' 
+				}
+			}
+			stage('${6:Deploy}') {
+				steps {
+					sh '${7:make publish}'
+				}
+			}
+		}
+	}
+	${0}
+
+snippet d
+	docker {
+		image ${1:myregistry.com/node'}
+		label ${2:my-defined-label'}
+		registryUrl ${3:https://myregistry.com/'}
+		registryCredentialsId ${4:myPredefinedCredentialsInJenkins'}
+	}
+
+
+snippet df
+	dockerfile {
+		filename '${1:Dockerfile.build}'
+		dir '${2:build}'
+		label '${3:my-defined-label}'
+		registryUrl '${4:https://myregistry.com/}'
+		registryCredentialsId '${5:myPredefinedCredentialsInJenkins}'
+	}
+
+snippet  pa
+	post { 
+		always { 
+			${1}
+		}
+	}
+	${0}
+
+snippet  pc
+	post { 
+		changed { 
+			${1}
+		}
+	}
+	${0}
+
+snippet  pf
+	post { 
+		fixed { 
+			${1}
+		}
+	}
+	${0}
+
+snippet  pr
+	post { 
+		regression { 
+			${1}
+		}
+	}
+	${0}
+
+snippet  pab
+	post { 
+		aborted { 
+			${1}
+		}
+	}
+	${0}
+
+snippet pfa 
+	post { 
+		failure { 
+			${1}
+		}
+	}
+	${0}
+
+snippet ps
+	post { 
+		success { 
+			${1}
+		}
+	}
+	${0}
+
+snippet pu
+	post { 
+		unstable { 
+			${1}
+		}
+	}
+	${0}
+
+snippet  pc
+	post { 
+		cleanup { 
+			${1}
+		}
+	}
+	${0}
+
+
+snippet psss
+	pipeline {
+		agent any 
+		stages {
+			stage('${1:Build}') { 
+				steps { 
+					sh '${2:make}' 
+				}
+			}
+	}
+	${0}
+
+snippet parameters
+	parameters{ 
+		${1}
+	}
+	${0}
+
+snippet paramtext
+		text(name: "${1:BIOGRAPHY}" , defaultValue: "${2:default}" , description: "${3:Enter some information about the person}")
+		${0}
+
+snippet parambool
+		booleanParam(name: "${1:TOGGLE}" , defaultValue: ${2:default}, description: "${3:Toggle this value}")
+		${0}
+
+snippet paramchoice
+		choice(name: "${1:CHOICE}" , choices: ["${2:Choices}",] , description: "${3:Pick something}") 
+		${0}
+
+snippet parampassword
+		password(name: "${1:PASSWORD}" , defaultValue: "${2:SECRET}" , description: "${3:Enter a password}")
+		${0}
+
+snippet paramfile
+		file(name: "${1:FILE}" , description: "${2:Choose a file to upload}")${0}
+		${0}
+
+snippet triggers
+	triggers {
+		cron('${1:H */4 * * 1-5}')
+	}
+	${0}
+
+snippet input
+	input {
+		message '${1:Should we continue?}'
+		ok '${2:Yes, we should.}'
+		submitter '${3:alice,bob}'
+		parameters { 
+			string(name: '${4:PERSON}' , defaultValue: '${5:Mr Jenkins}' , description: '${6:Who should I say hello to?}')
+		}
+	}
+	${0}
+
+snippet whenbranch
+	when {
+		branch '${1:branch}'
+	}
+	${0}
+snippet whenbuildingTag
+	when {
+		buildingTag '${1:tag}'
+	}
+	${0}
+snippet whenchangelog
+	when {
+		changelog '${1:changelog}'
+	}
+	${0}
+snippet whenchangeset
+	when {
+		changeset '${1:changeSet}'
+	}
+	${0}
+snippet whenchangeRequest
+	when {
+		changeRequest '${1:changeRequest}'
+	}
+	${0}
+snippet whenenvironment
+	when {
+		environment '${1:environment}'
+	}
+	${0}
+snippet whenequals
+	when {
+		equals '${1:equals}'
+	}
+	${0}
+snippet whenexpression
+	when {
+		expression '${1:expression}'
+	}
+	${0}
+snippet whentag
+	when {
+		tag '${1:tag}'
+	}
+	${0}
+snippet whennot
+	when {
+		not '${1:not}'
+	}
+	${0}
+snippet whenallOf
+	when {
+		allOf '${1:allOf}'
+	}
+	${0}
+snippet whenanyOf
+	when {
+		anyOf '${1:anyOf}'
+	}

From 539c9a13ae4751d730d94ff275e54ce55969121f Mon Sep 17 00:00:00 2001
From: Vinod Halaharvi <vinod.halaharvi@greensmithenergy.com>
Date: Thu, 6 Dec 2018 11:35:29 -0500
Subject: [PATCH 1193/1587]  jenkins.snippets minor updates ..

---
 snippets/jenkins.snippets | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/snippets/jenkins.snippets b/snippets/jenkins.snippets
index 51bfa617e..2dccd40e9 100644
--- a/snippets/jenkins.snippets
+++ b/snippets/jenkins.snippets
@@ -53,10 +53,10 @@ snippet pipeline_sample
 
 snippet d
 	docker {
-		image ${1:myregistry.com/node'}
-		label ${2:my-defined-label'}
-		registryUrl ${3:https://myregistry.com/'}
-		registryCredentialsId ${4:myPredefinedCredentialsInJenkins'}
+		image '${1:myregistry.com/node'}'
+		label '${2:my-defined-label'}'
+		registryUrl '${3:https://myregistry.com/'}'
+		registryCredentialsId '${4:myPredefinedCredentialsInJenkins'}'
 	}
 
 
@@ -154,6 +154,18 @@ snippet psss
 	}
 	${0}
 
+snippet sss
+	stages {
+		stage('${1:Build}') { 
+			steps { 
+				sh '${2:make}' 
+			}
+		}
+	}
+	${0}
+
+
+
 snippet parameters
 	parameters{ 
 		${1}

From 17686c33ec5e221669ad5dd51565547a8260f6f8 Mon Sep 17 00:00:00 2001
From: Vinod Halaharvi <vinod.halaharvi@gmail.com>
Date: Sun, 9 Dec 2018 06:07:20 -0500
Subject: [PATCH 1194/1587] Adding kubernetes helm snippets .. (#1088)

---
 snippets/helm.snippets | 591 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 591 insertions(+)
 create mode 100644 snippets/helm.snippets

diff --git a/snippets/helm.snippets b/snippets/helm.snippets
new file mode 100644
index 000000000..241cc449e
--- /dev/null
+++ b/snippets/helm.snippets
@@ -0,0 +1,591 @@
+snippet service_sample_spec
+	apiVersion: v1
+	kind: Service
+	metadata:
+	{{- if .Values.$1.service.annotations }}
+	  annotations:
+	{{ toYaml .Values.$1.service.annotations | indent 4 }}
+	{{- end }}
+	  labels:
+	{{- if .Values.$1.service.labels }}
+	{{ toYaml .Values.$1.service.labels | indent 4 }}
+	{{- end }}
+		app: {{ template "$2.name" . }}
+		chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+		component: "{{ .Values.$1.name }}"
+		heritage: {{ .Release.Service }}
+		release: {{ .Release.Name }}
+	  name: {{ template "$2.$1.fullname" . }}
+	spec:
+	  clusterIP: "{{ .Values.$1.service.clusterIP }}"
+	{{- if .Values.$1.service.externalIPs }}
+	  externalIPs:
+	{{ toYaml .Values.$1.service.externalIPs | indent 4 }}
+	{{- end }}
+	{{- if .Values.$1.service.loadBalancerIP }}
+	  loadBalancerIP: "{{ .Values.$1.service.loadBalancerIP }}"
+	{{- end }}
+	{{- if .Values.$1.service.loadBalancerSourceRanges }}
+	  loadBalancerSourceRanges:
+	{{ toYaml .Values.$1.service.loadBalancerSourceRanges | indent 4 }}
+	{{- end }}
+	  healthCheckNodePort: {{ .Values.$1.service.healthCheckNodePort }}
+	  ports:
+		- name: http
+		  port: 80
+		  protocol: TCP
+		  targetPort: {{ .Values.$1.service.targetPorts.http }}
+		  {{- if (and (eq .Values.$1.service.type "NodePort") (not (empty .Values.$1.service.nodePorts.http))) }}
+		  nodePort: {{ .Values.$1.service.nodePorts.http }}
+		  {{- end }}
+		- name: https
+		  port: 443
+		  protocol: TCP
+		  targetPort: {{ .Values.$1.service.targetPorts.https }}
+		  {{- if (and (eq .Values.$1.service.type "NodePort") (not (empty .Values.$1.service.nodePorts.https))) }}
+		  nodePort: {{ .Values.$1.service.nodePorts.https }}
+		  {{- end }}
+	  {{- range $key, $value := .Values.tcp }}
+		- name: "{{ $key }}-tcp"
+		  port: {{ $key }}
+		  protocol: TCP
+		  targetPort: "{{ $key }}-tcp"
+	  {{- end }}
+	  {{- range $key, $value := .Values.udp }}
+		- name: "{{ $key }}-udp"
+		  port: {{ $key }}
+		  protocol: UDP
+		  targetPort: "{{ $key }}-udp"
+	  {{- end }}
+	  selector:
+		app: {{ template "${2:chartName}.name" . }}
+		component: "{{ .Values.$1.name }}"
+		release: {{ .Release.Name }}
+	  type: "{{ .Values.${1:value_key}.service.type }}"
+
+snippet service_spec
+	apiVersion: v1
+	kind: Service
+	metadata:
+	{{- if .Values.$1.service.annotations }}
+	  annotations:
+	{{ toYaml .Values.$1.service.annotations | indent 4 }}
+	{{- end }}
+	  labels:
+	{{- if .Values.$1.service.labels }}
+	{{ toYaml .Values.$1.service.labels | indent 4 }}
+	{{- end }}
+		app: {{ template "$2.name" . }}
+		chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+		component: "{{ .Values.$1.name }}"
+		heritage: {{ .Release.Service }}
+		release: {{ .Release.Name }}
+	  name: {{ template "${2:chartName}.${1:value_key}.fullname" . }}
+	# spec
+	${0}
+
+snippet annotations_spec
+	{{- if .Values.$1.service.annotations }}
+	  annotations:
+	{{ toYaml .Values.${1:value_key}.service.annotations | indent 4 }}
+	{{- end }}
+	${0}
+
+snippet labels_spec
+	 labels:
+	{{- if .Values.$1.service.labels }}
+	{{ toYaml .Values.$1.service.labels | indent 4 }}
+	{{- end }}
+		app: {{ template "$2.name" . }}
+		chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+		component: "{{ .Values.$1.name }}"
+		heritage: {{ .Release.Service }}
+		release: {{ .Release.Name }}
+	  name: {{ template "${2:chartName}.${1:value_key}.fullname" . }}
+	${0}
+
+snippet service_spec
+	spec:
+	  type: "{{ .Values.$1.service.type }}"
+	  clusterIP: "{{ .Values.$1.service.clusterIP }}"
+	{{- if .Values.$1.service.externalIPs }}
+	  externalIPs:
+	{{ toYaml .Values.$1.service.externalIPs | indent 4 }}
+	{{- end }}
+	{{- if .Values.$1.service.loadBalancerIP }}
+	  loadBalancerIP: "{{ .Values.$1.service.loadBalancerIP }}"
+	{{- end }}
+	{{- if .Values.$1.service.loadBalancerSourceRanges }}
+	  loadBalancerSourceRanges:
+	{{ toYaml .Values.$1.service.loadBalancerSourceRanges | indent 4 }}
+	{{- end }}
+	{{- if and (semverCompare ">=1.7-0" .Capabilities.KubeVersion.GitVersion) (.Values.$1.service.externalTrafficPolicy) }}
+	  externalTrafficPolicy: "{{ .Values.$1.service.externalTrafficPolicy }}"
+	{{- end }}
+	{{- if and (semverCompare ">=1.7-0" .Capabilities.KubeVersion.GitVersion) (.Values.$1.service.healthCheckNodePort) }}
+	  healthCheckNodePort: {{ .Values.${1:value_key}.service.healthCheckNodePort }}
+	{{- end }}
+	${0}
+
+snippet ports_spec
+	ports:
+	${0}
+
+snippet portHTTP_spec
+	- name: http
+	  port: 80
+	  protocol: TCP
+	  targetPort: {{ .Values.$1.service.targetPorts.http }}
+	  {{- if (and (eq .Values.$1.service.type "NodePort") (not (empty .Values.$1.service.nodePorts.http))) }}
+	  nodePort: {{ .Values.${1:value_key}.service.nodePorts.http }}
+	  {{- end }}
+	  ${0}
+
+snippet portHTTPS_spec
+	- name: https
+	  port: 443
+	  protocol: TCP
+	  targetPort: {{ .Values.$1.service.targetPorts.https }}
+	  {{- if (and (eq .Values.$1.service.type "NodePort") (not (empty .Values.$1.service.nodePorts.https))) }}
+	  nodePort: {{ .Values.${1:value_key}.service.nodePorts.https }}
+	  {{- end }}
+	  ${0}
+
+snippet portTCP_spec
+	{{- range $key, $value := .Values.tcp }}
+	  - name: "{{ $key }}-tcp"
+		port: {{ $key }}
+		protocol: TCP
+		targetPort: "{{ $key }}-tcp"
+	{{- end }}
+	${0}
+
+snippet portUDP_spec
+	{{- range $key, $value := .Values.udp }}
+	  - name: "{{ $key }}-udp"
+		port: {{ $key }}
+		protocol: UDP
+		targetPort: "{{ $key }}-udp"
+	{{- end }}
+	${0}
+
+
+snippet selector_spec
+	selector:
+	  app: {{ template "${2:chartName}.name" . }}
+	  component: "{{ .Values.${1:value_key}.name }}"
+	  release: {{ .Release.Name }}
+	  ${0}
+
+
+snippet deploy_sample_spec
+	{{- if .Values.$1.enabled }}
+	apiVersion: extensions/v1beta1
+	kind: Deployment
+	metadata:
+	  labels:
+		app: {{ template "$2.name" . }}
+		chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+		component: "{{ .Values.$1.name }}"
+		heritage: {{ .Release.Service }}
+		release: {{ .Release.Name }}
+	  name: {{ template "$2.$1.fullname" . }}
+	spec:
+	  replicas: {{ .Values.$1.replicaCount }}
+	  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+	  template:
+		metadata:
+		{{- if .Values.$1.podAnnotations }}
+		  annotations:
+	{{ toYaml .Values.$1.podAnnotations | indent 8 }}
+		{{- end }}
+		  labels:
+			app: {{ template "$2.name" . }}
+			component: "{{ .Values.$1.name }}"
+			release: {{ .Release.Name }}
+			{{- if .Values.$1.podLabels }}
+	{{ toYaml .Values.$1.podLabels | indent 8 }}
+			{{- end }}
+		spec:
+		  {{- if .Values.imagePullSecrets }}
+		  imagePullSecrets:
+	{{ toYaml .Values.imagePullSecrets | indent 8 }}
+		  {{- end }}
+		  containers:
+			- name: {{ template "${2:chartName}.name" . }}-{{ .Values.$1.name }}
+			  image: "{{ .Values.$1.image.repository }}:{{ .Values.$1.image.tag }}"
+			  imagePullPolicy: "{{ .Values.$1.image.pullPolicy }}"
+			  args:
+			  {{- range $key, $value := .Values.$1.extraArgs }}
+				{{- if $value }}
+				- --{{ $key }}={{ $value }}
+				{{- else }}
+				- --{{ $key }}
+				{{- end }}
+			  {{- end }}
+			  livenessProbe:
+				httpGet:
+				  path: /healthz
+				  port: 8080
+				  scheme: HTTP
+				initialDelaySeconds: 30
+				timeoutSeconds: 5
+			  ports:
+				- name: http
+				  containerPort: 8080
+				  protocol: TCP
+			  resources:
+	{{ toYaml .Values.$1.resources | indent 12 }}
+		{{- if .Values.$1.nodeSelector }}
+		  nodeSelector:
+	{{ toYaml .Values.$1.nodeSelector | indent 8 }}
+		{{- end }}
+		{{- if .Values.$1.tolerations }}
+		  tolerations:
+	{{ toYaml .Values.$1.tolerations | indent 8 }}
+		{{- end }}
+		{{- if .Values.$1.affinity }}
+		  affinity:
+	{{ toYaml .Values.${1:value_key}.affinity | indent 8 }}
+		{{- end }}
+		  terminationGracePeriodSeconds: 60
+	{{- end }}
+
+
+
+snippet deploy_spec
+	{{- if .Values.$1.enabled }}
+	apiVersion: extensions/v1beta1
+	kind: Deployment
+	metadata:
+	  labels:
+		app: {{ template "$2.name" . }}
+		chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+		component: "{{ .Values.$1.name }}"
+		heritage: {{ .Release.Service }}
+		release: {{ .Release.Name }}
+	  name: {{ template "${2:chartName}.${1:value_key}.fullname" . }}
+	# spec
+		# containers_spec
+		# livenessProbe_spec
+		# PersistentVolumeClaim_spec
+		# initContainers_spec
+		# resources_spec
+		# nodeselector_spec
+		# tolerations_spec
+		# affinity_spec
+	${0}
+
+snippet spec_spec
+	spec:
+	  replicas: {{ .Values.$1.replicaCount }}
+	  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
+	  template:
+		metadata:
+		{{- if .Values.$1.podAnnotations }}
+		  annotations:
+	{{ toYaml .Values.$1.podAnnotations | indent 8 }}
+		{{- end }}
+		  labels:
+			app: {{ template "${2:chartName}.name" . }}
+			component: "{{ .Values.$1.name }}"
+			release: {{ .Release.Name }}
+			{{- if .Values.$1.podLabels }}
+	{{ toYaml .Values.${1:value_key}.podLabels | indent 8 }}
+			{{- end }}
+		spec:
+		  {{- if .Values.imagePullSecrets }}
+		  imagePullSecrets:
+	{{ toYaml .Values.imagePullSecrets | indent 8 }}
+		  {{- end }}
+		  ${0}
+
+snippet imagePullSecrets_spec
+		  {{- if .Values.imagePullSecrets }}
+		  imagePullSecrets:
+	{{ toYaml .Values.imagePullSecrets | indent 8 }}
+		  {{- end }}
+	${0}
+
+snippet imagePullPolicy_spec
+	imagePullPolicy: ${1:imagePullPolicy}
+	${0}
+
+snippet containers_spec
+	containers:
+	  - name: {{ template "${2:chartName}.name" . }}-{{ .Values.$1.name }}
+		image: "{{ .Values.$1.image.repository }}:{{ .Values.$1.image.tag }}"
+		imagePullPolicy: "{{ .Values.${1:value_key}.image.pullPolicy }}"
+	${0}
+snippet args_spec
+	args:
+	{{- range $key, $value := .Values.${1:value_key}.extraArgs }}
+	  {{- if $value }}
+	  - --{{ $key }}={{ $value }}
+	  {{- else }}
+	  - --{{ $key }}
+	  {{- end }}
+	{{- end }}
+	${0}
+snippet livenessProbe_spec
+	livenessProbe:
+	  httpGet:
+		path: /healthz
+		port: 8080
+		scheme: HTTP
+	  initialDelaySeconds: 30
+	  timeoutSeconds: 5
+	${0}
+snippet readinessProbe_spec
+	readinessProbe:
+	  httpGet:
+		path: /go/api/v1/health
+		port: 8153
+	  initialDelaySeconds: {{ .Values.$1.healthCheck.initialDelaySeconds }}
+	  periodSeconds: {{ .Values.$1.healthCheck.periodSeconds }}
+	  failureThreshold: {{ .Values.$1.healthCheck.failureThreshold }}
+	${0}
+snippet resources_spec
+	resources:
+	{{ toYaml .Values.${1:value_key}.resources | indent 12 }}
+	${0}
+snippet nodeselector_spec
+	{{- if .Values.$1.nodeSelector }}
+	  nodeSelector:
+	{{ toYaml .Values.${1:value_key}.nodeSelector | indent 8 }}
+	{{- end }}
+	${0}
+snippet tolerations_spec
+	{{- if .Values.$1.tolerations }}
+	  tolerations:
+	{{ toYaml .Values.${1:value_key}.tolerations | indent 8 }}
+	{{- end }}
+	${0}
+snippet affinity_spec
+	{{- if .Values.$1.affinity }}
+	  affinity:
+	{{ toYaml .Values.${1:value_key}.affinity | indent 8 }}
+	{{- end }}
+	  terminationGracePeriodSeconds: 60
+	{{- end }}
+	${0}
+
+snippet PersistentVolumeClaim_spec
+	kind: PersistentVolumeClaim
+	apiVersion: v1
+	metadata:
+	  name: {{ template "${2}.$1.fullname" . }}
+	  labels:
+		app: {{ template "${2:chartName}.name" . }}
+		chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+		release: "{{ .Release.Name }}"
+		heritage: "{{ .Release.Service }}"
+	spec:
+	  accessModes:
+		- {{ .Values.$1.persistence.accessMode | quote }}
+	  resources:
+		requests:
+		  storage: {{ .Values.$1.persistence.size | quote }}
+	{{- if .Values.$1.persistence.storageClass }}
+	{{- if (eq "-" .Values.$1.persistence.storageClass) }}
+	  storageClassName: ""
+	{{- else }}
+	  storageClassName: "{{ .Values.${1:value_key}.persistence.storageClass }}"
+	{{- end }}
+	{{- end }}
+	{{- end }}
+	{{- end }}
+	${0}
+
+snippet configMap_spec
+	{{- if .Values.artifactory.enabled -}}
+	  apiVersion: v1
+	  kind: ConfigMap
+	  metadata:
+		name: {{ template "${2:chartName}.fullname" . }}-${1:value_key}-config
+		labels:
+		  app: {{ template "${2}.name" . }}
+		  chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+		  heritage: {{ .Release.Service }}
+		  release: {{ .Release.Name }}
+	  data:
+		${3:nameOfConfigFile}.conf: |
+		  # data goes here
+	{{- end -}}
+	${0}
+
+snippet initContainers_spec
+	{{- if .Values.$1.initContainers }}
+		  initContainers:
+		  - name: wait-workers
+			image: "{{ .Values.$1.image.repository }}:{{ .Values.$1.image.tag }}"
+			imagePullPolicy: {{ .Values.${1:value_key}.image.pullPolicy }}
+			# env
+			command:
+			  - sh
+			  - -c
+			  - |
+				until printf "." && nc -z -w 2 {{ template "${2:chartName}.fullname" . }} {{ .Values.postgresql.service.port }}; do
+					sleep 2;
+				done;
+
+				echo 'PostgreSQL OK ✓'
+			# args
+	{{- end }}
+	${0}
+
+snippet pvc_spec
+	kind: PersistentVolumeClaim
+	apiVersion: v1
+	metadata:
+	  name: {{ template "$2.fullname" . }}
+	  labels:
+		chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+		release: "{{ .Release.Name }}"
+		heritage: "{{ .Release.Service }}"
+		app: {{ template "${2:chartName}.fullname" . }}
+	spec:
+	  accessModes:
+		- {{ .Values.persistence.accessMode | quote }}
+	  resources:
+		requests:
+		  storage: {{ .Values.persistence.size | quote }}
+	{{- if .Values.persistence.storageClass }}
+	{{- if (eq "-" .Values.persistence.storageClass) }}
+	  storageClassName: ""
+	{{- else }}
+	  storageClassName: "{{ .Values.persistence.storageClass }}"
+	{{- end }}
+	{{- end }}
+	{{- end }}
+	${0}
+
+snippet pv_nfs_spec
+	apiVersion: v1
+	kind: PersistentVolume
+	metadata:
+	  name: {{ template "$2.fullname" . }}-data-pv
+	  labels:
+		app: {{ template "$2.name" . }}
+		chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+		heritage: {{ .Release.Service }}
+		release: {{ .Release.Name }}
+		id: {{ template "${2:chartName}.name" . }}-data-pv
+		type: nfs-volume
+	spec:
+	  capacity:
+		storage: {{ .Values.$1.persistence.nfs.capacity }}
+	  accessModes:
+	  - ReadWriteOnce
+	  persistentVolumeReclaimPolicy: Retain
+	  nfs:
+		server: {{ .Values.$1.persistence.nfs.ip }}
+		path: "{{ .Values.${1:value_key}.persistence.nfs.haDataMount }}"
+		readOnly: false
+	${0}
+
+snippet pvc_hostpath_spec
+	{{- if and .Values.persistence.enabled .Values.persistence.$1.hostPath (not
+	.Values.persistence.$1.existingClaim) -}}
+	apiVersion: v1
+	kind: PersistentVolume
+	metadata:
+	  name: {{ template "${2:chartName}.fullname" . }}-$1
+	spec:
+	  accessModes:
+		- {{ .Values.persistence.$1.accessMode | quote }}
+	  capacity:
+		storage: {{ .Values.persistence.$1.size | quote }}
+	  hostPath:
+		path: {{ .Values.persistence.${1:value_key}.hostPath | quote }}
+	{{- end -}}
+	${0}
+
+snippet deploy_values
+	$1:
+	  name: ${1:value_key}
+	  image:
+		repository: 
+		tag: 
+		pullPolicy: IfNotPresent
+	  hostNetwork: false
+	  dnsPolicy: ClusterFirst
+	  daemonset:
+		useHostPort: false
+	  podLabels: {}
+	  scope:
+		enabled: false
+		namespace: ""   # defaults to .Release.Namespace
+	  extraArgs: {}
+	  extraEnvs: []
+	  kind: Deployment
+	  updateStrategy: {}
+	  minReadySeconds: 0
+	  tolerations: []
+	  affinity: {}
+	  nodeSelector: {}
+	  podAnnotations: {}
+	  replicaCount: 1
+	  minAvailable: 1
+	  resources: {}
+	  autoscaling:
+		enabled: false
+	  extraContainers: {}
+	  extraVolumeMounts: {}
+	  extraVolumes: {}
+	  extraInitContainers: []
+	  lifecycle: {}
+	revisionHistoryLimit: 10
+	${0}
+
+snippet rbac_values
+	${1:value_key}:
+	rbac:
+	  create: true
+	serviceAccount:
+	  create: true
+	  name:
+	imagePullSecrets: []
+	${0}
+
+snippet service_values
+	${1:value_key}:
+	  service:
+		annotations: {}
+		labels: {}
+		clusterIP: ""
+		externalIPs: []
+		loadBalancerIP: ""
+		loadBalancerSourceRanges: []
+		externalTrafficPolicy: ""
+		healthCheckNodePort: 0
+		targetPorts:
+		  http: http
+		  https: https
+		type: LoadBalancer
+		nodePorts:
+		  http: ""
+		  https: ""
+	${0}
+
+snippet readinessProbe_values
+	${1:value_key}:
+	  readinessProbe:
+		failureThreshold: 3
+		initialDelaySeconds: 10
+		periodSeconds: 10
+		successThreshold: 1
+		timeoutSeconds: 1
+		port: 10254
+	${0}
+
+snippet livenessProbe_values
+	${1:value_key}:
+	  livenessProbe:
+		failureThreshold: 3
+		initialDelaySeconds: 10
+		periodSeconds: 10
+		successThreshold: 1
+		timeoutSeconds: 1
+		port: 10254
+	${0}

From 1accde62ad62fe4adac62bbb16c4915d97786637 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 9 Dec 2018 14:09:10 +0000
Subject: [PATCH 1195/1587] Replace lost Rust snippets

The commit df26062a37500390c53f3efa7462384a86695e89 removed some
functionality, this commit puts it back in the ultisnips format where
not possible in the snipmate format.
---
 UltiSnips/rust.snippets | 33 ++++++++++++++--------------
 snippets/rust.snippets  | 48 ++++++++++++++++++++++++++++++-----------
 2 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 24af1b37a..563515257 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -4,31 +4,32 @@
 
 priority -50
 
+snippet fn "pub fn name(?) -> ? {}"
+fn ${1:function_name}($2)${3/..*/ -> /}$3 {
+	${VISUAL}$0
+}
+endsnippet
 
-snippet arg "Function Arguments" i
-${1:a}: ${2:T}${3:, arg}
+snippet pfn "pub fn name(?) -> ? {}"
+pub fn ${1:function_name}($2)${3/..*/ -> /}$3 {
+	${VISUAL}$0
+}
 endsnippet
 
-snippet || "Closure, anonymous function (inline)" i
-${1:move }|$2| { $3 }
+snippet pri "print!(..)" b
+print!("$1"${2/..*/, /}$2);
 endsnippet
 
-snippet |} "Closure, anonymous function (block)" i
-${1:move }|$2| {
-	$3
-}
+snippet pln "println!(..)" b
+println!("$1"${2/..*/, /}$2);
 endsnippet
 
-snippet macro "macro_rules!" b
-macro_rules! ${1:name} {
-	(${2:matcher}) => (
-		$3
-	)
-}
+snippet fmt "format!(..)"
+format!("$1"${2/..*/, /}$2);
 endsnippet
 
-snippet fd "Struct field definition" w
-${1:name}: ${2:Type},
+snippet it ".iter()" i
+.iter()$0
 endsnippet
 
 # vim:ft=snippets:
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 24193db4f..0d7885c7e 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -11,11 +11,6 @@ snippet pfn "Function definition"
 	pub fn ${1:function_name}(${2})${3} {
 		${0}
 	}
-snippet test "Unit test function"
-	#[test]
-	fn ${1:test_function_name}() {
-		${0}
-	}
 snippet bench "Bench function" b
 	#[bench]
 	fn ${1:bench_function_name}(b: &mut test::Bencher) {
@@ -24,7 +19,7 @@ snippet bench "Bench function" b
 		})
 	}
 snippet new "Constructor function"
-	pub fn new(${2}) -> ${1:Name} {
+	pub fn new(${2}) -> ${1:Self} {
 		$1 { ${3} }
 	}
 snippet main "Main function"
@@ -60,6 +55,16 @@ snippet mod
 	mod ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	} /* $1 */
+# Testing
+snippet as "assert!"
+	assert!(${1:predicate});
+snippet ase "assert_eq!"
+	assert_eq!(${1:expected}, ${2:actual});
+snippet test "Unit test function"
+	#[test]
+	fn ${1:function_name}_test() {
+		${0}
+	}
 snippet testmod "Test module" b
 	#[cfg(test)]
 	mod tests {
@@ -117,6 +122,8 @@ snippet mat "match pattern"
 	}
 snippet case "Case clause of pattern match"
 	${1:_} => ${2:expression}
+snippet = "=> "
+	=> $0
 snippet loop "loop {}" b
 	loop {
 		${0:${VISUAL}}
@@ -131,7 +138,7 @@ snippet for "for ... in ... loop"
 	}
 # TODO commenting
 snippet todo "TODO comment"
-	// [TODO]: ${0:Description}
+	// TODO: $0
 snippet fixme "FIXME comment"
 	// FIXME: $0
 # Struct
@@ -153,12 +160,16 @@ snippet stn "Struct with new constructor"
 			$1 { ${3} }
 		}
 	}
-snippet type "Type alias"
+snippet ty "Type alias"
 	type ${1:NewName} = $2;
 snippet enum "enum definition"
 	enum ${1:Name} {
 		${2},
 	}
+snippet penum "pub enum definition"
+	pub enum ${1:Name} {
+		${2},
+	}
 # Traits
 snippet trait "Trait definition"
 	trait ${1:Name} {
@@ -186,11 +197,6 @@ snippet spawn "spawn a thread"
 	});
 snippet chan "Declare (Sender, Receiver) pair of asynchronous channel()"
 	let (${1:tx}, ${2:rx}): (Sender<${3:i32}>, Receiver<${4:i32}>) = channel();
-# Testing
-snippet as "assert!"
-	assert!(${1:predicate});
-snippet ase "assert_eq!"
-	assert_eq!(${1:expected}, ${2:actual});
 # Implementations
 snippet asref "AsRef trait implementation"
 	impl AsRef<${1:Ref}> for ${2:Type} {
@@ -204,3 +210,19 @@ snippet asmut "AsMut trait implementation"
 			&mut self.${0:field}
 		}
 	}
+snippet fd "Struct field definition" w
+	${1:name}: ${2:Type},
+snippet || "Closure, anonymous function (inline)" i
+	${1:move }|$2| { $3 }
+snippet |} "Closure, anonymous function (block)" i
+	${1:move }|$2| {
+		$3
+	}
+snippet macro "macro_rules!" b
+	macro_rules! ${1:name} {
+		(${2:matcher}) => (
+			$3
+		)
+	}
+snippet box "Box::new()"
+	Box::new(${0:${VISUAL}})

From b79fe10b15fdc15a9598f38b0c16e56bf0f51873 Mon Sep 17 00:00:00 2001
From: Cyrille David <cyrille@qonto.eu>
Date: Wed, 12 Dec 2018 13:12:13 +0100
Subject: [PATCH 1196/1587] Update ember-snippets to Ember v3

---
 UltiSnips/javascript-ember.snippets | 84 ++++++++++-------------------
 1 file changed, 29 insertions(+), 55 deletions(-)

diff --git a/UltiSnips/javascript-ember.snippets b/UltiSnips/javascript-ember.snippets
index 1b7e7b8db..44cfcf58d 100644
--- a/UltiSnips/javascript-ember.snippets
+++ b/UltiSnips/javascript-ember.snippets
@@ -4,57 +4,45 @@
 
 priority -50
 
-# Application
-snippet eapp "App.Name = Ember.Application.create({});"
-${1:App.Name} = Ember.Application.create({});
+# imports
+snippet eiapp "import Application"
+import Application from "@ember/application"
 endsnippet
 
-# Models
-snippet emod "App.ModelName = Ember.Model.extend({...});"
-${1:model_name} = Ember.Model.extend({
-	${0://Properties here...}
-});
+snippet eicon "import Controller"
+import Controller from "@ember/controller"
 endsnippet
 
-# View
-snippet eview "App.ViewName = Ember.Model.extend({...});"
-${1:view_name} = Ember.View.extend({
-	${0://Properties here...}
-});
+snippet eirou "import Route"
+import Route from "@ember/routing/route"
 endsnippet
 
-# Controller
-snippet econtroller "App.ControllerName = Ember.Model.extend({...});"
-${1:controller_name} = Ember.ObjectController.extend({
-	${0://Properties here...}
-});
+snippet eiapp "import Service"
+import Service from "@ember/service"
 endsnippet
 
-# Route
-snippet eroute "App.RouteName = Ember.Route.extend({...});"
-${1:route_name} = Ember.Route.extend({
-	${0://Properties here...}
-});
+snippet eimod "import Model"
+import Model from 'ember-data/model'
 endsnippet
 
-snippet eview "App.ViewName = Ember.Model.create({...});"
-${1:view_name} = Ember.View.create({
-	${0://Properties here...}
-});
+snippet eicom "import Component"
+import Component from "@ember/component"
 endsnippet
 
-# Object
-snippet eobj "App.ObjectName = Ember.Object.extend({...});"
-${1:object_name} = Ember.Object.create({
-	${0://Properties here...}
-});
+snippet eimix "import Mixin"
+import Mixin from "@ember/object/mixin"
 endsnippet
 
-# Mixin
-snippet emix "App.MixinName = Ember.Model.extend({...});"
-${1:view_name} = Ember.Mixin.create({
-	${0://Properties here...}
-});
+snippet eiobj "import Object"
+import EmberObject from "@ember/object"
+endsnippet
+
+snippet eicp "import computed"
+import { computed } from "@ember/object"
+endsnippet
+
+snippet eicpmacro "import computed macro"
+import { ${1:alias} } from "@ember/object/computed"
 endsnippet
 
 # Ember getter and setter
@@ -66,25 +54,11 @@ snippet eset "this.set('property', value);"
 ${1:this}.set('${2:property}', ${3:value});
 endsnippet
 
-# Computer properties
-snippet cpro "property_name: function() {...}.property(),"
-${1:property_name}: function() {
-	${0://body...}
-}.property('${3:argumenet}'),
-endsnippet
-
-snippet cpro ": function() {...}.property('property'),"
-${1:property_name}: function() {
-	${0://body...}
-}.property(),
-endsnippet
-
-
-# Observes
-snippet proo "property_name: function() {...}.property()"
-${1:property_name}: function() {
+# Computed properties
+snippet ecp "property_name: computed('...', function() {...}),"
+${1:property_name}: computed('${3:argument}', function() {
 	${0://body...}
-}.observes('${3:property}'),
+}),
 endsnippet
 
 # vim:ft=snippets:

From 7945980e985e8bef6a525c127acf46efaa84b414 Mon Sep 17 00:00:00 2001
From: Cyrille David <dcyriller@gmail.com>
Date: Wed, 12 Dec 2018 23:37:23 +0100
Subject: [PATCH 1197/1587] Remove un-needed snippets and match CP trigger

---
 UltiSnips/javascript-ember.snippets | 30 +----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/UltiSnips/javascript-ember.snippets b/UltiSnips/javascript-ember.snippets
index 44cfcf58d..2ac011409 100644
--- a/UltiSnips/javascript-ember.snippets
+++ b/UltiSnips/javascript-ember.snippets
@@ -5,34 +5,6 @@
 priority -50
 
 # imports
-snippet eiapp "import Application"
-import Application from "@ember/application"
-endsnippet
-
-snippet eicon "import Controller"
-import Controller from "@ember/controller"
-endsnippet
-
-snippet eirou "import Route"
-import Route from "@ember/routing/route"
-endsnippet
-
-snippet eiapp "import Service"
-import Service from "@ember/service"
-endsnippet
-
-snippet eimod "import Model"
-import Model from 'ember-data/model'
-endsnippet
-
-snippet eicom "import Component"
-import Component from "@ember/component"
-endsnippet
-
-snippet eimix "import Mixin"
-import Mixin from "@ember/object/mixin"
-endsnippet
-
 snippet eiobj "import Object"
 import EmberObject from "@ember/object"
 endsnippet
@@ -55,7 +27,7 @@ ${1:this}.set('${2:property}', ${3:value});
 endsnippet
 
 # Computed properties
-snippet ecp "property_name: computed('...', function() {...}),"
+snippet cpro "property_name: computed('...', function() {...}),"
 ${1:property_name}: computed('${3:argument}', function() {
 	${0://body...}
 }),

From eef99a8881d8a932278bd54c568718a08b2ee04d Mon Sep 17 00:00:00 2001
From: Cyrille David <cyrille@qonto.eu>
Date: Thu, 13 Dec 2018 15:08:20 +0100
Subject: [PATCH 1198/1587] Reintegrate deleted snippets

---
 UltiSnips/javascript-ember.snippets | 79 ++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 7 deletions(-)

diff --git a/UltiSnips/javascript-ember.snippets b/UltiSnips/javascript-ember.snippets
index 2ac011409..301e5d83e 100644
--- a/UltiSnips/javascript-ember.snippets
+++ b/UltiSnips/javascript-ember.snippets
@@ -4,17 +4,67 @@
 
 priority -50
 
-# imports
-snippet eiobj "import Object"
-import EmberObject from "@ember/object"
+# Application
+snippet eapp "App.Name = Ember.Application.create({});"
+import Application from '@ember/application';
+
+export default Application.extend({
+	${0://Properties here...}
+});
+endsnippet
+
+# Models
+snippet emod "import DS from 'ember-data';"
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+	${0://Properties here...}
+});
+endsnippet
+
+# Controller
+snippet econtroller "import Controller from '@ember/controller';"
+import Controller from '@ember/controller';
+
+export default Controller.extend({
+	${0://Properties here...}
+});
+endsnippet
+
+# Route
+snippet eroute "import Route from '@ember/routing/route';"
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+	${0://Properties here...}
+});
 endsnippet
 
-snippet eicp "import computed"
-import { computed } from "@ember/object"
+# Component
+snippet ecomponent "import Component from '@ember/component';"
+import Component from '@ember/component';
+
+export default Component.extend({
+	${0://Properties here...}
+});
 endsnippet
 
-snippet eicpmacro "import computed macro"
-import { ${1:alias} } from "@ember/object/computed"
+# Object
+snippet eobj "import EmberObject from '@ember/object';"
+import EmberObject from '@ember/object';
+
+export default EmberObject.extend({
+	${0://Properties here...}
+});
+endsnippet
+
+# Mixin
+snippet emix "App.MixinName = Ember.Model.extend({...});"
+import Mixin from '@ember/object/mixin';
+
+export default Mixin.create({
+	${0://Properties here...}
+});
 endsnippet
 
 # Ember getter and setter
@@ -27,10 +77,25 @@ ${1:this}.set('${2:property}', ${3:value});
 endsnippet
 
 # Computed properties
+snippet cproimport "import { computed } from '@ember/object';"
+import { computed } from '@ember/object';
+endsnippet
+
 snippet cpro "property_name: computed('...', function() {...}),"
 ${1:property_name}: computed('${3:argument}', function() {
 	${0://body...}
 }),
 endsnippet
 
+# Observers
+snippet prooimport "import { observer } from '@ember/object';"
+import { observer } from '@ember/object';
+endsnippet
+
+snippet proo "property_name: observer('...', function() {...}),"
+${1:property_name}: observer('${3:argument}', function() {
+	${0://body...}
+}),
+endsnippet
+
 # vim:ft=snippets:

From ba30ad6ca8ccb8e41771d75194c5a4ebdc4b2e08 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 14 Dec 2018 17:16:40 +0000
Subject: [PATCH 1199/1587] Flip Rust assert_equal to match error output

---
 snippets/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 0d7885c7e..e8796638a 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -59,7 +59,7 @@ snippet mod
 snippet as "assert!"
 	assert!(${1:predicate});
 snippet ase "assert_eq!"
-	assert_eq!(${1:expected}, ${2:actual});
+	assert_eq!(${1:actual}, ${2:expected});
 snippet test "Unit test function"
 	#[test]
 	fn ${1:function_name}_test() {

From a6090b9bffeec418ee7deaa31f90c4a8fd3b1170 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 14 Dec 2018 17:18:08 +0000
Subject: [PATCH 1200/1587] Revert "Flip Rust assert_equal to match error
 output"

This reverts commit ba30ad6ca8ccb8e41771d75194c5a4ebdc4b2e08.
---
 snippets/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index e8796638a..0d7885c7e 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -59,7 +59,7 @@ snippet mod
 snippet as "assert!"
 	assert!(${1:predicate});
 snippet ase "assert_eq!"
-	assert_eq!(${1:actual}, ${2:expected});
+	assert_eq!(${1:expected}, ${2:actual});
 snippet test "Unit test function"
 	#[test]
 	fn ${1:function_name}_test() {

From 9ff16f86ebacb6455058db8aac6b2f3d33d68a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Avi=20=D7=93?= <avi.the.coder@gmail.com>
Date: Sun, 30 Dec 2018 11:36:50 -0500
Subject: [PATCH 1201/1587] Fix rust trait/iter snippet name conflict

---
 UltiSnips/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 563515257..fbf459d1b 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -28,7 +28,7 @@ snippet fmt "format!(..)"
 format!("$1"${2/..*/, /}$2);
 endsnippet
 
-snippet it ".iter()" i
+snippet .it ".iter()" i
 .iter()$0
 endsnippet
 

From cfc7e5246a7a761211eb0aeea60bbfc85ea083a5 Mon Sep 17 00:00:00 2001
From: ali <elastic7327@gmail.com>
Date: Mon, 31 Dec 2018 00:10:53 +0900
Subject: [PATCH 1202/1587] feature/add-python-unit-test-skip

---
 snippets/python.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index c1b930ab3..0e513cb89 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -22,6 +22,11 @@ snippet docs
 	Description: ${0}
 	"""
 
+# Unittest skip
+snippet sk "skip unittests" b
+@unittest.skip(${1:skip_reason})
+endsnippet
+
 snippet wh
 	while ${1:condition}:
 		${0:${VISUAL}}

From a742d863daf94c9baeb1c45a09c7995f842aa162 Mon Sep 17 00:00:00 2001
From: David Briscoe <idbrii@gmail.com>
Date: Fri, 14 Dec 2018 11:40:13 -0800
Subject: [PATCH 1203/1587] Use same trigger for javascript functions

For using like this:
    fun<Tab>
    setTimeout(fun<Tab>

None invoke the snippet selector menu.

The anonymous function snippet also lets you jump to after the function
to close scope before defining the function.

Old anf snippet is unmodified.
---
 UltiSnips/javascript.snippets | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 602a56b99..bae39ae89 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -56,19 +56,28 @@ ${1:class_name}.prototype.${2:method_name} = function`!p snip.rv = space_before_
 
 endsnippet
 
-snippet fun "function (fun)" w
+snippet fun "function (named)" b
 function ${1:function_name}`!p snip.rv = space_before_function_paren(snip)`(${2:argument}) {
 	${VISUAL}$0
 }
 endsnippet
 
-snippet vf "Function assigned to var"
+snippet vf "function (assigned to var)"
 ${1:var }${2:function_name} = function $2`!p snip.rv = space_before_function_paren(snip)`($3) {
 	${VISUAL}$0
 }`!p snip.rv = semi(snip)`
 endsnippet
 
-snippet anf "Anonymous Function" i
+# Drop priority so this only triggers when not beginning of line.
+priority -51
+snippet fun "function (anonymous)" w
+function`!p snip.rv = space_before_function_paren(snip)`($1) {
+	${VISUAL}$0
+}$2
+endsnippet
+priority -50
+
+snippet anf "function (anonymous)" i
 function`!p snip.rv = space_before_function_paren(snip)`($1) {
 	${VISUAL}$0
 }

From 9ccd25a150663bfe6e5132ebeceb997a1b420c2a Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 8 Jan 2019 11:49:25 +0000
Subject: [PATCH 1204/1587] Correct syntax error in python snippets

Authored at the Royal Festival Hall. It's a lovely day to be wandering
around London!
---
 snippets/python.snippets | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 0e513cb89..428328155 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -24,8 +24,7 @@ snippet docs
 
 # Unittest skip
 snippet sk "skip unittests" b
-@unittest.skip(${1:skip_reason})
-endsnippet
+	@unittest.skip(${1:skip_reason})
 
 snippet wh
 	while ${1:condition}:
@@ -241,7 +240,7 @@ snippet addaarg
 	parser.add_argument("${0:arg}", "${1:long_arg}", action="${2:store_true}", default=${3:False}, help="${4:Help text}")
 snippet pargs
 	"${VISUAL:return }"parser.parse_args()
-	
+
 # logging
 # glog = get log
 snippet glog
@@ -314,14 +313,14 @@ snippet contain "methods for emulating a container type" b
 
 	def __contains__(self, item):
 		${7:pass}
-	
+
 snippet context "context manager methods" b
 	def __enter__(self):
 		${1:pass}
 
 	def __exit__(self, exc_type, exc_value, traceback):
 		${2:pass}
-	
+
 snippet attr "methods for customizing attribute access" b
 	def __getattr__(self, name):
 		${1:pass}
@@ -331,7 +330,7 @@ snippet attr "methods for customizing attribute access" b
 
 	def __delattr__(self, name):
 		${3:pass}
-	
+
 snippet desc "methods implementing descriptors" b
 	def __get__(self, instance, owner):
 		${1:pass}
@@ -341,7 +340,7 @@ snippet desc "methods implementing descriptors" b
 
 	def __delete__(self, instance):
 		${3:pass}
-	
+
 snippet cmp "methods implementing rich comparison"
 	def __eq__(self, other):
 		${1:pass}
@@ -363,7 +362,7 @@ snippet cmp "methods implementing rich comparison"
 
 	def __cmp__(self, other):
 		${7:pass}
-	
+
 snippet repr "methods implementing string representation"
 	def __repr__(self):
 		${1:pass}
@@ -373,7 +372,7 @@ snippet repr "methods implementing string representation"
 
 	def __unicode__(self):
 		${3:pass}
-	
+
 # note: reflected operands and augmented arithmeitc assignements have been
 # intentionally ommited to reduce verbosity.
 snippet numeric "methods for emulating a numeric type" b
@@ -454,4 +453,4 @@ snippet numeric "methods for emulating a numeric type" b
 
 	def __coerce__(self, other):
 		${25:pass}
-	
+

From e023e39732d107a050284edff6cf6e1464e15bf4 Mon Sep 17 00:00:00 2001
From: Joseph An <an.joseph891@gmail.com>
Date: Sun, 13 Jan 2019 16:00:23 -0500
Subject: [PATCH 1205/1587] Add snippets for Phoenix webframework

---
 snippets/phoenix.snippets | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 snippets/phoenix.snippets

diff --git a/snippets/phoenix.snippets b/snippets/phoenix.snippets
new file mode 100644
index 000000000..3ddd86ff0
--- /dev/null
+++ b/snippets/phoenix.snippets
@@ -0,0 +1,16 @@
+snippet controller
+	defmodule ${0:app_name}Web.${1:controller_name}Controller do
+		use ${0:app_name}Web, :controller
+		
+		${2}
+	end
+
+snippet view
+	defmodule ${0:app_name}Web.${1:view_name}View do
+		use ${0:app_name}Web, :view
+	end
+
+snippet channel
+	defmodule ${0:app_name}Web.${1:channe_name}Channel do
+		use ${0:app_name}Web, :channel
+	end

From d7e89ca955aec58b40551b239a9bf6896341cdbb Mon Sep 17 00:00:00 2001
From: Joseph An <an.joseph891@gmail.com>
Date: Sun, 13 Jan 2019 16:28:09 -0500
Subject: [PATCH 1206/1587] Fix typo, add shorter alias, use app name variable
 multiple times

---
 snippets/phoenix.snippets | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/snippets/phoenix.snippets b/snippets/phoenix.snippets
index 3ddd86ff0..b4d718a56 100644
--- a/snippets/phoenix.snippets
+++ b/snippets/phoenix.snippets
@@ -1,16 +1,16 @@
-snippet controller
-	defmodule ${0:app_name}Web.${1:controller_name}Controller do
-		use ${0:app_name}Web, :controller
+snippet cont
+	defmodule ${1:AppName}Web.${2:ControllerName}Controller do
+		use $1Web, :controller
 		
-		${2}
+		${3}
 	end
 
 snippet view
-	defmodule ${0:app_name}Web.${1:view_name}View do
-		use ${0:app_name}Web, :view
+	defmodule ${1:AppName}Web.${2:ViewName}View do
+		use $1Web, :view
 	end
 
-snippet channel
-	defmodule ${0:app_name}Web.${1:channe_name}Channel do
-		use ${0:app_name}Web, :channel
+snippet chan
+	defmodule ${1:AppName}Web.${2:ChannelName}Channel do
+		use $1Web, :channel
 	end

From 0981110960d1c087853dce8925b87f992abf0e07 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <mail@saschagrunert.de>
Date: Sat, 12 Jan 2019 18:21:21 +0100
Subject: [PATCH 1207/1587] Fix unused_variables in Rust snippet

---
 snippets/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 0d7885c7e..e17e7406e 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -74,7 +74,7 @@ snippet testmod "Test module" b
 	}
 # Attributes
 snippet allow "allow lint attribute" b
-	#[allow(${1:unused_variable})]
+	#[allow(${1:unused_variables})]
 snippet cfg "cfg attribute" b
 	#[cfg(${1:target_os = "linux"})]
 snippet feat "feature attribute" b

From 1d19d092273fceb0023014908ab9ba7ff3e7f2a1 Mon Sep 17 00:00:00 2001
From: Egor Zvorykin <ezvor@mail.ru>
Date: Tue, 8 Jan 2019 02:50:33 +0300
Subject: [PATCH 1208/1587] Test snippet format matches a directory it is in

(see commit cfc7e5246a7a761211eb0aeea60bbfc85ea083a5)
An UltiSnips snippet was added into "snippets" directory which should
contain snipmate snippets only. This led to a parsing bug in UltiSnips.
---
 tests.sh | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/tests.sh b/tests.sh
index 07f0ff315..cacc16ab3 100755
--- a/tests.sh
+++ b/tests.sh
@@ -1,15 +1,37 @@
 #!/usr/bin/env bash
 
-SPACED=$(grep -REn '^ .+' --include '*.snippets' snippets)
-
-if [[ $? -ne 1 ]]; then
-  echo These snippet lines are indented with spaces:
-  echo
-  echo "$SPACED"
-  echo
-  echo Tests failed!
+check=0
+
+function test_space_indented {
+  local spaced
+  spaced=$(grep -REn '^ ' --include '*.snippets' snippets)
+
+  if [[ $? -ne 1 ]]; then
+    echo "These snippet lines are indented with spaces:"
+    echo "$spaced"
+    echo
+    (( check++ ))
+  fi
+}
+
+function test_snipmate_format {
+  local ultisnips_in_snipmate
+  ultisnips_in_snipmate=$(grep -REn 'endsnippet' --include '*.snippets' snippets)
+  if [[ $? -ne 1 ]]; then
+    echo "These snippet definitions are probably in UltiSnips format but stored in the snipmate directory"
+    echo "$ultisnips_in_snipmate"
+    echo
+    (( check++ ))
+  fi
+}
+
+test_space_indented
+test_snipmate_format
+
+if [ $check -eq 0 ]; then
+  echo "Tests passed!"
+  exit 0
+else
+  echo "$check test(s) failed out of 2!"
   exit 1
 fi
-
-echo Tests passed!
-exit 0

From a92ba4854f60c136d6c56a10959cc0797a3e32e6 Mon Sep 17 00:00:00 2001
From: ali <elastic7327@gmail.com>
Date: Thu, 17 Jan 2019 23:11:46 +0900
Subject: [PATCH 1209/1587] ADD Rust Cargo-Ignore-TestCase

---
 snippets/rust.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index e17e7406e..c038a4710 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -72,6 +72,9 @@ snippet testmod "Test module" b
 
 		test${0}
 	}
+snippet ig "#[ignore]"
+	#[ignore]
+
 # Attributes
 snippet allow "allow lint attribute" b
 	#[allow(${1:unused_variables})]

From 3eef68c6b6d800035d7508f33fa42e30fefff178 Mon Sep 17 00:00:00 2001
From: Ali kim <elastic7327@users.noreply.github.com>
Date: Sun, 20 Jan 2019 02:53:53 +0900
Subject: [PATCH 1210/1587] delete blank  (#1105)

* ADD Rust Cargo-Ignore-TestCase

* Rust-Cargo-Test-Ignore/Delete Blank
---
 snippets/rust.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index c038a4710..3caa2a686 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -74,7 +74,6 @@ snippet testmod "Test module" b
 	}
 snippet ig "#[ignore]"
 	#[ignore]
-
 # Attributes
 snippet allow "allow lint attribute" b
 	#[allow(${1:unused_variables})]

From 3e731369fbdd8fdde31b9f063aa7523daf2eaba6 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@diameterstudios.com>
Date: Sun, 20 Jan 2019 19:31:53 -0500
Subject: [PATCH 1211/1587] Add placeholders at end of CSS snippets

---
 snippets/css.snippets | 364 +++++++++++++++++++++---------------------
 1 file changed, 182 insertions(+), 182 deletions(-)

diff --git a/snippets/css.snippets b/snippets/css.snippets
index 08b6cdf34..66f485780 100644
--- a/snippets/css.snippets
+++ b/snippets/css.snippets
@@ -1,50 +1,50 @@
 snippet . "selector { }"
 	${1} {
-		${0:${VISUAL}}
-	}
+		${2:${VISUAL}}
+	}${0}
 snippet ! "!important"
 	 !important
 snippet bdi:m+
-	-moz-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
+	-moz-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${7:stretch};${0}
 snippet bdi:m
-	-moz-border-image: ${0};
+	-moz-border-image: ${1};${0}
 snippet bdrz:m
-	-moz-border-radius: ${0};
+	-moz-border-radius: ${1};${0}
 snippet bxsh:m+
-	-moz-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
+	-moz-box-shadow: ${1:0} ${2:0} ${3:0} #${4:000};${0}
 snippet bxsh:m
-	-moz-box-shadow: ${0};
+	-moz-box-shadow: ${1};${0}
 snippet bdi:w+
-	-webkit-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
+	-webkit-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${7:stretch};${0}
 snippet bdi:w
-	-webkit-border-image: ${0};
+	-webkit-border-image: ${1};${0}
 snippet bdrz:w
-	-webkit-border-radius: ${0};
+	-webkit-border-radius: ${1};${0}
 snippet bxsh:w+
-	-webkit-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
+	-webkit-box-shadow: ${1:0} ${2:0} ${3:0} #${4:000};${0}
 snippet bxsh:w
-	-webkit-box-shadow: ${0};
+	-webkit-box-shadow: ${1};${0}
 snippet @f
 	@font-face {
 		font-family: ${1};
-		src: url(${0});
-	}
+		src: url(${2});
+	}${0}
 snippet @i
-	@import url(${0});
+	@import url(${1});${0}
 snippet @m "@media mediatype { }"
 	@media ${1:print} {
-		${0:${VISUAL}}
-	}
+		${2:${VISUAL}}
+	}${0}
 snippet bg+
-	background: #${1:FFF} url(${2}) ${3:0} ${4:0} ${0:no-repeat};
+	background: #${1:fff} url(${2}) ${3:0} ${4:0} ${5:no-repeat};${0}
 snippet bga
-	background-attachment: ${0};
+	background-attachment: ${1};${0}
 snippet bga:f
 	background-attachment: fixed;
 snippet bga:s
 	background-attachment: scroll;
 snippet bgbk
-	background-break: ${0};
+	background-break: ${1};${0}
 snippet bgbk:bb
 	background-break: bounding-box;
 snippet bgbk:c
@@ -52,7 +52,7 @@ snippet bgbk:c
 snippet bgbk:eb
 	background-break: each-box;
 snippet bgcp
-	background-clip: ${0};
+	background-clip: ${1};${0}
 snippet bgcp:bb
 	background-clip: border-box;
 snippet bgcp:cb
@@ -62,15 +62,15 @@ snippet bgcp:nc
 snippet bgcp:pb
 	background-clip: padding-box;
 snippet bgc
-	background-color: #${0:FFF};
+	background-color: #${1:fff};${0}
 snippet bgc:t
 	background-color: transparent;
 snippet bgi
-	background-image: url(${0});
+	background-image: url(${1});${0}
 snippet bgi:n
 	background-image: none;
 snippet bgo
-	background-origin: ${0};
+	background-origin: ${1};${0}
 snippet bgo:bb
 	background-origin: border-box;
 snippet bgo:cb
@@ -78,13 +78,13 @@ snippet bgo:cb
 snippet bgo:pb
 	background-origin: padding-box;
 snippet bgpx
-	background-position-x: ${0};
+	background-position-x: ${1};${0}
 snippet bgpy
-	background-position-y: ${0};
+	background-position-y: ${1};${0}
 snippet bgp
-	background-position: ${1:0} ${0:0};
+	background-position: ${1:0} ${2:0};${0}
 snippet bgr
-	background-repeat: ${0};
+	background-repeat: ${1};${0}
 snippet bgr:n
 	background-repeat: no-repeat;
 snippet bgr:x
@@ -94,7 +94,7 @@ snippet bgr:y
 snippet bgr:r
 	background-repeat: repeat;
 snippet bgz
-	background-size: ${0};
+	background-size: ${1};${0}
 snippet bgz:a
 	background-size: auto;
 snippet bgz:ct
@@ -102,67 +102,67 @@ snippet bgz:ct
 snippet bgz:cv
 	background-size: cover;
 snippet bg
-	background: ${0};
+	background: ${1};${0}
 snippet bg:ie
 	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}');
 snippet bg:n
 	background: none;
 snippet bd+
-	border: ${1:1px} ${2:solid} #${0:000};
+	border: ${1:1px} ${2:solid} #${3:000};${0}
 snippet bdb+
-	border-bottom: ${1:1px} ${2:solid} #${0:000};
+	border-bottom: ${1:1px} ${2:solid} #${3:000};${0}
 snippet bdbc
-	border-bottom-color: #${0:000};
+	border-bottom-color: #${1:000};${0}
 snippet bdbi
-	border-bottom-image: url(${0});
+	border-bottom-image: url(${1});${0}
 snippet bdbi:n
 	border-bottom-image: none;
 snippet bdbli
-	border-bottom-left-image: url(${0});
+	border-bottom-left-image: url(${1});${0}
 snippet bdbli:c
 	border-bottom-left-image: continue;
 snippet bdbli:n
 	border-bottom-left-image: none;
 snippet bdblrz
-	border-bottom-left-radius: ${0};
+	border-bottom-left-radius: ${1};${0}
 snippet bdbri
-	border-bottom-right-image: url(${0});
+	border-bottom-right-image: url(${1});${0}
 snippet bdbri:c
 	border-bottom-right-image: continue;
 snippet bdbri:n
 	border-bottom-right-image: none;
 snippet bdbrrz
-	border-bottom-right-radius: ${0};
+	border-bottom-right-radius: ${1};${0}
 snippet bdbs
-	border-bottom-style: ${0};
+	border-bottom-style: ${1};${0}
 snippet bdbs:n
 	border-bottom-style: none;
 snippet bdbw
-	border-bottom-width: ${0};
+	border-bottom-width: ${1};${0}
 snippet bdb
-	border-bottom: ${0};
+	border-bottom: ${1};${0}
 snippet bdb:n
 	border-bottom: none;
 snippet bdbk
-	border-break: ${0};
+	border-break: ${1};${0}
 snippet bdbk:c
 	border-break: close;
 snippet bdcl
-	border-collapse: ${0};
+	border-collapse: ${1};${0}
 snippet bdcl:c
 	border-collapse: collapse;
 snippet bdcl:s
 	border-collapse: separate;
 snippet bdc
-	border-color: #${0:000};
+	border-color: #${1:000};${0}
 snippet bdci
-	border-corner-image: url(${0});
+	border-corner-image: url(${1});${0}
 snippet bdci:c
 	border-corner-image: continue;
 snippet bdci:n
 	border-corner-image: none;
 snippet bdf
-	border-fit: ${0};
+	border-fit: ${1};${0}
 snippet bdf:c
 	border-fit: clip;
 snippet bdf:of
@@ -178,55 +178,55 @@ snippet bdf:sp
 snippet bdf:st
 	border-fit: stretch;
 snippet bdi
-	border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
+	border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${7:stretch};${0}
 snippet bdi:n
 	border-image: none;
 snippet bdl+
-	border-left: ${1:1px} ${2:solid} #${0:000};
+	border-left: ${1:1px} ${2:solid} #${3:000};${0}
 snippet bdlc
-	border-left-color: #${0:000};
+	border-left-color: #${1:000};${0}
 snippet bdli
-	border-left-image: url(${0});
+	border-left-image: url(${1});${0}
 snippet bdli:n
 	border-left-image: none;
 snippet bdls
-	border-left-style: ${0};
+	border-left-style: ${1};${0}
 snippet bdls:n
 	border-left-style: none;
 snippet bdlw
-	border-left-width: ${0};
+	border-left-width: ${1};${0}
 snippet bdl
-	border-left: ${0};
+	border-left: ${1};${0}
 snippet bdl:n
 	border-left: none;
 snippet bdlt
-	border-length: ${0};
+	border-length: ${1};${0}
 snippet bdlt:a
 	border-length: auto;
 snippet bdrz
-	border-radius: ${0};
+	border-radius: ${1};${0}
 snippet bdr+
-	border-right: ${1:1px} ${2:solid} #${0:000};
+	border-right: ${1:1px} ${2:solid} #${3:000};${0}
 snippet bdrc
-	border-right-color: #${0:000};
+	border-right-color: #${1:000};${0}
 snippet bdri
-	border-right-image: url(${0});
+	border-right-image: url(${1});${0}
 snippet bdri:n
 	border-right-image: none;
 snippet bdrs
-	border-right-style: ${0};
+	border-right-style: ${1};${0}
 snippet bdrs:n
 	border-right-style: none;
 snippet bdrw
-	border-right-width: ${0};
+	border-right-width: ${1};${0}
 snippet bdr
-	border-right: ${0};
+	border-right: ${1};${0}
 snippet bdr:n
 	border-right: none;
 snippet bdsp
-	border-spacing: ${0};
+	border-spacing: ${1};${0}
 snippet bds
-	border-style: ${0};
+	border-style: ${1};${0}
 snippet bds:ds
 	border-style: dashed;
 snippet bds:dtds
@@ -254,69 +254,69 @@ snippet bds:s
 snippet bds:w
 	border-style: wave;
 snippet bdt+
-	border-top: ${1:1px} ${2:solid} #${0:000};
+	border-top: ${1:1px} ${2:solid} #${3:000};${0}
 snippet bdtc
-	border-top-color: #${0:000};
+	border-top-color: #${1:000};${0}
 snippet bdti
-	border-top-image: url(${0});
+	border-top-image: url(${1});${0}
 snippet bdti:n
 	border-top-image: none;
 snippet bdtli
-	border-top-left-image: url(${0});
+	border-top-left-image: url(${1});${0}
 snippet bdtli:c
 	border-corner-image: continue;
 snippet bdtli:n
 	border-corner-image: none;
 snippet bdtlrz
-	border-top-left-radius: ${0};
+	border-top-left-radius: ${1};${0}
 snippet bdtri
-	border-top-right-image: url(${0});
+	border-top-right-image: url(${1});${0}
 snippet bdtri:c
 	border-top-right-image: continue;
 snippet bdtri:n
 	border-top-right-image: none;
 snippet bdtrrz
-	border-top-right-radius: ${0};
+	border-top-right-radius: ${1};${0}
 snippet bdts
-	border-top-style: ${0};
+	border-top-style: ${1};${0}
 snippet bdts:n
 	border-top-style: none;
 snippet bdtw
-	border-top-width: ${0};
+	border-top-width: ${1};${0}
 snippet bdt
-	border-top: ${0};
+	border-top: ${1};${0}
 snippet bdt:n
 	border-top: none;
 snippet bdw
-	border-width: ${0};
+	border-width: ${1};${0}
 snippet bd
-	border: ${0};
+	border: ${1};${0}
 snippet bd:n
 	border: none;
 snippet b
-	bottom: ${0};
+	bottom: ${1};${0}
 snippet b:a
 	bottom: auto;
 snippet bxsh+
-	box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
+	box-shadow: ${1:0} ${2:0} ${3:0} #${4:000};${0}
 snippet bxsh
-	box-shadow: ${0};
+	box-shadow: ${1};${0}
 snippet bxsh:n
 	box-shadow: none;
 snippet bxz
-	box-sizing: ${0};
+	box-sizing: ${1};${0}
 snippet bxz:bb
 	box-sizing: border-box;
 snippet bxz:cb
 	box-sizing: content-box;
 snippet cps
-	caption-side: ${0};
+	caption-side: ${1};${0}
 snippet cps:b
 	caption-side: bottom;
 snippet cps:t
 	caption-side: top;
 snippet cl
-	clear: ${0};
+	clear: ${1};${0}
 snippet cl:b
 	clear: both;
 snippet cl:l
@@ -326,23 +326,23 @@ snippet cl:n
 snippet cl:r
 	clear: right;
 snippet cp
-	clip: ${0};
+	clip: ${1};${0}
 snippet cp:a
 	clip: auto;
 snippet cp:r
-	clip: rect(${1:0} ${2:0} ${3:0} ${0:0});
+	clip: rect(${1:0} ${2:0} ${3:0} ${4:0});${0}
 snippet c
-	color: #${0:000};
+	color: #${1:000};${0}
 snippet ct
-	content: ${0};
+	content: ${1};${0}
 snippet ct:a
-	content: attr(${0});
+	content: attr(${1});${0}
 snippet ct:cq
 	content: close-quote;
 snippet ct:c
-	content: counter(${0});
+	content: counter(${1});${0}
 snippet ct:cs
-	content: counters(${0});
+	content: counters(${1});${0}
 snippet ct:ncq
 	content: no-close-quote;
 snippet ct:noq
@@ -352,11 +352,11 @@ snippet ct:n
 snippet ct:oq
 	content: open-quote;
 snippet coi
-	counter-increment: ${0};
+	counter-increment: ${1};${0}
 snippet cor
-	counter-reset: ${0};
+	counter-reset: ${1};${0}
 snippet cur
-	cursor: ${0};
+	cursor: ${1};${0}
 snippet cur:a
 	cursor: auto;
 snippet cur:c
@@ -374,7 +374,7 @@ snippet cur:p
 snippet cur:t
 	cursor: text;
 snippet d
-	display: ${0};
+	display: ${1};${0}
 snippet d:mib
 	display: -moz-inline-box;
 snippet d:mis
@@ -414,7 +414,7 @@ snippet d:tbr
 snippet d:tb
 	display: table;
 snippet ec
-	empty-cells: ${0};
+	empty-cells: ${1};${0}
 snippet ec:h
 	empty-cells: hide;
 snippet ec:s
@@ -422,7 +422,7 @@ snippet ec:s
 snippet exp
 	expression()
 snippet fl
-	float: ${0};
+	float: ${1};${0}
 snippet fl:l
 	float: left;
 snippet fl:n
@@ -430,9 +430,9 @@ snippet fl:n
 snippet fl:r
 	float: right;
 snippet f+
-	font: ${1:1em} ${2:Arial},${0:sans-serif};
+	font: ${1:1em} ${2:Arial},${3:sans-serif};${0}
 snippet fef
-	font-effect: ${0};
+	font-effect: ${1};${0}
 snippet fef:eb
 	font-effect: emboss;
 snippet fef:eg
@@ -442,13 +442,13 @@ snippet fef:n
 snippet fef:o
 	font-effect: outline;
 snippet femp
-	font-emphasize-position: ${0};
+	font-emphasize-position: ${1};${0}
 snippet femp:a
 	font-emphasize-position: after;
 snippet femp:b
 	font-emphasize-position: before;
 snippet fems
-	font-emphasize-style: ${0};
+	font-emphasize-style: ${1};${0}
 snippet fems:ac
 	font-emphasize-style: accent;
 snippet fems:c
@@ -460,9 +460,9 @@ snippet fems:dt
 snippet fems:n
 	font-emphasize-style: none;
 snippet fem
-	font-emphasize: ${0};
+	font-emphasize: ${1};${0}
 snippet ff
-	font-family: ${0};
+	font-family: ${1};${0}
 snippet ff:c
 	font-family: ${0:'Monotype Corsiva','Comic Sans MS'},cursive;
 snippet ff:f
@@ -474,13 +474,13 @@ snippet ff:ss
 snippet ff:s
 	font-family: ${0:Georgia,'Times New Roman'},serif;
 snippet fza
-	font-size-adjust: ${0};
+	font-size-adjust: ${1};${0}
 snippet fza:n
 	font-size-adjust: none;
 snippet fz
-	font-size: ${0};
+	font-size: ${1};${0}
 snippet fsm
-	font-smooth: ${0};
+	font-smooth: ${1};${0}
 snippet fsm:aw
 	font-smooth: always;
 snippet fsm:a
@@ -488,7 +488,7 @@ snippet fsm:a
 snippet fsm:n
 	font-smooth: never;
 snippet fst
-	font-stretch: ${0};
+	font-stretch: ${1};${0}
 snippet fst:c
 	font-stretch: condensed;
 snippet fst:e
@@ -508,7 +508,7 @@ snippet fst:uc
 snippet fst:ue
 	font-stretch: ultra-expanded;
 snippet fs
-	font-style: ${0};
+	font-style: ${1};${0}
 snippet fs:i
 	font-style: italic;
 snippet fs:n
@@ -516,13 +516,13 @@ snippet fs:n
 snippet fs:o
 	font-style: oblique;
 snippet fv
-	font-variant: ${0};
+	font-variant: ${1};${0}
 snippet fv:n
 	font-variant: normal;
 snippet fv:sc
 	font-variant: small-caps;
 snippet fw
-	font-weight: ${0};
+	font-weight: ${1};${0}
 snippet fw:b
 	font-weight: bold;
 snippet fw:br
@@ -532,31 +532,31 @@ snippet fw:lr
 snippet fw:n
 	font-weight: normal;
 snippet f
-	font: ${0};
+	font: ${1};${0}
 snippet h
-	height: ${0};
+	height: ${1};${0}
 snippet h:a
 	height: auto;
 snippet l
-	left: ${0};
+	left: ${1};${0}
 snippet l:a
 	left: auto;
 snippet lts
-	letter-spacing: ${0};
+	letter-spacing: ${1};${0}
 snippet lh
-	line-height: ${0};
+	line-height: ${1};${0}
 snippet lisi
-	list-style-image: url(${0});
+	list-style-image: url(${1});${0}
 snippet lisi:n
 	list-style-image: none;
 snippet lisp
-	list-style-position: ${0};
+	list-style-position: ${1};${0}
 snippet lisp:i
 	list-style-position: inside;
 snippet lisp:o
 	list-style-position: outside;
 snippet list
-	list-style-type: ${0};
+	list-style-type: ${1};${0}
 snippet list:c
 	list-style-type: circle;
 snippet list:dclz
@@ -574,75 +574,75 @@ snippet list:s
 snippet list:ur
 	list-style-type: upper-roman;
 snippet lis
-	list-style: ${0};
+	list-style: ${1};${0}
 snippet lis:n
 	list-style: none;
 snippet mb
-	margin-bottom: ${0};
+	margin-bottom: ${1};${0}
 snippet mb:a
 	margin-bottom: auto;
 snippet ml
-	margin-left: ${0};
+	margin-left: ${1};${0}
 snippet ml:a
 	margin-left: auto;
 snippet mr
-	margin-right: ${0};
+	margin-right: ${1};${0}
 snippet mr:a
 	margin-right: auto;
 snippet mt
-	margin-top: ${0};
+	margin-top: ${1};${0}
 snippet mt:a
 	margin-top: auto;
 snippet m
-	margin: ${0};
+	margin: ${1};${0}
 snippet m:4
-	margin: ${1:0} ${2:0} ${3:0} ${0:0};
+	margin: ${1:0} ${2:0} ${3:0} ${4:0};${0}
 snippet m:3
-	margin: ${1:0} ${2:0} ${0:0};
+	margin: ${1:0} ${2:0} ${3:0};${0}
 snippet m:2
-	margin: ${1:0} ${0:0};
+	margin: ${1:0} ${2:0};${0}
 snippet m:0
 	margin: 0;
 snippet m:a
 	margin: auto;
 snippet mah
-	max-height: ${0};
+	max-height: ${1};${0}
 snippet mah:n
 	max-height: none;
 snippet maw
-	max-width: ${0};
+	max-width: ${1};${0}
 snippet maw:n
 	max-width: none;
 snippet mih
-	min-height: ${0};
+	min-height: ${1};${0}
 snippet miw
-	min-width: ${0};
+	min-width: ${1};${0}
 snippet op
-	opacity: ${0};
+	opacity: ${1};${0}
 snippet op:ie
-	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100});
+	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=${1:100});${0}
 snippet op:ms
 	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})';
 snippet orp
-	orphans: ${0};
+	orphans: ${1};${0}
 snippet o+
-	outline: ${1:1px} ${2:solid} #${0:000};
+	outline: ${1:1px} ${2:solid} #${3:000};${0}
 snippet oc
-	outline-color: ${0:#000};
+	outline-color: ${1:#000};${0}
 snippet oc:i
 	outline-color: invert;
 snippet oo
-	outline-offset: ${0};
+	outline-offset: ${1};${0}
 snippet os
-	outline-style: ${0};
+	outline-style: ${1};${0}
 snippet ow
-	outline-width: ${0};
+	outline-width: ${1};${0}
 snippet o
-	outline: ${0};
+	outline: ${1};${0}
 snippet o:n
 	outline: none;
 snippet ovs
-	overflow-style: ${0};
+	overflow-style: ${1};${0}
 snippet ovs:a
 	overflow-style: auto;
 snippet ovs:mq
@@ -654,7 +654,7 @@ snippet ovs:p
 snippet ovs:s
 	overflow-style: scrollbar;
 snippet ovx
-	overflow-x: ${0};
+	overflow-x: ${1};${0}
 snippet ovx:a
 	overflow-x: auto;
 snippet ovx:h
@@ -664,7 +664,7 @@ snippet ovx:s
 snippet ovx:v
 	overflow-x: visible;
 snippet ovy
-	overflow-y: ${0};
+	overflow-y: ${1};${0}
 snippet ovy:a
 	overflow-y: auto;
 snippet ovy:h
@@ -674,7 +674,7 @@ snippet ovy:s
 snippet ovy:v
 	overflow-y: visible;
 snippet ov
-	overflow: ${0};
+	overflow: ${1};${0}
 snippet ov:a
 	overflow: auto;
 snippet ov:h
@@ -684,25 +684,25 @@ snippet ov:s
 snippet ov:v
 	overflow: visible;
 snippet pb
-	padding-bottom: ${0};
+	padding-bottom: ${1};${0}
 snippet pl
-	padding-left: ${0};
+	padding-left: ${1};${0}
 snippet pr
-	padding-right: ${0};
+	padding-right: ${1};${0}
 snippet pt
-	padding-top: ${0};
+	padding-top: ${1};${0}
 snippet p
-	padding: ${0};
+	padding: ${1};${0}
 snippet p:4
-	padding: ${1:0} ${2:0} ${3:0} ${0:0};
+	padding: ${1:0} ${2:0} ${3:0} ${4:0};${0}
 snippet p:3
-	padding: ${1:0} ${2:0} ${0:0};
+	padding: ${1:0} ${2:0} ${3:0};${0}
 snippet p:2
-	padding: ${1:0} ${0:0};
+	padding: ${1:0} ${2:0};${0}
 snippet p:0
 	padding: 0;
 snippet pgba
-	page-break-after: ${0};
+	page-break-after: ${1};${0}
 snippet pgba:aw
 	page-break-after: always;
 snippet pgba:a
@@ -712,7 +712,7 @@ snippet pgba:l
 snippet pgba:r
 	page-break-after: right;
 snippet pgbb
-	page-break-before: ${0};
+	page-break-before: ${1};${0}
 snippet pgbb:aw
 	page-break-before: always;
 snippet pgbb:a
@@ -722,13 +722,13 @@ snippet pgbb:l
 snippet pgbb:r
 	page-break-before: right;
 snippet pgbi
-	page-break-inside: ${0};
+	page-break-inside: ${1};${0}
 snippet pgbi:a
 	page-break-inside: auto;
 snippet pgbi:av
 	page-break-inside: avoid;
 snippet pos
-	position: ${0};
+	position: ${1};${0}
 snippet pos:a
 	position: absolute;
 snippet pos:f
@@ -738,7 +738,7 @@ snippet pos:r
 snippet pos:s
 	position: static;
 snippet q
-	quotes: ${0};
+	quotes: ${1};${0}
 snippet q:en
 	quotes: '\201C' '\201D' '\2018' '\2019';
 snippet q:n
@@ -746,7 +746,7 @@ snippet q:n
 snippet q:ru
 	quotes: '\00AB' '\00BB' '\201E' '\201C';
 snippet rz
-	resize: ${0};
+	resize: ${1};${0}
 snippet rz:b
 	resize: both;
 snippet rz:h
@@ -756,17 +756,17 @@ snippet rz:n
 snippet rz:v
 	resize: vertical;
 snippet r
-	right: ${0};
+	right: ${1};${0}
 snippet r:a
 	right: auto;
 snippet tbl
-	table-layout: ${0};
+	table-layout: ${1};${0}
 snippet tbl:a
 	table-layout: auto;
 snippet tbl:f
 	table-layout: fixed;
 snippet tal
-	text-align-last: ${0};
+	text-align-last: ${1};${0}
 snippet tal:a
 	text-align-last: auto;
 snippet tal:c
@@ -776,7 +776,7 @@ snippet tal:l
 snippet tal:r
 	text-align-last: right;
 snippet ta
-	text-align: ${0};
+	text-align: ${1};${0}
 snippet ta:c
 	text-align: center;
 snippet ta:l
@@ -784,7 +784,7 @@ snippet ta:l
 snippet ta:r
 	text-align: right;
 snippet td
-	text-decoration: ${0};
+	text-decoration: ${1};${0}
 snippet td:l
 	text-decoration: line-through;
 snippet td:n
@@ -794,7 +794,7 @@ snippet td:o
 snippet td:u
 	text-decoration: underline;
 snippet te
-	text-emphasis: ${0};
+	text-emphasis: ${1};${0}
 snippet te:ac
 	text-emphasis: accent;
 snippet te:a
@@ -810,7 +810,7 @@ snippet te:dt
 snippet te:n
 	text-emphasis: none;
 snippet th
-	text-height: ${0};
+	text-height: ${1};${0}
 snippet th:a
 	text-height: auto;
 snippet th:f
@@ -820,11 +820,11 @@ snippet th:m
 snippet th:t
 	text-height: text-size;
 snippet ti
-	text-indent: ${0};
+	text-indent: ${1};${0}
 snippet ti:-
 	text-indent: -9999px;
 snippet tj
-	text-justify: ${0};
+	text-justify: ${1};${0}
 snippet tj:a
 	text-justify: auto;
 snippet tj:d
@@ -840,23 +840,23 @@ snippet tj:k
 snippet tj:t
 	text-justify: tibetan;
 snippet to+
-	text-outline: ${1:0} ${2:0} #${0:000};
+	text-outline: ${1:0} ${2:0} #${3:000};${0}
 snippet to
-	text-outline: ${0};
+	text-outline: ${1};${0}
 snippet to:n
 	text-outline: none;
 snippet tr
-	text-replace: ${0};
+	text-replace: ${1};${0}
 snippet tr:n
 	text-replace: none;
 snippet tsh+
-	text-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
+	text-shadow: ${1:0} ${2:0} ${3:0} #${4:000};${0}
 snippet tsh
-	text-shadow: ${0};
+	text-shadow: ${1};${0}
 snippet tsh:n
 	text-shadow: none;
 snippet tt
-	text-transform: ${0};
+	text-transform: ${1};${0}
 snippet tt:c
 	text-transform: capitalize;
 snippet tt:l
@@ -866,7 +866,7 @@ snippet tt:n
 snippet tt:u
 	text-transform: uppercase;
 snippet tw
-	text-wrap: ${0};
+	text-wrap: ${1};${0}
 snippet tw:no
 	text-wrap: none;
 snippet tw:n
@@ -876,11 +876,11 @@ snippet tw:s
 snippet tw:u
 	text-wrap: unrestricted;
 snippet t
-	top: ${0};
+	top: ${1};${0}
 snippet t:a
 	top: auto;
 snippet va
-	vertical-align: ${0};
+	vertical-align: ${1};${0}
 snippet va:bl
 	vertical-align: baseline;
 snippet va:b
@@ -898,7 +898,7 @@ snippet va:tt
 snippet va:t
 	vertical-align: top;
 snippet v
-	visibility: ${0};
+	visibility: ${1};${0}
 snippet v:c
 	visibility: collapse;
 snippet v:h
@@ -906,7 +906,7 @@ snippet v:h
 snippet v:v
 	visibility: visible;
 snippet whsc
-	white-space-collapse: ${0};
+	white-space-collapse: ${1};${0}
 snippet whsc:ba
 	white-space-collapse: break-all;
 snippet whsc:bs
@@ -918,7 +918,7 @@ snippet whsc:l
 snippet whsc:n
 	white-space-collapse: normal;
 snippet whs
-	white-space: ${0};
+	white-space: ${1};${0}
 snippet whs:n
 	white-space: normal;
 snippet whs:nw
@@ -930,13 +930,13 @@ snippet whs:pw
 snippet whs:p
 	white-space: pre;
 snippet wid
-	widows: ${0};
+	widows: ${1};${0}
 snippet w
-	width: ${0};
+	width: ${1};${0}
 snippet w:a
 	width: auto;
 snippet wob
-	word-break: ${0};
+	word-break: ${1};${0}
 snippet wob:ba
 	word-break: break-all;
 snippet wob:bs
@@ -948,9 +948,9 @@ snippet wob:l
 snippet wob:n
 	word-break: normal;
 snippet wos
-	word-spacing: ${0};
+	word-spacing: ${1};${0}
 snippet wow
-	word-wrap: ${0};
+	word-wrap: ${1};${0}
 snippet wow:no
 	word-wrap: none;
 snippet wow:n
@@ -960,7 +960,7 @@ snippet wow:s
 snippet wow:u
 	word-wrap: unrestricted;
 snippet z
-	z-index: ${0};
+	z-index: ${1};${0}
 snippet z:a
 	z-index: auto;
 snippet zoo

From 54e76dd36c8341197cd7284c37e21b61561f081a Mon Sep 17 00:00:00 2001
From: Philipp Hansch <dev@phansch.net>
Date: Sun, 27 Jan 2019 12:51:40 +0100
Subject: [PATCH 1212/1587] Rust: Add dbg! macro snippet 'db'

This was added with Rust 1.32 and is super useful compared to doing
just `print!` debugging.

See https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html#the-dbg-macro
for examples.
---
 snippets/rust.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 3caa2a686..ac92748b2 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -44,6 +44,8 @@ snippet pln, "println! with format param"
 	println!("${1}{${2}}", ${3});
 snippet fmt "format!"
 	format!("${1}{${2}}", ${3});
+snippet d "dbg! debugging macro"
+	dbg!(${1});
 
 # Modules
 snippet ec "extern crate"

From 902d4ada2110cf84e81c0800256fba8cf8003adf Mon Sep 17 00:00:00 2001
From: yatoogamii <45099340+yatoogamii@users.noreply.github.com>
Date: Thu, 31 Jan 2019 17:29:28 +0100
Subject: [PATCH 1213/1587] Flexbox snippets css (#1110)

---
 snippets/css.snippets | 88 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/snippets/css.snippets b/snippets/css.snippets
index 66f485780..dd688cbe7 100644
--- a/snippets/css.snippets
+++ b/snippets/css.snippets
@@ -35,6 +35,46 @@ snippet @m "@media mediatype { }"
 	@media ${1:print} {
 		${2:${VISUAL}}
 	}${0}
+snippet ac
+	align-content: ${0:stretch};
+snippet ac:c
+	align-content: center;
+snippet ac:fe
+	align-content: flex-end;
+snippet ac:fs
+	align-content: flex-start;
+snippet ac:sa
+	align-content: space-around;
+snippet ac:sb
+	align-content: space-between;
+snippet ac:s
+	align-content: stretch;
+snippet ai
+	align-items: ${0:stretch};
+snippet ai:b
+	align-items: baseline;
+snippet ai:c
+	align-items: center;
+snippet ai:fe
+	align-items: flex-end;
+snippet ai:fs
+	align-items: flex-start;
+snippet ai:s
+	align-items: stretch;
+snippet as
+	align-self:  ${0};
+snippet as:a
+	align-self: auto;
+snippet as:b
+	align-self: baseline;
+snippet as:c
+	align-self: center;
+snippet as:fe
+	align-self: flex-end;
+snippet as:fs
+	align-self: flex-start;
+snippet as:s
+	align-self: stretch;
 snippet bg+
 	background: #${1:fff} url(${2}) ${3:0} ${4:0} ${5:no-repeat};${0}
 snippet bga
@@ -383,6 +423,8 @@ snippet d:b
 	display: block;
 snippet d:cp
 	display: compact;
+snippet d:f
+	display: flex;
 snippet d:ib
 	display: inline-block;
 snippet d:itb
@@ -421,6 +463,36 @@ snippet ec:s
 	empty-cells: show;
 snippet exp
 	expression()
+snippet fx
+	flex: ${1:0} ${2:1} ${0:auto};
+snippet fxb
+	flex-basis: ${0:auto};
+snippet fxb:a
+	flex-basis: auto;
+snippet fxd
+	flex-direction: ${0:row};
+snippet fxd:c
+	flex-direction: column;
+snippet fxd:cr
+	flex-direction: column-reverse;
+snippet fxd:r
+	flex-direction: row;
+snippet fxd:rr
+	flex-direction: row-reverse;
+snippet fxf
+	flex-flow: ${1:row} ${0:nowrap};
+snippet fxg
+	flex-grow: ${0:0};
+snippet fxs
+	flex-shrink: ${0:1};
+snippet fxw
+	flex-wrap: ${0:nowrap};
+snippet fxw:n
+	flex-wrap: nowrap;
+snippet fxw:w
+	flex-wrap: wrap;
+snippet fxw:wr
+	flex-wrap: wrap-reverse;
 snippet fl
 	float: ${1};${0}
 snippet fl:l
@@ -537,6 +609,20 @@ snippet h
 	height: ${1};${0}
 snippet h:a
 	height: auto;
+snippet jc
+	justify-content: ${0:flex-start};
+snippet jc:c
+	justify-content: center;
+snippet jc:fe
+	justify-content: flex-end;
+snippet jc:fs
+	justify-content: flex-start;
+snippet jc:sa
+	justify-content: space-around;
+snippet jc:sb
+	justify-content: space-between;
+snippet jc:se
+	justify-content: space-evenly;
 snippet l
 	left: ${1};${0}
 snippet l:a
@@ -625,6 +711,8 @@ snippet op:ms
 	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})';
 snippet orp
 	orphans: ${1};${0}
+snippet or
+	order: ${0:0};
 snippet o+
 	outline: ${1:1px} ${2:solid} #${3:000};${0}
 snippet oc

From 075e97b6b6c1f981a15f7a887d7c006141fccbfc Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 31 Jan 2019 16:31:23 +0000
Subject: [PATCH 1214/1587] Inline Rust dbg! snippet

---
 snippets/rust.snippets | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index ac92748b2..7a97fdc27 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -45,8 +45,10 @@ snippet pln, "println! with format param"
 snippet fmt "format!"
 	format!("${1}{${2}}", ${3});
 snippet d "dbg! debugging macro"
-	dbg!(${1});
-
+	dbg!(${0:${VISUAL}})
+snippet d; "dbg! debugging macro statement"
+	dbg!(&${1});
+	${0}
 # Modules
 snippet ec "extern crate"
 	extern crate ${1:sync};

From 9717c7f8d5958ba1d55f478f9da05baec88074f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BCl=20Torralba=20Adsuara?= <raul.torralba@gmail.com>
Date: Tue, 19 Feb 2019 11:43:19 +0100
Subject: [PATCH 1215/1587] Added attribute with short comment snippet

---
 snippets/php.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 8c4a3e323..2828f2fbf 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -148,6 +148,12 @@ snippet doc_v
 	 * @var ${4:string}
 	 */
 	${1:var} $${2};
+
+# Class attribute with short comment
+snippet att
+	/** @var ${3:string} */
+	${1:public} $${2};
+
 # Class
 snippet doc_c
 	/**

From dd8bd92ff0b357c46390e53a1ad57db43181b586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BCl=20Torralba=20Adsuara?= <raul.torralba@gmail.com>
Date: Tue, 19 Feb 2019 11:43:59 +0100
Subject: [PATCH 1216/1587] Added temporary vim files to gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index f3d74a9a5..9989bee9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 *.pyc
 *~
+*.swo
+*.swp

From ed3d5cbf2c1b98a321006cd6d0387f19c285d460 Mon Sep 17 00:00:00 2001
From: Craig Paterson <craig@widdershins.co.za>
Date: Fri, 1 Mar 2019 14:00:39 +1100
Subject: [PATCH 1217/1587] @doc tag without interpolation

---
 snippets/elixir.snippets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 9f331b249..b27c20bdc 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -126,10 +126,14 @@ snippet doc
 	@doc """
 	${0}
 	"""
-snippet im
-	@impl true
+snippet docs
+	@doc ~S"""
+	${0}
+	"""
 snippet docf
 	@doc false
+snippet im
+	@impl true
 snippet fn
 	fn ${1:args} -> ${0} end
 snippet mdoc

From 893e6def0f146db0d264586da94e8e472b61b9b2 Mon Sep 17 00:00:00 2001
From: Craig Paterson <craig@widdershins.co.za>
Date: Fri, 1 Mar 2019 14:19:13 +1100
Subject: [PATCH 1218/1587] @moduledoc tag without interpolation

---
 snippets/elixir.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index b27c20bdc..7305a3df0 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -140,6 +140,10 @@ snippet mdoc
 	@moduledoc """
 	${0}
 	"""
+snippet mdocs
+	@moduledoc ~S"""
+	${0}
+	"""
 snippet mdocf
 	@moduledoc false
 snippet rec

From 0d7e7fad36c808b593ca602e00af4aec7516b752 Mon Sep 17 00:00:00 2001
From: Aboobacker MK <aboobackervyd@gmail.com>
Date: Fri, 1 Mar 2019 19:26:47 +0530
Subject: [PATCH 1219/1587] Bring Ruby on Rails snippets up to date (#1100)

Hash rocket to new hash syntax
Use json intead of xml
New validator syntax
---
 UltiSnips/rails.snippets | 204 +++++++++++++++++++--------------------
 1 file changed, 102 insertions(+), 102 deletions(-)

diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index 4f58aef93..ffd76613c 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -1,12 +1,12 @@
 priority -50
 
 snippet anaf "accepts_nested_attributes_for"
-accepts_nested_attributes_for :${1:association_name}${2:${3:, :allow_destroy => true}${4:, :reject_if => proc \{ |obj| ${5:obj.blank?} \}}}
+accepts_nested_attributes_for :${1:association_name}${2:${3:, allow_destroy: true}${4:, reject_if: proc \{ |obj| ${5:obj.blank?} \}}}
 
 endsnippet
 
 snippet tcbi "Create binary column"
-t.binary :${1:title}${2:, :limit => ${3:2}.megabytes}
+t.binary :${1:title}${2:, limit: ${3:2}.megabytes}
 $0
 endsnippet
 
@@ -17,7 +17,7 @@ endsnippet
 
 snippet clac "Create controller class"
 class ${1:Model}Controller < ApplicationController
-	before_filter :find_${2:model}
+	before_action :find_${2:model}
 
 	$0
 
@@ -39,7 +39,7 @@ $0
 endsnippet
 
 snippet tcd "Create decimal column"
-t.decimal :${1:title}${2:${3:, :precision => ${4:10}}${5:, :scale => ${6:2}}}
+t.decimal :${1:title}${2:${3:, precision: ${4:10}}${5:, scale: ${6:2}}}
 $0
 endsnippet
 
@@ -63,48 +63,48 @@ $0
 endsnippet
 
 snippet tcl "Create lock_version column"
-t.integer :lock_version, :null => false, :default => 0
+t.integer :lock_version, null: false, default: 0
 $0
 endsnippet
 
 # FIXME: handling literal bracket pair inside of nested tab groups?
 snippet tcr "Create references column"
-t.references :${1:taggable}${2:, :polymorphic => ${3:{ :default => '${4:Photo}' \}}}
+t.references :${1:taggable}${2:, polymorphic ${3:{ :default: '${4:Photo}' \}}}
 $0
 endsnippet
 
 snippet resources "Create resources controller class"
 class ${1:Model}sController < ApplicationController
-	before_filter :find_${1/./\l$0/}, :only => [:show, :edit, :update, :destroy]
+	before_action :find_${1/./\l$0/}, only: [:show, :edit, :update, :destroy]
 
 	# GET /${1/./\l$0/}s
-	# GET /${1/./\l$0/}s.xml
+	# GET /${1/./\l$0/}s.json
 	def index
 		@${1/./\l$0/}s = ${1:Model}.all
 
 		respond_to do |wants|
 			wants.html # index.html.erb
-			wants.xml  { render :xml => @${1/./\l$0/}s }
+			wants.json  { render json: @${1/./\l$0/}s }
 		end
 	end
 
 	# GET /${1/./\l$0/}s/1
-	# GET /${1/./\l$0/}s/1.xml
+	# GET /${1/./\l$0/}s/1.json
 	def show
 		respond_to do |wants|
 			wants.html # show.html.erb
-			wants.xml  { render :xml => @${1/./\l$0/} }
+			wants.json  { render json: @${1/./\l$0/} }
 		end
 	end
 
 	# GET /${1/./\l$0/}s/new
-	# GET /${1/./\l$0/}s/new.xml
+	# GET /${1/./\l$0/}s/new.json
 	def new
 		@${1/./\l$0/} = ${1:Model}.new
 
 		respond_to do |wants|
 			wants.html # new.html.erb
-			wants.xml  { render :xml => @${1/./\l$0/} }
+			wants.json  { render json: @${1/./\l$0/} }
 		end
 	end
 
@@ -113,7 +113,7 @@ class ${1:Model}sController < ApplicationController
 	end
 
 	# POST /${1/./\l$0/}s
-	# POST /${1/./\l$0/}s.xml
+	# POST /${1/./\l$0/}s.json
 	def create
 		@${1/./\l$0/} = ${1:Model}.new(params[:${1/./\l$0/}])
 
@@ -121,37 +121,37 @@ class ${1:Model}sController < ApplicationController
 			if @${1/./\l$0/}.save
 				flash[:notice] = '${1:Model} was successfully created.'
 				wants.html { redirect_to(@${1/./\l$0/}) }
-				wants.xml  { render :xml => @${1/./\l$0/}, :status => :created, :location => @${1/./\l$0/} }
+				wants.json  { render json: @${1/./\l$0/}, status: :created, location: @${1/./\l$0/} }
 			else
-				wants.html { render :action => "new" }
-				wants.xml  { render :xml => @${1/./\l$0/}.errors, :status => :unprocessable_entity }
+				wants.html { render action: "new" }
+				wants.json  { render json: @${1/./\l$0/}.errors, status: :unprocessable_entity }
 			end
 		end
 	end
 
 	# PUT /${1/./\l$0/}s/1
-	# PUT /${1/./\l$0/}s/1.xml
+	# PUT /${1/./\l$0/}s/1.json
 	def update
 		respond_to do |wants|
 			if @${1/./\l$0/}.update(params[:${1/./\l$0/}])
 				flash[:notice] = '${1:Model} was successfully updated.'
 				wants.html { redirect_to(@${1/./\l$0/}) }
-				wants.xml  { head :ok }
+				wants.json  { head :ok }
 			else
-				wants.html { render :action => "edit" }
-				wants.xml  { render :xml => @${1/./\l$0/}.errors, :status => :unprocessable_entity }
+				wants.html { render action: "edit" }
+				wants.json  { render json: @${1/./\l$0/}.errors, status: :unprocessable_entity }
 			end
 		end
 	end
 
 	# DELETE /${1/./\l$0/}s/1
-	# DELETE /${1/./\l$0/}s/1.xml
+	# DELETE /${1/./\l$0/}s/1.json
 	def destroy
 		@${1/./\l$0/}.destroy
 
 		respond_to do |wants|
 			wants.html { redirect_to(${1/./\l$0/}s_url) }
-			wants.xml  { head :ok }
+			wants.json  { head :ok }
 		end
 	end
 
@@ -217,7 +217,7 @@ $0
 endsnippet
 
 snippet art "Test Assert Redirected To (art)"
-assert_redirected_to ${2::action => "${1:index}"}
+assert_redirected_to ${2:action: "${1:index}"}
 endsnippet
 
 snippet asre "Test Assert Response (are)"
@@ -290,7 +290,7 @@ assert_rjs :${1:replace}, ${2:"${3:dom id}"}
 endsnippet
 
 snippet ass "assert_select"
-assert_select '${1:path}'${2:, :${3:text} => ${4:'${5:inner_html}'}}${6: do
+assert_select '${1:path}'${2:, ${3:text}: ${4:'${5:inner_html}'}}${6: do
 	$0
 end}
 endsnippet
@@ -324,7 +324,7 @@ before_validation_on_update
 endsnippet
 
 snippet bt "belongs_to (bt)"
-belongs_to :${1:object}${2:, :class_name => "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key => "${4:$1_id}"}
+belongs_to :${1:object}${2:, class_name: "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", foreign_key: "${4:$1_id}"}
 endsnippet
 
 snippet crw "cattr_accessor"
@@ -339,10 +339,10 @@ def create
 		if @$1.save
 			flash[:notice] = '$2 was successfully created.'
 			wants.html { redirect_to(@$1) }
-			wants.xml { render :xml => @$1, :status => :created, :location => @$1 }
+			wants.json { render json: @$1, status: :created, location: @$1 }
 		else
-			wants.html { render :action => "new" }
-			wants.xml { render :xml => @$1.errors, :status => :unprocessable_entity }
+			wants.html { render action: "new" }
+			wants.json { render json: @$1.errors, status: :unprocessable_entity }
 		end
 	end
 end
@@ -358,7 +358,7 @@ endsnippet
 snippet deftg "def get request"
 def test_should_get_${1:action}
 	${2:@${3:model} = ${4:$3s}(:${5:fixture_name})
-	}get :$1${6:, :id => @$3.to_param}
+	}get :$1${6:, id: @$3.to_param}
 	assert_response :success
 	$0
 end
@@ -367,18 +367,18 @@ endsnippet
 snippet deftp "def post request"
 def test_should_post_${1:action}
 	${3:@$2 = ${4:$2s}(:${5:fixture_name})
-	}post :$1${6:, :id => @$2.to_param}, :${2:model} => { $0 }
+	}post :$1${6:, id: @$2.to_param}, ${2:model}: { $0 }
 	assert_response :redirect
 
 end
 endsnippet
 
 snippet fina "find(:all)"
-find(:all${1:, :conditions => ['${2:${3:field} = ?}', ${5:true}]})
+find(:all${1:, conditions: ['${2:${3:field} = ?}', ${5:true}]})
 endsnippet
 
 snippet finf "find(:first)"
-find(:first${1:, :conditions => ['${2:${3:field} = ?}', ${5:true}]})
+find(:first${1:, conditions: ['${2:${3:field} = ?}', ${5:true}]})
 endsnippet
 
 snippet fini "find(id)"
@@ -386,13 +386,13 @@ find(${1:id})
 endsnippet
 
 snippet fine "find_each"
-find_each(${1::conditions => {:${2:field} => ${3:true}\}}) do |${4:${TM_CURRENT_WORD/(\w+)\./\L$1/g}}|
+find_each(${1conditions: {:${2:field}: ${3:true}\}}) do |${4:${TM_CURRENT_WORD/(\w+)\./\L$1/g}}|
 	$0
 end
 endsnippet
 
 snippet finb "find_in_batches"
-find_in_batches(${1::conditions => {:${2:field} => ${3:true}\}}) do |${4:${TM_CURRENT_WORD/(\w+)\./\L$1/g}}s|
+find_in_batches(${1conditions: {:${2:field}: ${3:true}\}}) do |${4:${TM_CURRENT_WORD/(\w+)\./\L$1/g}}s|
 	$4s.each do |$4|
 		$0
 	end
@@ -400,23 +400,23 @@ end
 endsnippet
 
 snippet habtm "has_and_belongs_to_many (habtm)"
-has_and_belongs_to_many :${1:object}${2:, :join_table => "${3:table_name}", :foreign_key => "${4:$1_id}"}
+has_and_belongs_to_many :${1:object}${2:, join_table: "${3:table_name}", foreign_key: "${4:$1_id}"}
 endsnippet
 
 snippet hm "has_many (hm)"
-has_many :${1:object}s${2:, :class_name => "$1", :foreign_key => "${4:reference}_id"}
+has_many :${1:object}s${2:, class_name: "$1", foreign_key: "${4:reference}_id"}
 endsnippet
 
 snippet hmt "has_many (through)"
-has_many :${1:objects}, :through => :${2:join_association}${3:, :source => :${4:$2_table_foreign_key_to_$1_table}}
+has_many :${1:objects}, through: :${2:join_association}${3:, source: :${4:$2_table_foreign_key_to_$1_table}}
 endsnippet
 
-snippet hmd "has_many :dependent => :destroy"
-has_many :${1:object}s${2:, :class_name => "$1", :foreign_key => "${4:reference}_id"}, :dependent => :destroy$0
+snippet hmd "has_many dependent: :destroy"
+has_many :${1:object}s${2:, class_name: "$1", foreign_key: "${4:reference}_id"}, dependent: :destroy$0
 endsnippet
 
 snippet ho "has_one (ho)"
-has_one :${1:object}${2:, :class_name => "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key => "${4:$1_id}"}
+has_one :${1:object}${2:, class_name: "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", foreign_key: "${4:$1_id}"}
 endsnippet
 
 snippet logd "logger.debug"
@@ -444,7 +444,7 @@ map(&:${1:id})
 endsnippet
 
 snippet mapca "map.catch_all"
-${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"
+${1:map}.catch_all "*${2:anything}", controller: "${3:default}", action: "${4:error}"
 
 endsnippet
 
@@ -465,7 +465,7 @@ end}
 endsnippet
 
 snippet mapwo "map.with_options"
-${1:map}.with_options :${2:controller} => '${3:thing}' do |${4:$3}|
+${1map}.with_options :${2:controller}: '${3:thing}' do |${4:$3}|
 	$0
 end
 
@@ -476,12 +476,12 @@ mattr_accessor :${0:attr_names}
 endsnippet
 
 snippet ncl "named_scope lambda"
-named_scope :name, lambda { |${1:param}| { :conditions => ${3:['${4:${5:field} = ?}', ${6:$1}]} } }
+named_scope :name, lambda { |${1param}| { :conditions: ${3:['${4:${5:field} = ?}', ${6:$1}]} } }
 
 endsnippet
 
 snippet nc "named_scope"
-named_scope :name${1:, :joins => :${2:table}}, :conditions => ${3:['${4:${5:field} = ?}', ${6:true}]}
+named_scope :name${1:, joins: :${2:table}}, conditions: ${3:['${4:${5:field} = ?}', ${6:true}]}
 
 endsnippet
 
@@ -494,23 +494,23 @@ flash[:${1:notice}] = "${2:Successfully created...}"$0
 endsnippet
 
 snippet rea "redirect_to (action)"
-redirect_to :action => "${1:index}"
+redirect_to action: "${1:index}"
 endsnippet
 
 snippet reai "redirect_to (action, id)"
-redirect_to :action => "${1:show}", :id => ${0:@item}
+redirect_to action: "${1:show}", id: ${0:@item}
 endsnippet
 
 snippet rec "redirect_to (controller)"
-redirect_to :controller => "${1:items}"
+redirect_to controller: "${1:items}"
 endsnippet
 
 snippet reca "redirect_to (controller, action)"
-redirect_to :controller => "${1:items}", :action => "${2:list}"
+redirect_to controller: "${1:items}", action: "${2:list}"
 endsnippet
 
 snippet recai "redirect_to (controller, action, id)"
-redirect_to :controller => "${1:items}", :action => "${2:show}", :id => ${0:@item}
+redirect_to controller: "${1:items}", action: "${2:show}", id: ${0:@item}
 endsnippet
 
 snippet renpp "redirect_to (nested path plural)"
@@ -534,59 +534,59 @@ redirect_to :back
 endsnippet
 
 snippet ra "render (action)... (ra)"
-render :action => "${1:action}"
+render action: "${1:action}"
 endsnippet
 
 snippet ral "render (action,layout) (ral)"
-render :action => "${1:action}", :layout => "${2:layoutname}"
+render action: "${1:action}", layout: "${2:layoutname}"
 endsnippet
 
 snippet rf "render (file) (rf)"
-render :file => "${1:filepath}"
+render file: "${1:filepath}"
 endsnippet
 
 snippet rfu "render (file,use_full_path) (rfu)"
-render :file => "${1:filepath}", :use_full_path => ${2:false}
+render file: "${1:filepath}", use_full_path: ${2:false}
 endsnippet
 
 snippet ri "render (inline) (ri)"
-render :inline => "${1:<%= 'hello' %>}"
+render inline: "${1:<%= 'hello' %>}"
 endsnippet
 
 snippet ril "render (inline,locals) (ril)"
-render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"$4 }
+render inline: "${1:<%= 'hello' %>}", locals { ${2::name}: "${3:value}"$4 }
 endsnippet
 
 snippet rit "render (inline,type) (rit)"
-render :inline => "${1:<%= 'hello' %>}", :type => ${2::rxml}
+render inline: "${1:<%= 'hello' %>}", type: ${2::rjson}
 endsnippet
 
 snippet rl "render (layout) (rl)"
-render :layout => "${1:layoutname}"
+render layout: "${1:layoutname}"
 endsnippet
 
 snippet rn "render (nothing) (rn)"
-render :nothing => ${1:true}
+render nothing: ${1:true}
 endsnippet
 
 snippet rns "render (nothing,status) (rns)"
-render :nothing => ${1:true}, :status => ${2:401}
+render nothing: ${1:true}, status: ${2:401}
 endsnippet
 
 snippet rt "render (text) (rt)"
-render :text => "${1:text to render...}"
+render text: "${1:text to render...}"
 endsnippet
 
 snippet rtl "render (text,layout) (rtl)"
-render :text => "${1:text to render...}", :layout => "${2:layoutname}"
+render text: "${1:text to render...}", layout: "${2:layoutname}"
 endsnippet
 
 snippet rtlt "render (text,layout => true) (rtlt)"
-render :text => "${1:text to render...}", :layout => ${2:true}
+render text: "${1:text to render...}", layout: ${2:true}
 endsnippet
 
 snippet rts "render (text,status) (rts)"
-render :text => "${1:text to render...}", :status => ${2:401}
+render text: "${1:text to render...}", status: ${2:401}
 endsnippet
 
 snippet ru "render (update)"
@@ -615,7 +615,7 @@ end
 endsnippet
 
 snippet t. "t.binary (tcbi)"
-t.binary :${1:title}${2:, :limit => ${3:2}.megabytes}
+t.binary :${1:title}${2:, limit: ${3:2}.megabytes}
 t.$0
 endsnippet
 
@@ -635,7 +635,7 @@ t.$0
 endsnippet
 
 snippet t. "t.decimal (tcd)"
-t.decimal :${1:title}${2:${3:, :precision => ${4:10}}${5:, :scale => ${6:2}}}
+t.decimal :${1:title}${2:${3:, precision: ${4:10}}${5:, scale: ${6:2}}}
 t.$0
 endsnippet
 
@@ -650,12 +650,12 @@ t.$0
 endsnippet
 
 snippet t. "t.lock_version (tcl)"
-t.integer :lock_version, :null => false, :default => 0
+t.integer :lock_version, null: false, default: 0
 t.$0
 endsnippet
 
 snippet t. "t.references (tcr)"
-t.references :${1:taggable}${2:, :polymorphic => ${3:{ :default => '${4:Photo}' \}}}
+t.references :${1:taggable}${2:, polymorphic ${3:{ :default: '${4:Photo}' \}}}
 t.$0
 endsnippet
 
@@ -690,113 +690,113 @@ t.$0
 endsnippet
 
 snippet vaoif "validates_acceptance_of if"
-validates_acceptance_of :${1:terms}${2:${3:, :accept => "${4:1}"}${5:, :message => "${6:You must accept the terms of service}"}}, :if => proc { |obj| ${7:obj.condition?} }}
+validates_acceptance_of :${1:terms}${2:${3:, accept: "${4:1}"}${5:, message: "${6:You must accept the terms of service}"}}, if: proc { |obj| ${7:obj.condition?} }}
 endsnippet
 
 snippet vao "validates_acceptance_of"
-validates_acceptance_of :${1:terms}${2:${3:, :accept => "${4:1}"}${5:, :message => "${6:You must accept the terms of service}"}}
+validates :${1:terms}${2:, acceptance: ${3:{ accept: "${4:1}"${5:, message: "${6:You must accept the terms of service}"}}} }
 endsnippet
 
 snippet va "validates_associated (va)"
-validates_associated :${1:attribute}${2:, :on => :${3:create}}
+validates_associated :${1:attribute}${2:, on: :${3:create}}
 endsnippet
 
 snippet vaif "validates_associated if (vaif)"
-validates_associated :${1:attribute}${2:, :on => :${3:create}, :if => proc { |obj| ${5:obj.condition?} }}
+validates_associated :${1:attribute}${2:, on: :${3:create}, if: proc { |obj| ${5:obj.condition?} }}
 endsnippet
 
 snippet vc "validates_confirmation_of (vc)"
-validates_confirmation_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:should match confirmation}"}
+validates_confirmation_of :${1:attribute}${2:, on: :${3:create}, message: "${4:should match confirmation}"}
 endsnippet
 
 snippet vcif "validates_confirmation_of if (vcif)"
-validates_confirmation_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:should match confirmation}", :if => proc { |obj| ${5:obj.condition?} }}
+validates_confirmation_of :${1:attribute}${2:, on: :${3:create}, message: "${4:should match confirmation}", if: proc { |obj| ${5:obj.condition?} }}
 endsnippet
 
 snippet ve "validates_exclusion_of (ve)"
-validates_exclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not allowed}"}
+validates_exclusion_of :${1:attribute}${2:, in: ${3:%w( ${4:mov avi} )}, on: :${5:create}, message: "${6:extension %s is not allowed}"}
 endsnippet
 
 snippet veif "validates_exclusion_of if (veif)"
-validates_exclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not allowed}"}, :if => proc { |obj| ${7:obj.condition?} }}
+validates_exclusion_of :${1:attribute}${2:, in: ${3:%w( ${4:mov avi} )}, on: :${5:create}, message: "${6:extension %s is not allowed}"}, if: proc { |obj| ${7:obj.condition?} }}
 endsnippet
 
 snippet vfif "validates_format_of if"
-validates_format_of :${1:attribute}, :with => /${2:^[${3:\w\d}]+\$}/${4:, :on => :${5:create}, :message => "${6:is invalid}"}, :if => proc { |obj| ${7:obj.condition?} }}
+validates_format_of :${1:attribute}, with: /${2:^[${3:\w\d}]+\$}/${4:, on: :${5:create}, message: "${6:is invalid}"}, if: proc { |obj| ${7:obj.condition?} }}
 endsnippet
 
 snippet vf "validates_format_of"
-validates_format_of :${1:attribute}, :with => /${2:^[${3:\w\d}]+\$}/${4:, :on => :${5:create}, :message => "${6:is invalid}"}
+validates_format_of :${1:attribute}, with: /${2:^[${3:\w\d}]+\$}/${4:, on: :${5:create}, message: "${6:is invalid}"}
 endsnippet
 
 snippet viif "validates_inclusion_of if"
-validates_inclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not included in the list}"}, :if => proc { |obj| ${7:obj.condition?} }}
+validates_inclusion_of :${1:attribute}${2:, in: ${3:%w( ${4:mov avi} )}, on: :${5:create}, message: "${6:extension %s is not included in the list}"}, if: proc { |obj| ${7:obj.condition?} }}
 endsnippet
 
 snippet vi "validates_inclusion_of"
-validates_inclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not included in the list}"}
+validates_inclusion_of :${1:attribute}${2:, in: ${3:%w( ${4:mov avi} )}, on: :${5:create}, message: "${6:extension %s is not included in the list}"}
 endsnippet
 
 snippet vl "validates_length_of (vl)"
-validates_length_of :${1:attribute}, :within => ${2:3..20}${3:, :on => :${4:create}, :message => "${5:must be present}"}
+validates_length_of :${1:attribute}, within: ${2:3..20}${3:, on: :${4:create}, message: "${5:must be present}"}
 endsnippet
 
 snippet vlif "validates_length_of if"
-validates_length_of :${1:attribute}, :within => ${2:3..20}${3:, :on => :${4:create}, :message => "${5:must be present}"}, :if => proc { |obj| ${6:obj.condition?} }}
+validates_length_of :${1:attribute}, within: ${2:3..20}${3:, on: :${4:create}, message: "${5:must be present}"}, if: proc { |obj| ${6:obj.condition?} }}
 endsnippet
 
 snippet vnif "validates_numericality_of if"
-validates_numericality_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:is not a number}"}, :if => proc { |obj| ${5:obj.condition?} }}
+validates_numericality_of :${1:attribute}${2:, on: :${3:create}, message: "${4:is not a number}"}, if: proc { |obj| ${5:obj.condition?} }}
 endsnippet
 
 snippet vn "validates_numericality_of"
-validates_numericality_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:is not a number}"}
+validates_numericality_of :${1:attribute}${2:, on: :${3:create}, message: "${4:is not a number}"}
 endsnippet
 
 snippet vp "validates_presence_of (vp)"
-validates_presence_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:can't be blank}"}
+validates_presence_of :${1:attribute}${2:, on: :${3:create}, message: "${4:can't be blank}"}
 endsnippet
 
 snippet vpif "validates_presence_of if (vpif) 2"
-validates_presence_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:can't be blank}"}, :if => proc { |obj| ${5:obj.condition?} }}
+validates_presence_of :${1:attribute}${2:, on: :${3:create}, message: "${4:can't be blank}"}, if: proc { |obj| ${5:obj.condition?} }}
 endsnippet
 
 snippet vu "validates_uniqueness_of (vu)"
-validates_uniqueness_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:must be unique}"}
+validates_uniqueness_of :${1:attribute}${2:, on: :${3:create}, message: "${4:must be unique}"}
 endsnippet
 
 snippet vuif "validates_uniqueness_of if (vuif)"
-validates_uniqueness_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:must be unique}", :if => proc { |obj| ${6:obj.condition?} }}
+validates_uniqueness_of :${1:attribute}${2:, on: :${3:create}, message: "${4:must be unique}", if: proc { |obj| ${6:obj.condition?} }}
 endsnippet
 
 snippet verify "verify -- render"
-verify :only => [:$1], :method => :post, :render => {:status => 500, :text => "use HTTP-POST"}
+verify only: [:$1], method: :post, render {:status: 500, text: "use HTTP-POST"}
 
 endsnippet
 
 snippet verify "verify -- redirect"
-verify :only => [:$1], :session => :user, :params => :id, :redirect_to => {:action => '${2:index}'}
+verify only: [:$1], session: :user, params: :id, redirect_to {:action: '${2:index}'}
 
 endsnippet
 
 snippet wants "wants_format"
-wants.${1:js|xml|html}${2: { $0 \}}
+wants.${1:js|json|html}${2: { $0 \}}
 endsnippet
 
 snippet xdelete "xhr delete"
-xhr :delete, :${1:destroy}, :id => ${2:1}$0
+xhr :delete, :${1:destroy}, id: ${2:1}$0
 endsnippet
 
 snippet xget "xhr get"
-xhr :get, :${1:show}${2:, :id => ${3:1}}$0
+xhr :get, :${1:show}${2:, id: ${3:1}}$0
 endsnippet
 
 snippet xpost "xhr post"
-xhr :post, :${1:create}, :${2:object} => { $3 }
+xhr :post, :${1:create}, ${2:object}: { $3 }
 endsnippet
 
 snippet xput "xhr put"
-xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { $4 }$0
+xhr :put, :${1:update}, id: ${2:1}, ${3:object}: { $4 }$0
 endsnippet
 
 snippet sweeper "Create sweeper class"
@@ -835,15 +835,15 @@ format.${1:html|xml|json|js|any} { $0 }
 endsnippet
 
 snippet gem "gem"
-gem '${1:name}'${2:${3:, "${4:1.0}"}${5:${6:, :require => ${7:"${8:$1}"}}${9:, :group => :${10:test}}}}
+gem '${1:name}'${2:${3:, "${4:1.0}"}${5:${6:, require: ${7:"${8:$1}"}}${9:, group: :${10:test}}}}
 endsnippet
 
 snippet gemg "gem :git"
-gem '${1:paperclip}', :git => "${2:git://github.com/thoughtbot/paperclip.git}"${3:, :branch => "${4:rails3}"}
+gem '${1:paperclip}', git: "${2:git://github.com/thoughtbot/paperclip.git}"${3:, branch: "${4:rails3}"}
 endsnippet
 
 snippet match "match"
-match '${1:${2::controller}${3:/${4::action}${5:/${6::id}${7:(.:format)}}}}'${8: => '${9:$2}#${10:$4}'${11:, :as => :${12:$10}}}
+match '${1:${2::controller}${3:/${4::action}${5:/${6::id}${7:(.:format)}}}}'${8: '${9:$2}#${10:$4}'${11:, as: :${12:$10}}}
 endsnippet
 
 snippet member "member routes"
@@ -862,15 +862,15 @@ end}
 endsnippet
 
 snippet scope "scope"
-scope :${1:name}, ${2:joins(:${3:table}).}where(${4:'${5:$3.${6:field}} = ?', ${7:'${8:value}'}})
+scope :${1:name}, { ${2:joins(:${3:table}).}where(${4:'${5:$3.${6:field}} = ?', ${7:'${8:value}'}}) }
 endsnippet
 
 snippet scopel "scope lambda"
-scope :${1:name}, lambda { |${2:param}| ${3:where(${4::${5:field} => ${6:"${7:value}"}})} }
+scope :${1:name}, lambda { |${2:param}| ${3:where(${4::${5:field}: ${6:"${7:value}"}})} }
 endsnippet
 
 snippet scopee "scope with extension"
-scope :${1:name}, ${2:where(${3::${4:field} => ${5:'${6:value}'}})} do
+scope :${1:name}, { ${2:where(${3::${4:field}: ${5:'${6:value}'}})} } do
 	def ${7:method_name}
 		$0
 	end
@@ -888,7 +888,7 @@ end
 endsnippet
 
 snippet trans "Translation snippet"
-I18n.t('`!v substitute(substitute(substitute(@%, substitute(getcwd() . "/", "\/", "\\\\/", "g"), "", ""), "\\(\\.\\(html\\|js\\)\\.\\(haml\\|erb\\)\\|\\(_controller\\)\\?\\.rb\\)$", "", ""), "/", ".", "g")`.${2:${1/[^\w]/_/g}}$3', :default => "${1:some_text}"$4)${5:$0}
+I18n.t('`!v substitute(substitute(substitute(@%, substitute(getcwd() . "/", "\/", "\\\\/", "g"), "", ""), "\\(\\.\\(html\\|js\\)\\.\\(haml\\|erb\\)\\|\\(_controller\\)\\?\\.rb\\)$", "", ""), "/", ".", "g")`.${2:${1/[^\w]/_/g}}$3', default: "${1:some_text}"$4)${5:$0}
 endsnippet
 
 snippet route_spec

From 019f232e2d0bc37c1f6fd8b9b9486dfd0687213f Mon Sep 17 00:00:00 2001
From: Craig <craig@widdershins.co.za>
Date: Tue, 5 Mar 2019 00:15:27 +1100
Subject: [PATCH 1220/1587] Elixir word and atom lists (#1114)

---
 snippets/elixir.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 7305a3df0..64b63f6e5 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -245,3 +245,7 @@ snippet impl
 	def ${1:name} do
 		${0}
 	end
+snippet wl word list
+	~w(${0})
+snippet al atom list
+	~w(${0})a

From 1bb2d5a596c0f6207b1a32577769b2f3a1f6a7f3 Mon Sep 17 00:00:00 2001
From: Florian Heiderich <florian@heiderich.org>
Date: Sun, 10 Mar 2019 17:23:28 +0100
Subject: [PATCH 1221/1587] remove space

between "\\emph{${1:${VISUAL:text}}}" and "${0}"
---
 snippets/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 49d3104f1..79e70628d 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -212,7 +212,7 @@ snippet under underline text
 snippet over overline text
 	\\overline{${1:${VISUAL:text}}} ${0}
 snippet emp emphasize text
-	\\emph{${1:${VISUAL:text}}} ${0}
+	\\emph{${1:${VISUAL:text}}}${0}
 snippet sc small caps text
 	\\textsc{${1:${VISUAL:text}}} ${0}
 #Choosing font

From c65ed0e77783c8076630bdf4e481ac26d3eab5ac Mon Sep 17 00:00:00 2001
From: Seth Gower <sdg7234@rit.edu>
Date: Mon, 11 Mar 2019 02:20:12 -0400
Subject: [PATCH 1222/1587] adds header snippets to the c snippets

---
 UltiSnips/c.snippets | 50 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 6851a2728..8a13174f1 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -96,4 +96,54 @@ snippet fund "function declaration" b
 ${1:void} ${2:function_name}($3);
 endsnippet
 
+global !p
+def split_line(text):
+	import textwrap
+	lines = textwrap.wrap(text, 78 - 19)
+	output = list()
+	for line in lines:
+		output.append('*' + ' '*19 + line)
+	snip_line = snip.tabstops[4].end[0]
+	snip.buffer.append(output, snip_line + 1)
+	del snip.buffer[snip_line]
+
+def get_args(arglist):
+	args = [arg.strip() for arg in arglist.split(',') if arg]
+	return args
+endglobal
+
+post_jump "if snip.tabstop == 0 : split_line(snip.tabstops[4].current_text)"
+snippet head "File Header" b
+/******************************************************************************
+* File:             `!p snip.rv = fn`
+*
+* Author:           ${2:`git config --get user.name`}  
+* Created:          `date +%m/%d/%y` 
+* Description:      ${4:I need a really long default here so I don't have to type so much !}
+*****************************************************************************/
+${0}
+endsnippet
+
+post_jump "if snip.tabstop == 0 : split_line(snip.tabstops[4].current_text)"
+snippet func "Function Header" 
+/******************************************************************************
+* Function:         $1
+* Description:      ${4:I need a really long default here so I don't have to type so much !}
+* Where:`!p 
+snip.rv = ""
+snip >> 2
+
+args = get_args(t[2])
+if args:
+	for arg in args:
+		snip.rv += '\n' + '*' + ' '*19 + arg + ' - TODO'
+snip << 2
+`
+* Return:           $5
+* Error:            $6
+*****************************************************************************/
+${1}($2){
+${0}
+}
+endsnippet
 # vim:ft=snippets:

From db119721084315cc5609d4a43b1f20b351a6bae3 Mon Sep 17 00:00:00 2001
From: Seth Gower <sdg7234@rit.edu>
Date: Mon, 11 Mar 2019 13:02:11 -0400
Subject: [PATCH 1223/1587] makes requested changes to placeholders

---
 UltiSnips/c.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index 8a13174f1..b86e23f8b 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -117,9 +117,9 @@ snippet head "File Header" b
 /******************************************************************************
 * File:             `!p snip.rv = fn`
 *
-* Author:           ${2:`git config --get user.name`}  
+* Author:           ${2}  
 * Created:          `date +%m/%d/%y` 
-* Description:      ${4:I need a really long default here so I don't have to type so much !}
+* Description:      ${4:${VISUAL}}
 *****************************************************************************/
 ${0}
 endsnippet
@@ -128,7 +128,7 @@ post_jump "if snip.tabstop == 0 : split_line(snip.tabstops[4].current_text)"
 snippet func "Function Header" 
 /******************************************************************************
 * Function:         $1
-* Description:      ${4:I need a really long default here so I don't have to type so much !}
+* Description:      ${4:${VISUAL}}
 * Where:`!p 
 snip.rv = ""
 snip >> 2

From 08f95628717ebca76e60643e76a84904a4520051 Mon Sep 17 00:00:00 2001
From: Seth Gower <sdg7234@rit.edu>
Date: Mon, 11 Mar 2019 13:03:39 -0400
Subject: [PATCH 1224/1587] fixes indent

---
 UltiSnips/c.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index b86e23f8b..e1eb81c2c 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -143,7 +143,7 @@ snip << 2
 * Error:            $6
 *****************************************************************************/
 ${1}($2){
-${0}
+	${0}
 }
 endsnippet
 # vim:ft=snippets:

From 1b5f7939fefbe1d53e444f011ff8458d126fba5d Mon Sep 17 00:00:00 2001
From: Montalvo Miguelo <montalvomiguelo@users.noreply.github.com>
Date: Mon, 18 Mar 2019 15:00:42 -0600
Subject: [PATCH 1225/1587] Vue tabstops (#1117)

* Fix whitespace

* Update 'vimport:c' snippet

* Update 'vactions' snippet

* Update 'vbase' snippet

* Update 'vanim:js:el' snippet

* Update 'vanim:js:method' snippet

* Update 'vcl' snippet

* Update 'vdata' snippet

* Update 'vfilter' snippet

* Update 'vfor' snippet

* Update 'vgetters' snippet

* Update 'vimport' snippet

* Update 'vkeep' snippet

* Update 'vmixin' snippet

* Update 'vmutations' snippet

* Update 'vprops:d' snippet

* Update 'vprops' snippet

* Fix spacing

* Add 'vstore' snippet
---
 snippets/vue.snippets | 181 ++++++++++++++++++++----------------------
 1 file changed, 88 insertions(+), 93 deletions(-)

diff --git a/snippets/vue.snippets b/snippets/vue.snippets
index 53e7cce9e..0f14caecd 100644
--- a/snippets/vue.snippets
+++ b/snippets/vue.snippets
@@ -1,8 +1,8 @@
 # This snippet file enables vue files to use tabs for html, js and css. It also
-# includes some vue-specific html-like snippets, as well as some general 
+# includes some vue-specific html-like snippets, as well as some general
 # boilerplate code for vue.
 
-extends html, javascript, css 
+extends html, javascript, css
 
 # These snippets form a port of Sarah Drasner's vue-sublime-snippets
 
@@ -14,7 +14,7 @@ snippet slot
 snippet template
 	<template></template>
 
-snippet transition 
+snippet transition
 	<transition></transition>
 
 # The following snippets create more complex boilerplate code.
@@ -28,156 +28,151 @@ snippet vbase
 
 	<script>
 		export default{
-
+			${0}
 		}
 	</script>
+
 	<style scoped>
 
 	</style>
+
 snippet vimport:c
-	import New from './components/New.vue';
+	import ${1:Name} from './components/$1.vue';
 
-	export default{
+	export default {
 		components: {
-			appNew: New 
+			$1
 		}
 	}
 
-snippet vactionsis now
-
+snippet vactions
 	actions: {
-		updateValue({commit}, payload) {
-			commit(updateValue, payload);
+		${1:updateValue}({commit}, ${2:payload}) {
+			commit($1, $2);
 		}
 	}
 
 # Add in js animation hooks
-snippet vanim:js:el 
-	<transition 
+snippet vanim:js:el
+	<transition
 	  @before-enter="beforeEnter"
 	  @enter="enter"
 	  @after-enter="afterEnter"
 	  @enter-cancelled="enterCancelled"
+
 	  @before-Leave="beforeLeave"
 	  @leave="leave"
 	  @after-leave="afterLeave"
 	  @leave-cancelled="leaveCancelled"
 	  :css="false">
-	 
+
 	 </transition>
-	 
+
 snippet vanim:js:method
 	methods: {
-	  beforeEnter(el) {
-		console.log('beforeEnter');
-	  }, 
-	  enter(el, done) {
-		 console.log('enter');
-		 done();
-	  },
-	  afterEnter(el) {
-		console.log('afterEnter');
-	  }, 
-	  enterCancelled(el, done) {
-		 console.log('enterCancelled');
-	  },
-	  beforeLeave(el) {
-		console.log('beforeLeave');
-	  }, 
-	  leave(el, done) {
-		 console.log('leave');
-		 done();
-	  },
-	  afterLeave(el) {
-		console.log('afterLeave');
-	  }, 
-	  leaveCancelled(el, done) {
-		 console.log('leaveCancelled');
-	  }
+		beforeEnter(el) {
+			console.log('beforeEnter');
+		},
+		enter(el, done) {
+			console.log('enter');
+			done();
+		},
+		afterEnter(el) {
+			console.log('afterEnter');
+		},
+		enterCancelled(el, done) {
+			console.log('enterCancelled');
+		},
+		beforeLeave(el) {
+			console.log('beforeLeave');
+		},
+		leave(el, done) {
+			console.log('leave');
+			done();
+		},
+		afterLeave(el) {
+			console.log('afterLeave');
+		},
+		leaveCancelled(el, done) {
+			console.log('leaveCancelled');
+		}
 	}
 
-snippet vcl 
-	@click=""
+snippet vcl
+	@click="${1}"
 
 snippet vdata
-	data: function () {
-	  return {
-		key: value
-	  };
+	data() {
+		return {
+			${1:key}: ${2:value}
+		};
 	}
 
 snippet vfilter
 	filters: {
-	  fnName: function (v) {
-		return;
-	  }
+		${1:fnName}: function(${2:value}) {
+			return;
+		}
 	}
 
 snippet vfor
-	<div v-for="item in items" :key="item.id">
-	  {{ item }}
+	<div v-for="${1:item} in ${2:items}" :key="$1.id">
+		{{ $1 }}
 	</div
 
 snippet vgetters
 	getters: {
-		value: state => {
-			return state.value;
+		${1:value}: state => {
+			return state.$1;
 		}
 	}
 
-snippet vimport 
-	import New from './components/New.vue';
+snippet vimport
+	import ${1:New} from './components/$1.vue';
 
 snippet vkeep
 	<keep-alive>
-	  <component :is="">
-		<p>default</p>
-	  </component>
+		<component :is="">
+			<p>default</p>
+		</component>
 	</keep-alive>
 
 snippet vmixin
-	// define a mixin object
-	var myMixin = {
-	  created: function () {
-		this.hello()
-	  },
-	  methods: {
-		hello: function () {
-		  console.log('hello from mixin!')
-		}
-	  }
+	const ${1:mixinName} = {
+		mounted() {
+			console.log('hello from mixin!')
+		},
 	}
-	// define a component that uses this mixin
-	var Component = Vue.extend({
-	  mixins: [myMixin]
+	const ${2:Component} = Vue.extend({
+		mixins: [$1]
 	})
-	var component = new Component() // -> "hello from mixin!"
 
 snippet vmutations
-	// define a mixin object
-	var myMixin = {
-	  created: function () {
-		this.hello()
-	  },
-	  methods: {
-		hello: function () {
-		  console.log('hello from mixin!')
+	mutations: {
+		${1:updateValue}(state, ${3:payload}) => {
+			state.${2:value} = $3;
 		}
-	  }
 	}
-	// define a component that uses this mixin
-	var Component = Vue.extend({
-	  mixins: [myMixin]
-	})
-	var component = new Component() // -> "hello from mixin!"
 
 snippet vprops:d
-	propName: {
-	  type: Number,
-	  default: 100
+	${1:propName}: {
+	  type: ${2:Number},
+	  default: ${0}
 	},
 
-snippet vprops 
-	propName: {
-		type: Number
+snippet vprops
+	${1:propName}: {
+		type: ${2:Number}
 	},
+
+snippet vstore
+	import Vue from 'vue';
+	import Vuex from 'vuex';
+
+	Vue.use(Vuex);
+
+	export const store = new Vuex.Store({
+		state: {
+			${1:key}: ${2:value}
+		}
+	});

From 379a6528606a0ed321373575225be8cc745569b4 Mon Sep 17 00:00:00 2001
From: Mathias Jean Johansen <mathias@mjj.io>
Date: Fri, 22 Mar 2019 10:25:59 +0100
Subject: [PATCH 1226/1587] Disable all monkey patching done by RSpec.

---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 793098d24..3df2ad8ba 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -653,7 +653,7 @@ snippet mthrow
 #     Rspec snippets     #
 ##########################
 snippet desc
-	describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
+	RSpec.describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		${0}
 	end
 snippet descm

From cbbf1559166f9c308ae0f4634c11bdf282ddafba Mon Sep 17 00:00:00 2001
From: Mathias Jean Johansen <mathias@mjj.io>
Date: Fri, 22 Mar 2019 14:28:15 +0100
Subject: [PATCH 1227/1587] Add `rdesc` snippet.

---
 snippets/ruby.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 3df2ad8ba..ff5fede10 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -653,6 +653,10 @@ snippet mthrow
 #     Rspec snippets     #
 ##########################
 snippet desc
+	describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
+		${0}
+	end
+snippet rdesc
 	RSpec.describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		${0}
 	end

From 560407d63dd4436242c8678878cf1217eb9a2a46 Mon Sep 17 00:00:00 2001
From: Roshan Rao <roshan_rao@berkeley.edu>
Date: Thu, 28 Mar 2019 10:25:13 -0700
Subject: [PATCH 1228/1587] Change the Arg class to work with type hinting.

The new Arg class will split on the ":" separator, separating the
argument name and type. The type will also be stored as an attribute of
the Arg class, which will allow automatic addition to docstrings in the
future.
---
 UltiSnips/python.snippets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 79e7aff96..0ed73b144 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -51,7 +51,9 @@ DOUBLE_QUOTES = '"'
 class Arg(object):
 	def __init__(self, arg):
 		self.arg = arg
-		self.name = arg.split('=')[0].strip()
+		name_and_type = arg.split('=')[0].split(':')
+		self.name = name_and_type[0].strip()
+		self.type = name_and_type[1].strip() if len(name_and_type) == 2 else None
 
 	def __str__(self):
 		return self.name

From 71c702b35b9f7436efc1d93ba1beefb78ea83c2d Mon Sep 17 00:00:00 2001
From: Roshan Rao <roshan_rao@berkeley.edu>
Date: Thu, 28 Mar 2019 10:38:11 -0700
Subject: [PATCH 1229/1587] Make class init snippet work with varargs

Python args containing '*' are variable length arguments, so we probably
don't want to store them (and even if so, the previous syntax of
self._*args is invalid). Instead filter out varargs so they don't get
saved in the class automatically.
---
 UltiSnips/python.snippets | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 0ed73b144..a6c7416e1 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -64,6 +64,9 @@ class Arg(object):
 	def is_kwarg(self):
 		return '=' in self.arg
 
+	def is_vararg(self):
+		return '*' in self.name
+
 
 def get_args(arglist):
 	args = [Arg(arg) for arg in arglist.split(',') if arg]
@@ -213,7 +216,7 @@ def write_init_body(args, parents, snip):
 	if parents:
 		snip.rv += '\n' + snip.mkline('', indent='')
 
-	for arg in args:
+	for arg in filter(lambda arg: not arg.is_vararg(), args):
 		snip += "self._%s = %s" % (arg, arg)
 
 

From c1ca89f5a1b7e78427e66d70d1a64532188761fd Mon Sep 17 00:00:00 2001
From: imontalvomiguel <ubaldo.im@gmail.com>
Date: Fri, 29 Mar 2019 06:40:45 -0600
Subject: [PATCH 1230/1587] Snippets without whitespace control

---
 snippets/liquid.snippets | 97 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 snippets/liquid.snippets

diff --git a/snippets/liquid.snippets b/snippets/liquid.snippets
new file mode 100644
index 000000000..849286849
--- /dev/null
+++ b/snippets/liquid.snippets
@@ -0,0 +1,97 @@
+# Port of Shopify Liquid Template Snippets
+# https://marketplace.visualstudio.com/items?itemName=killalau.vscode-liquid-snippets
+
+snippet if
+	{% if ${1:condition} %}
+		${0:${VISUAL}}
+	{% endif %}
+snippet else
+	{% else %}
+snippet elsif
+	{% elsif ${1:condition} %}
+snippet ifelse
+	{% if ${1:condition} %}
+		${2}
+	{% else %}
+		${0}
+	{% endif %}
+snippet unless
+	{% unless ${1:condition} %}
+		${0:${VISUAL}}
+	{% endunless %}
+snippet case
+	{% case ${1:variable} %}
+		{% when ${2:condition} %}
+			${3}
+		{% else %}
+			${0}
+	{% endcase %}
+snippet when
+	{% when ${1:condition} %}
+		${0}
+snippet cycle
+	{% cycle '${1:odd}', '${2:even}' %}
+snippet cyclegroup
+	{% cycle '${1:group name}': '${2:odd}', '${3:even}' %}
+snippet for
+	{% for ${1:item} in ${2:collection} %}
+		${0}
+	{% endfor %}
+snippet limit
+	limit: ${1:5}
+snippet offset
+	offset: ${1:0}
+snippet reversed
+	reversed
+snippet break
+	{% break %}
+snippet continue
+	{% continue %}
+snippet tablerow
+	{% tablerow ${1:item} in ${2:collection} cols: ${3:2} %}
+		${0}
+	{% endtablerow %}
+snippet assign
+	{% assign ${1:variable} = ${0:value} %}
+snippet increment
+	{% increment ${0:variable} %}
+snippet decrement
+	{% decrement ${0:variable} %}
+snippet capture
+	{% capture ${1:variable} %}${0}{% endcapture %}
+snippet include
+	{% include '${0:snippet}' %}
+snippet includewith
+	{% include '${1:snippet}', ${2:variable}: ${0:value} %}
+snippet section
+	{% section '${1:snippet}' %}
+snippet raw
+	{% raw %}${0}{% endraw %}
+snippet layout
+	{% layout '${1:layout}' %}
+snippet layoutnone
+	{% layout none %}
+snippet paginate
+	{% paginate ${1:collection.products} by ${2:12} %}
+		{% for ${3:product} in $1 %}
+			${0}
+		{% endfor %}
+	{% endpaginate %}
+snippet schema
+	{% schema %}
+		{
+			${0}
+		}
+	{% endschema %}
+snippet stylesheet
+	{% stylesheet %}
+		${0}
+	{% endstylesheet %}
+snippet stylesheet_scss
+	{% stylesheet '${1:scss}' %}
+		${0}
+	{% endstylesheet %}
+snippet javascript
+	{% javascript %}
+		${0}
+	{% endjavascript %}

From e859cb3185cf10a83fd1a4014204f67f50d0f939 Mon Sep 17 00:00:00 2001
From: imontalvomiguel <ubaldo.im@gmail.com>
Date: Fri, 29 Mar 2019 07:10:12 -0600
Subject: [PATCH 1231/1587] Snippets with whitespace control

---
 snippets/liquid.snippets | 52 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/snippets/liquid.snippets b/snippets/liquid.snippets
index 849286849..05a3adabe 100644
--- a/snippets/liquid.snippets
+++ b/snippets/liquid.snippets
@@ -95,3 +95,55 @@ snippet javascript
 	{% javascript %}
 		${0}
 	{% endjavascript %}
+snippet comment-
+	{%- comment -%}${0}{%- endcomment -%}
+snippet if-
+	{%- if ${1:condition} -%}
+		${0:${VISUAL}}
+	{%- endif -%}
+snippet else-
+	{%- else -%}
+snippet elsif-
+	{%- elsif ${1:condition} -%}
+snippet ifelse-
+	{%- if ${1:condition} -%}
+		${2}
+	{%- else -%}
+		${0}
+	{%- endif -%}
+snippet unless-
+	{%- unless ${1:condition} -%}
+		${0:${VISUAL}}
+	{%- endunless -%}
+snippet case-
+	{%- case ${1:variable} -%}
+		{%- when ${2:condition} -%}
+			${3}
+		{%- else -%}
+			${0}
+	{%- endcase -%}
+snippet when-
+	{%- when ${1:condition} -%}
+		${0}
+snippet cycle-
+	{%- cycle '${1:odd}', '${2:even}' -%}
+snippet cyclegroup-
+	{%- cycle '${1:group name}': '${2:odd}', '${3:even}' -%}
+snippet for-
+	{%- for ${1:item} in ${2:collection} -%}
+		${0}
+	{%- endfor -%}
+snippet continue-
+	{%- continue -%}
+snippet tablerow-
+	{%- tablerow ${1:item} in ${2:collection} cols: ${3:2} -%}
+		${0}
+	{%- endtablerow -%}
+snippet assign-
+	{%- assign ${1:variable} = ${0:value} -%}
+snippet capture-
+	{%- capture ${1:variable} -%}${0}{%- endcapture -%}
+snippet include-
+	{%- include '${0:snippet}' -%}
+snippet includewith-
+	{%- include '${1:snippet}', ${2:variable}: ${0:value} -%}

From 4214407a5eda0d49ad591e41b6eb91f4682fa81f Mon Sep 17 00:00:00 2001
From: imontalvomiguel <ubaldo.im@gmail.com>
Date: Fri, 29 Mar 2019 22:31:59 -0600
Subject: [PATCH 1232/1587] Filter snippets

---
 snippets/liquid.snippets | 114 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/snippets/liquid.snippets b/snippets/liquid.snippets
index 05a3adabe..4f11f086c 100644
--- a/snippets/liquid.snippets
+++ b/snippets/liquid.snippets
@@ -147,3 +147,117 @@ snippet include-
 	{%- include '${0:snippet}' -%}
 snippet includewith-
 	{%- include '${1:snippet}', ${2:variable}: ${0:value} -%}
+snippet join
+	| join: '${1:, }'
+snippet first
+	| first
+snippet last
+	| last
+snippet concat
+	| concat: ${1:array}
+snippet map
+	| map: '${1:key}'
+snippet reverse
+	| reverse
+snippet size
+	| size
+snippet sort
+	| sort: '${1:key}'
+snippet uniq
+	| uniq
+snippet img_tag
+	| img_tag
+snippet img_tag_param
+	| img_tag: '${1:alt}', '${2:class}'
+snippet script_tag
+	| script_tag
+snippet stylesheet_tag
+	| stylesheet_tag
+snippet abs
+	| abs
+snippet ceil
+	| ceil
+snippet divided_by
+	| divided_by: ${1:2}
+snippet floor
+	| floor
+snippet minus
+	| minus: ${1:1}
+snippet plus
+	| plus: ${1:1}
+snippet round
+	| round: ${1:0}
+snippet times
+	| times: ${1:1}
+snippet modulo
+	| modulo: ${1:2}
+snippet money
+	| money
+snippet money_with_currency
+	| money_with_currency
+snippet money_without_trailing_zeros
+	| money_without_trailing_zeros
+snippet money_without_currency
+	| money_without_currency
+snippet append
+	| append: '${1:string}'
+snippet camelcase
+	| camelcase
+snippet capitalize
+	| capitalize
+snippet downcase
+	| downcase
+snippet escape
+	| escape
+snippet handleize
+	| handleize
+snippet md5
+	| md5
+snippet newline_to_br
+	| newline_to_br
+snippet pluralize
+	| pluralize: '${1:item}', '${2:items}'
+snippet prepend
+	| prepend: '${1:string}'
+snippet remove
+	| remove: '${1:string}'
+snippet remove_first
+	| remove_first: '${1:string}'
+snippet replace
+	| replace: '${1:target}', '${2:replace}'
+snippet replace_first
+	| replace_first: '${1:target}', '${2:replace}'
+snippet slice
+	| slice: ${1:0}, ${2:5}
+snippet slice_single
+	| slice: ${1:at}
+snippet split
+	| split: '${1:,}'
+snippet strip
+	| strip
+snippet lstrip
+	| lstrip
+snippet rstrip
+	| rstrip
+snippet strip_html
+	| strip_html
+snippet strip_newlines
+	| strip_newlines
+snippet truncate
+	| truncate: ${1:20}, '${2:...}'
+snippet truncatewords
+	| truncatewords: ${1:5}, '${2:...}'
+snippet upcase
+	| upcase
+snippet url_encode
+	| url_encode
+snippet url_escape
+	| url_escape
+snippet url_param_escape
+	| url_param_escape
+snippet asset_url
+	| asset_url
+snippet asset_img_url
+	| asset_img_url: '${1:medium}'
+snippet img_url
+	| img_url: '${1:medium}'

From 40c86d80184a45ad99513475b18f8f536beefd7c Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <mr.felixoid@gmail.com>
Date: Fri, 12 Apr 2019 11:58:30 +0200
Subject: [PATCH 1233/1587] Proper class name generating for puppet, simple
 include

---
 snippets/puppet.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index 7d8e6d8a3..1070dafb2 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -7,7 +7,7 @@
 # Header using Puppet Strings (YARD tags) https://puppet.com/docs/puppet/latest/modules_documentation.html
 # More info: https://github.com/puppetlabs/puppet-strings
 snippet classheader
-	# ${1:`vim_snippets#Filename(expand('%:p:s?.*modules/??:h:h'), 'class-name')`}
+	# ${1:`vim_snippets#Filename(substitute(expand('%:p:s?\v.{-}/(\w+)/manifests/(.+)\.pp?\1/\2?'), '/', '::', 'g'), 'class-name')`}
 	# ${2:A description of what this class does}
 	#
 	# @summary ${3:A short summary of the purpose of this class}
@@ -16,7 +16,7 @@ snippet classheader
 	#   ${6:Explanation of what this parameter affects.}
 	#
 	# @example Simple use
-	#   class { '$1': }
+	#   include $1
 	#
 	# @example Use with params
 	#   class { '$1':

From 1ba4a66c11d8fd4309656bc2994d683580d54de3 Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <mr.felixoid@gmail.com>
Date: Fri, 12 Apr 2019 12:21:59 +0200
Subject: [PATCH 1234/1587] Fix argument type and puppet string autogeneration

---
 snippets/puppet.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index 1070dafb2..adb781dd8 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -12,7 +12,7 @@ snippet classheader
 	#
 	# @summary ${3:A short summary of the purpose of this class}
 	#
-	# @param ${4:parameter1} [${5:String}]
+	# @param ${4:parameter1}
 	#   ${6:Explanation of what this parameter affects.}
 	#
 	# @example Simple use
@@ -28,7 +28,7 @@ snippet classheader
 	# @note Copyright `strftime("%Y")` $8
 	#
 	class $1(
-		$$4 = undef,
+		${5:String} $$4 = undef,
 	) {
 		${0}
 	}

From a79d5b062427a4acfd665b2f5498e7052ebc29e5 Mon Sep 17 00:00:00 2001
From: Florian Heiderich <florian@heiderich.org>
Date: Fri, 19 Apr 2019 10:59:40 +0200
Subject: [PATCH 1235/1587] remove whitespaces in some snippets using VISUAL

---
 snippets/tex.snippets | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 79e70628d..895fbe572 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -204,34 +204,34 @@ snippet fcite \footcite[]{}
 	\\footcite[${1}]{${2}}${0}
 #Formating text: italic, bold, underline, small capital, emphase ..
 snippet ita italic text
-	\\textit{${1:${VISUAL:text}}} ${0}
+	\\textit{${1:${VISUAL:text}}}${0}
 snippet bf bold face text
-	\\textbf{${1:${VISUAL:text}}} ${0}
+	\\textbf{${1:${VISUAL:text}}}${0}
 snippet under underline text
-	\\underline{${1:${VISUAL:text}}} ${0}
+	\\underline{${1:${VISUAL:text}}}${0}
 snippet over overline text
-	\\overline{${1:${VISUAL:text}}} ${0}
+	\\overline{${1:${VISUAL:text}}}${0}
 snippet emp emphasize text
 	\\emph{${1:${VISUAL:text}}}${0}
 snippet sc small caps text
-	\\textsc{${1:${VISUAL:text}}} ${0}
+	\\textsc{${1:${VISUAL:text}}}${0}
 #Choosing font
 snippet sf sans serife text
-	\\textsf{${1:${VISUAL:text}}} ${0}
+	\\textsf{${1:${VISUAL:text}}}${0}
 snippet rm roman font text
-	\\textrm{${1:${VISUAL:text}}} ${0}
+	\\textrm{${1:${VISUAL:text}}}${0}
 snippet tt typewriter (monospace) text
-	\\texttt{${1:${VISUAL:text}}} ${0}
+	\\texttt{${1:${VISUAL:text}}}${0}
 #Math font
 snippet mf mathfrak
-	\\mathfrak{${1:${VISUAL:text}}} ${0}
+	\\mathfrak{${1:${VISUAL:text}}}${0}
 snippet mc mathcal
-	\\mathcal{${1:${VISUAL:text}}} ${0}
+	\\mathcal{${1:${VISUAL:text}}}${0}
 snippet ms mathscr
-	\\mathscr{${1:${VISUAL:text}}} ${0}
+	\\mathscr{${1:${VISUAL:text}}}${0}
 #misc
 snippet ft \footnote
-	\\footnote{${1:${VISUAL:text}}} ${0}
+	\\footnote{${1:${VISUAL:text}}}${0}
 snippet fig figure environment (includegraphics)
 	\\begin{figure}
 	\\begin{center}

From 9827f1713407ace7d7608b5dec4db256979d5858 Mon Sep 17 00:00:00 2001
From: Jeroen Bourgois <jeroenbourgois@gmail.com>
Date: Wed, 1 May 2019 17:14:24 +0200
Subject: [PATCH 1236/1587] Fix EEx if/else error

There was a '=' in the else clause, which should not be there.
---
 snippets/eelixir.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 84caaba64..9910975af 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -17,7 +17,7 @@ snippet if
 snippet ife
 	<%= if ${1} do %>
 		${2:${VISUAL}}
-	<%= else %>
+	<% else %>
 		${0}
 	<% end %>
 snippet ft

From 7ade68cb23b33e9483667a09dc6683bb5b4de682 Mon Sep 17 00:00:00 2001
From: David Briscoe <idbrii@gmail.com>
Date: Fri, 10 May 2019 11:35:28 -0700
Subject: [PATCH 1237/1587] Assume class, struct, interface match file name

Give a more useful default value for class, struct, interface snippets.
No one names their interface IInterface, but the filename might be
correct.
---
 UltiSnips/cs.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/cs.snippets b/UltiSnips/cs.snippets
index 13d3c9717..303fd2094 100644
--- a/UltiSnips/cs.snippets
+++ b/UltiSnips/cs.snippets
@@ -16,21 +16,21 @@ namespace ${1:MyNamespace}
 endsnippet
 
 snippet class "class" w
-${1:public} class ${2:MyClass}
+${1:public} class ${2:`!p snip.rv = snip.basename`}
 {
 	$0
 }
 endsnippet
 
 snippet struct "struct" w
-struct ${1:MyStruct}
+struct ${1:`!p snip.rv = snip.basename`}
 {
 	$0
 }
 endsnippet
 
 snippet interface "interface" w
-interface I${1:Interface}
+interface I${1:`!p snip.rv = snip.basename`}
 {
 	$0
 }

From b67fe1e7dc5f01f4cb3a1782d861ec8936c2278f Mon Sep 17 00:00:00 2001
From: Chris Kang <chrisk@movio.co>
Date: Tue, 28 May 2019 16:33:43 +1200
Subject: [PATCH 1238/1587] Add functional class snippet

---
 snippets/javascript/javascript-react.snippets | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index 011c5c1f0..d7b55f037 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -42,11 +42,24 @@ snippet pt
 	static propTypes = {
 		${1}: React.PropTypes.${2:type},
 	}
+snippet rfc
+	const ${1:ClassName} = (${2:props}) => {
+		return (
+			<div>
+				$1
+			</div>
+		);
+	}
 snippet rcc
 	class ${1:ClassName} extends React.Component {
+		state = {
+
+		}
 		render() {
 			return (
-				${0:<div />}
+				<div>
+					$1
+				</div>
 			);
 		}
 	}

From f6038760cade8face30f64dcb2bdf7de7172154f Mon Sep 17 00:00:00 2001
From: Chris Kang <chrisk@movio.co>
Date: Wed, 29 May 2019 16:03:13 +1200
Subject: [PATCH 1239/1587] Change ClassName => ComponentName

---
 snippets/javascript/javascript-react.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index d7b55f037..4377c68a0 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -43,7 +43,7 @@ snippet pt
 		${1}: React.PropTypes.${2:type},
 	}
 snippet rfc
-	const ${1:ClassName} = (${2:props}) => {
+	const ${1:ComponentName} = (${2:props}) => {
 		return (
 			<div>
 				$1

From 8bd58e42865cd8de4e223b7a2f6e1624d13b4f6c Mon Sep 17 00:00:00 2001
From: Chris Kang <chris.sm.kang542@gmail.com>
Date: Thu, 30 May 2019 09:40:36 +1200
Subject: [PATCH 1240/1587] Add redux snippets (#1129)

---
 snippets/javascript/javascript-redux.snippets | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 snippets/javascript/javascript-redux.snippets

diff --git a/snippets/javascript/javascript-redux.snippets b/snippets/javascript/javascript-redux.snippets
new file mode 100644
index 000000000..e13253c39
--- /dev/null
+++ b/snippets/javascript/javascript-redux.snippets
@@ -0,0 +1,37 @@
+snippet ist
+	import { createStore } from 'redux';
+snippet con
+	connect(${1:mapStateToProps}, ${2:mapDispatchToProps})(<${3:VISUAL}/>);
+snippet act
+	const ${1:actionName} = (${2:arg}) => {
+		return {
+			type: ${3:VISUAL},
+			$2
+		};
+	};
+snippet rdc
+	const ${1:reducerName} = (state={}, action) => {
+		switch(action.type) {
+			case ${1:action}:
+				return {
+					...state,
+					$2
+				};
+			default:
+				return state;
+		};
+	};
+snippet mstp
+	const mapStateToProps = (state) => {
+		return {
+			${1:propName}: state.$1,
+		};
+	};
+snippet mdtp
+	const mapDispatchToProps = (dispatch) => {
+		return {
+			${1:propName}: () => {
+				dispatch(${2:actionName}());
+			},
+		};
+	};

From e4ce67117d06d7e9bc46ca6cbedcd406ddfb29b1 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 30 May 2019 12:40:33 +0100
Subject: [PATCH 1241/1587] Fold in es6 snippets as they are now the default

---
 snippets/javascript/javascript.es6.snippets | 55 ---------------------
 snippets/javascript/javascript.snippets     | 54 ++++++++++++++++++++
 2 files changed, 54 insertions(+), 55 deletions(-)
 delete mode 100644 snippets/javascript/javascript.es6.snippets

diff --git a/snippets/javascript/javascript.es6.snippets b/snippets/javascript/javascript.es6.snippets
deleted file mode 100644
index 7e885e6e8..000000000
--- a/snippets/javascript/javascript.es6.snippets
+++ /dev/null
@@ -1,55 +0,0 @@
-snippet const
-	const ${1} = ${0};
-snippet let
-	let ${1} = ${0};
-snippet im "import xyz from 'xyz'"
-	import ${1} from '${2:$1}';
-snippet imas "import * as xyz from 'xyz'"
-	import * as ${1} from '${2:$1}';
-snippet imm "import { member } from 'xyz'"
-	import { ${1} } from '${2}';
-snippet cla
-	class ${1} {
-		${0:${VISUAL}}
-	}
-snippet clax
-	class ${1} extends ${2} {
-		${0:${VISUAL}}
-	}
-snippet clac
-	class ${1} {
-		constructor(${2}) {
-			${0:${VISUAL}}
-		}
-	}
-snippet foro "for (const prop of object}) { ... }"
-	for (const ${1:prop} of ${2:object}) {
-		${0:$1}
-	}
-# Generator
-snippet fun*
-	function* ${1:function_name}(${2}) {
-		${0:${VISUAL}}
-	}
-snippet c=>
-	const ${1:function_name} = (${2}) => {
-		${0:${VISUAL}}
-	}
-snippet caf
-	const ${1:function_name} = (${2}) => {
-		${0:${VISUAL}}
-	}
-snippet =>
-	(${1}) => {
-		${0:${VISUAL}}
-	}
-snippet af
-	(${1}) => {
-		${0:${VISUAL}}
-	}
-snippet sym
-	const ${1} = Symbol('${0}');
-snippet ed
-	export default ${0}
-snippet ${
-	${${1}}${0}
diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 0dc5783e0..e8a801d8a 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -279,3 +279,57 @@ snippet us
 # setTimeout function
 snippet timeout
 	setTimeout(function () {${0}}${2}, ${1:10});
+snippet const
+	const ${1} = ${0};
+snippet let
+	let ${1} = ${0};
+snippet im "import xyz from 'xyz'"
+	import ${1} from '${2:$1}';
+snippet imas "import * as xyz from 'xyz'"
+	import * as ${1} from '${2:$1}';
+snippet imm "import { member } from 'xyz'"
+	import { ${1} } from '${2}';
+snippet cla
+	class ${1} {
+		${0:${VISUAL}}
+	}
+snippet clax
+	class ${1} extends ${2} {
+		${0:${VISUAL}}
+	}
+snippet clac
+	class ${1} {
+		constructor(${2}) {
+			${0:${VISUAL}}
+		}
+	}
+snippet foro "for (const prop of object}) { ... }"
+	for (const ${1:prop} of ${2:object}) {
+		${0:$1}
+	}
+snippet fun*
+	function* ${1:function_name}(${2}) {
+		${0:${VISUAL}}
+	}
+snippet c=>
+	const ${1:function_name} = (${2}) => {
+		${0:${VISUAL}}
+	}
+snippet caf
+	const ${1:function_name} = (${2}) => {
+		${0:${VISUAL}}
+	}
+snippet =>
+	(${1}) => {
+		${0:${VISUAL}}
+	}
+snippet af
+	(${1}) => {
+		${0:${VISUAL}}
+	}
+snippet sym
+	const ${1} = Symbol('${0}');
+snippet ed
+	export default ${0}
+snippet ${
+	${${1}}${0}

From 91ef2dcf1e75d06fd04ceafc144c8cf5d1b4f46a Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 30 May 2019 12:43:49 +0100
Subject: [PATCH 1242/1587] Javascript async await

---
 snippets/javascript/javascript.snippets | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index e8a801d8a..8cf7c6e01 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -5,10 +5,14 @@ snippet proto
 		${0:${VISUAL}}
 	};
 # Function
-snippet fun
+snippet fun "function"
 	function ${1:function_name}(${2}) {
 		${0:${VISUAL}}
 	}
+snippet fun "async function"
+	async function ${1:function_name}(${2}) {
+		${0:${VISUAL}}
+	}
 # Anonymous Function
 snippet anf "" w
 	function(${1}) {
@@ -202,8 +206,6 @@ snippet @par
 	@param {${1:type}} ${2:name} ${0:description}
 snippet @ret
 	@return {${1:type}} ${0:description}
-# JSON
-
 # JSON.parse
 snippet jsonp
 	JSON.parse(${0:jstr});
@@ -273,7 +275,6 @@ snippet cprof "console.profile"
 snippet ctable "console.table"
 	console.table(${1:"${2:value}"});
 # Misc
-# 'use strict';
 snippet us
 	'use strict';
 # setTimeout function
@@ -333,3 +334,5 @@ snippet ed
 	export default ${0}
 snippet ${
 	${${1}}${0}
+snippet aw "await"
+	await ${0:${VISUAL}}

From a11cf5b47fcb9de72b5c8694a4e2fe2dca8c0ae7 Mon Sep 17 00:00:00 2001
From: Daido Shota <35087200+daido1976@users.noreply.github.com>
Date: Sun, 2 Jun 2019 17:41:18 +0900
Subject: [PATCH 1243/1587] Add space in `irc` (#1130)

---
 snippets/javascript/javascript-react.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index 4377c68a0..0e8d3602e 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -1,7 +1,7 @@
 snippet ir
 	import React from 'react';
 snippet irc
-	import React, {Component} from 'react';
+	import React, { Component } from 'react';
 snippet ird
 	import ReactDOM from 'react-dom';
 snippet cdm

From c8e8b35e9a56aab5b1ef871a164b6e8d6ea79ad0 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr.gtalk@gmail.com>
Date: Fri, 5 Jul 2019 22:53:22 -0700
Subject: [PATCH 1244/1587] Add cpp auto alternatives to msp and mup

This syntax follows (A)lways (A)lways (A)uto, a popular C++11
syntax guideline coined by Scott Meyers.

Signed-off-by: Kevin Morris <kevr.gtalk@gmail.com>
---
 snippets/cpp.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index f47a6834d..f39d743e8 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -62,9 +62,13 @@ snippet pqueue
 # std::shared_ptr
 snippet msp
 	std::shared_ptr<${1:T}> ${2} = std::make_shared<$1>(${3});
+snippet amsp
+	auto ${1} = std::make_shared<${2:T}>(${3});
 # std::unique_ptr
 snippet mup
 	std::unique_ptr<${1:T}> ${2} = std::make_unique<$1>(${3});
+snippet amup
+	auto ${1} = std::make_unique<${2:T}>(${3});
 ##
 ## Access Modifiers
 # private

From d693695ae9375794a3a0b572fd65e86bfb56ed61 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 13 Jul 2019 11:37:40 +0100
Subject: [PATCH 1245/1587] Typo

---
 UltiSnips/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index a6c7416e1..f79cb8567 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -267,7 +267,7 @@ class ${1:MyClass}(${2:object}):
 	`!p snip.rv = triple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = triple_quotes(snip)`
 
 	def __init__(self$4):
-		`!p snip.rv = triple_quotes(snip)`${5:TODO: to be defined1.}`!p
+		`!p snip.rv = triple_quotes(snip)`${5:TODO: to be defined.}`!p
 snip.rv = ""
 snip >> 2
 

From 73b9e21ac6590b78952c7ec64b5701b76d19bf96 Mon Sep 17 00:00:00 2001
From: vejetaryenvampir <vejetaryenvampir@cock.li>
Date: Wed, 17 Jul 2019 16:04:47 +0300
Subject: [PATCH 1246/1587] Added CSS grid support.

---
 snippets/css.snippets    | 223 ++++++++++++++++++++++++++++++++-----
 snippets/sass.snippets   | 228 ++++++++++++++++++++++++++++++++++++++
 snippets/stylus.snippets | 230 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 651 insertions(+), 30 deletions(-)

diff --git a/snippets/css.snippets b/snippets/css.snippets
index dd688cbe7..54b529ae7 100644
--- a/snippets/css.snippets
+++ b/snippets/css.snippets
@@ -36,45 +36,71 @@ snippet @m "@media mediatype { }"
 		${2:${VISUAL}}
 	}${0}
 snippet ac
-	align-content: ${0:stretch};
+	align-content: ${1:stretch};
+snippet ac:s
+	align-content: start;
+snippet ac:e
+	align-content: end;
 snippet ac:c
 	align-content: center;
-snippet ac:fe
-	align-content: flex-end;
 snippet ac:fs
 	align-content: flex-start;
-snippet ac:sa
-	align-content: space-around;
+snippet ac:fe
+	align-content: flex-end;
 snippet ac:sb
 	align-content: space-between;
-snippet ac:s
+snippet ac:sa
+	align-content: space-around;
+snippet ac:se
+	align-content: space-evenly;
+snippet ac:st
 	align-content: stretch;
+snippet ac:b
+	align-content: baseline;
+snippet ac:fb
+	align-content: first baseline;
+snippet ac:lb
+	align-content: last baseline;
 snippet ai
-	align-items: ${0:stretch};
-snippet ai:b
-	align-items: baseline;
+	align-items: ${1:stretch};
+snippet ai:s
+	align-items: start;
+snippet ai:e
+	align-items: end;
 snippet ai:c
 	align-items: center;
-snippet ai:fe
-	align-items: flex-end;
 snippet ai:fs
 	align-items: flex-start;
-snippet ai:s
+snippet ai:fe
+	align-items: flex-end;
+snippet ai:st
 	align-items: stretch;
+snippet ai:b
+	align-items: baseline;
+snippet ai:fb
+	align-items: first baseline;
+snippet ai:lb
+	align-items: last baseline;
 snippet as
-	align-self:  ${0};
-snippet as:a
-	align-self: auto;
-snippet as:b
-	align-self: baseline;
+	align-self: ${1:stretch};
+snippet as:s
+	align-self: start;
+snippet as:e
+	align-self: end;
 snippet as:c
 	align-self: center;
-snippet as:fe
-	align-self: flex-end;
+snippet as:st
+	align-self: stretch;
 snippet as:fs
 	align-self: flex-start;
-snippet as:s
-	align-self: stretch;
+snippet as:fe
+	align-self: flex-end;
+snippet as:b
+	align-self: baseline;
+snippet as:fb
+	align-self: first baseline;
+snippet as:lb
+	align-self: last baseline;
 snippet bg+
 	background: #${1:fff} url(${2}) ${3:0} ${4:0} ${5:no-repeat};${0}
 snippet bga
@@ -423,6 +449,8 @@ snippet d:b
 	display: block;
 snippet d:cp
 	display: compact;
+snippet d:g
+	display: grid;
 snippet d:f
 	display: flex;
 snippet d:ib
@@ -605,24 +633,122 @@ snippet fw:n
 	font-weight: normal;
 snippet f
 	font: ${1};${0}
+snippet g
+	grid: ${1};
+snippet gaf
+	grid-auto-flow: ${1:row};
+snippet gaf+
+	grid-auto-flow: ${1:row} ${2:dense};
+snippet gaf:r
+	grid-auto-flow: row;
+snippet gaf:c
+	grid-auto-flow: column;
+snippet gaf:d
+	grid-auto-flow: dense;
+snippet gaf:rd
+	grid-auto-flow: row dense;
+snippet gaf:cd
+	grid-auto-flow: column dense;
+snippet gar
+	grid-auto-rows: ${1};
+snippet gar:a
+	grid-auto-rows: auto
+snippet gar:mac
+	grid-auto-rows: max-content;
+snippet gar:mic
+	grid-auto-rows: min-content;
+snippet gac
+	grid-auto-columns: ${1};
+snippet gac:a
+	grid-auto-columns: auto
+snippet gac:mac
+	grid-auto-columns: max-content;
+snippet gac:mic
+	grid-auto-columns: min-content;
+snippet gt
+	grid-template: ${1};
+snippet gt+
+	grid-template: ${1} / ${2};
+snippet gtr
+	grid-template-rows: ${1};
+snippet gtc
+	grid-template-columns: ${1};
+snippet gta
+	grid-template-areas: ${1};
+snippet gg
+	grid-gap: ${1};
+snippet gg+
+	grid-gap: ${1} ${2};
+snippet gg:0
+	grid-gap: 0;
+snippet grg
+	grid-row-gap: ${1};
+snippet grg:0
+	grid-row-gap: 0;
+snippet gcg
+	grid-column-gap: ${1};
+snippet gcg:0
+	grid-column-gap: 0;
+snippet gr
+	grid-row: ${1} / ${2};
+snippet grs
+	grid-row-start: ${1};
+snippet gre
+	grid-row-end: ${1};
+snippet gc
+	grid-column: ${1} / ${2};
+snippet gcs
+	grid-column-start: ${1};
+snippet gce
+	grid-column-end: ${1};
 snippet h
 	height: ${1};${0}
 snippet h:a
 	height: auto;
 snippet jc
-	justify-content: ${0:flex-start};
+	justify-content: ${1};
+snippet jc:s
+	justify-content: start;
+snippet jc:e
+	justify-content: end;
 snippet jc:c
 	justify-content: center;
-snippet jc:fe
-	justify-content: flex-end;
 snippet jc:fs
 	justify-content: flex-start;
-snippet jc:sa
-	justify-content: space-around;
+snippet jc:fe
+	justify-content: flex-end;
 snippet jc:sb
 	justify-content: space-between;
+snippet jc:sa
+	justify-content: space-around;
 snippet jc:se
 	justify-content: space-evenly;
+snippet jc:st
+	justify-content: space-evenly;
+snippet jc:l
+	justify-content: left;
+snippet jc:r
+	justify-content: right;
+snippet ji
+	justify-items: ${1:stretch};
+snippet ji:s
+	justify-items: start;
+snippet ji:e
+	justify-items: end;
+snippet ji:c
+	justify-items: center;
+snippet ji:st
+	justify-items: stretch;
+snippet js
+	justify-self: ${1:stretch};
+snippet js:s
+	justify-self: start;
+snippet js:e
+	justify-self: end;
+snippet js:c
+	justify-self: center;
+snippet js:st
+	justify-self: stretch;
 snippet l
 	left: ${1};${0}
 snippet l:a
@@ -789,6 +915,28 @@ snippet p:2
 	padding: ${1:0} ${2:0};${0}
 snippet p:0
 	padding: 0;
+snippet pc
+	place-content: ${1};
+snippet pc+
+	place-content: ${1} ${2};
+snippet pc:s
+	place-content: start;
+snippet pc:e
+	place-content: end;
+snippet pc:c
+	place-content: center;
+snippet pc:fs
+	place-content: flex-start;
+snippet pc:fe
+	place-content: flex-end;
+snippet pc:sb
+	place-content: space-between;
+snippet pc:sa
+	place-content: space-around;
+snippet pc:se
+	place-content: space-evenly;
+snippet pc:st
+	place-content: stretch;
 snippet pgba
 	page-break-after: ${1};${0}
 snippet pgba:aw
@@ -815,6 +963,17 @@ snippet pgbi:a
 	page-break-inside: auto;
 snippet pgbi:av
 	page-break-inside: avoid;
+snippet pi
+	place-items: ${1:stretch};
+snippet pi+
+	place-items: ${1:stretch} ${2:stretch};
+snippet pi:s
+	place-items: start;
+snippet pi:e
+	place-items: end;
+snippet pi:c
+	place-items: center;
+snippet pi:st
 snippet pos
 	position: ${1};${0}
 snippet pos:a
@@ -825,6 +984,18 @@ snippet pos:r
 	position: relative;
 snippet pos:s
 	position: static;
+snippet ps
+	place-self: ${1:stretch};
+snippet ps+
+	place-self: ${1:stretch} ${2:stretch};
+snippet ps:s
+	place-self: start;
+snippet ps:e
+	place-self: end;
+snippet ps:c
+	place-self: center;
+snippet ps:st
+	place-self: stretch;
 snippet q
 	quotes: ${1};${0}
 snippet q:en
diff --git a/snippets/sass.snippets b/snippets/sass.snippets
index 3e84c20ed..5bef59377 100644
--- a/snippets/sass.snippets
+++ b/snippets/sass.snippets
@@ -34,6 +34,72 @@ snippet while
 		${0:${VISUAL}}
 snippet !
 	 !important
+snippet ac
+	align-content: ${0}
+snippet ac:s
+	align-content: start
+snippet ac:e
+	align-content: end
+snippet ac:c
+	align-content: center
+snippet ac:fs
+	align-content: flex-start
+snippet ac:fe
+	align-content: flex-end
+snippet ac:sb
+	align-content: space-between
+snippet ac:sa
+	align-content: space-around
+snippet ac:se
+	align-content: space-evenly
+snippet ac:st
+	align-content: stretch
+snippet ac:b
+	align-content: baseline
+snippet ac:fb
+	align-content: first baseline
+snippet ac:lb
+	align-content: last baseline
+snippet ai
+	align-items: ${0}
+snippet ai:s
+	align-items: start
+snippet ai:e
+	align-items: end
+snippet ai:c
+	align-items: center
+snippet ai:fs
+	align-items: flex-start
+snippet ai:fe
+	align-items: flex-end
+snippet ai:st
+	align-items: stretch
+snippet ai:b
+	align-items: baseline
+snippet ai:fb
+	align-items: first baseline
+snippet ai:lb
+	align-items: last baseline
+snippet as
+	align-self: ${0}
+snippet as:s
+	align-self: start
+snippet as:e
+	align-self: end
+snippet as:c
+	align-self: center
+snippet as:st
+	align-self: stretch
+snippet as:fs
+	align-self: flex-start
+snippet as:fe
+	align-self: flex-end
+snippet as:b
+	align-self: baseline
+snippet as:fb
+	align-self: first baseline
+snippet as:lb
+	align-self: last baseline
 snippet bdi:m+
 	-moz-border-image: url('${1}') ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:m
@@ -411,6 +477,10 @@ snippet d:b
 	display: block
 snippet d:cp
 	display: compact
+snippet d:g
+	display: grid
+snippet d:f
+	display: flex
 snippet d:ib
 	display: inline-block
 snippet d:itb
@@ -561,10 +631,122 @@ snippet fw:n
 	font-weight: normal
 snippet f
 	font: ${0}
+snippet g
+	grid: ${0}
+snippet gaf
+	grid-auto-flow: ${0}
+snippet gaf+
+	grid-auto-flow: ${1:row} ${0:dense}
+snippet gaf:r
+	grid-auto-flow: row
+snippet gaf:c
+	grid-auto-flow: column
+snippet gaf:d
+	grid-auto-flow: dense
+snippet gaf:rd
+	grid-auto-flow: row dense
+snippet gaf:cd
+	grid-auto-flow: column dense
+snippet gar
+	grid-auto-rows: ${0}
+snippet gar:a
+	grid-auto-rows: auto
+snippet gar:mac
+	grid-auto-rows: max-content
+snippet gar:mic
+	grid-auto-rows: min-content
+snippet gac
+	grid-auto-columns: ${0}
+snippet gac:a
+	grid-auto-columns: auto
+snippet gac:mac
+	grid-auto-columns: max-content
+snippet gac:mic
+	grid-auto-columns: min-content
+snippet gt
+	grid-template: ${0}
+snippet gt+
+	grid-template: ${1} / ${0}
+snippet gtr
+	grid-template-rows: ${0}
+snippet gtc
+	grid-template-columns: ${0}
+snippet gta
+	grid-template-areas: ${0}
+snippet gg
+	grid-gap: ${0}
+snippet gg+
+	grid-gap: ${1} ${0}
+snippet gg:0
+	grid-gap: 0
+snippet grg
+	grid-row-gap: ${0}
+snippet grg:0
+	grid-row-gap: 0
+snippet gcg
+	grid-column-gap: ${0}
+snippet gcg:0
+	grid-column-gap: 0
+snippet gr
+	grid-row: ${1} / ${0}
+snippet grs
+	grid-row-start: ${0}
+snippet gre
+	grid-row-end: ${0}
+snippet gc
+	grid-column: ${1} / ${0}
+snippet gcs
+	grid-column-start: ${0}
+snippet gce
+	grid-column-end: ${0}
 snippet h
 	height: ${0}
 snippet h:a
 	height: auto
+snippet jc
+	justify-content: ${0}
+snippet jc:s
+	justify-content: start
+snippet jc:e
+	justify-content: end
+snippet jc:c
+	justify-content: center
+snippet jc:fs
+	justify-content: flex-start
+snippet jc:fe
+	justify-content: flex-end
+snippet jc:sb
+	justify-content: space-between
+snippet jc:sa
+	justify-content: space-around
+snippet jc:se
+	justify-content: space-evenly
+snippet jc:st
+	justify-content: space-evenly
+snippet jc:l
+	justify-content: left
+snippet jc:r
+	justify-content: right
+snippet ji
+	justify-items: ${0}
+snippet ji:s
+	justify-items: start
+snippet ji:e
+	justify-items: end
+snippet ji:c
+	justify-items: center
+snippet ji:st
+	justify-items: stretch
+snippet js
+	justify-self: ${0}
+snippet js:s
+	justify-self: start
+snippet js:e
+	justify-self: end
+snippet js:c
+	justify-self: center
+snippet js:st
+	justify-self: stretch
 snippet l
 	left: ${0}
 snippet l:a
@@ -729,6 +911,28 @@ snippet p:2
 	padding: ${1:0} ${0:0}
 snippet p:0
 	padding: 0
+snippet pc
+	place-content: ${0}
+snippet pc+
+	place-content: ${1} ${0}
+snippet pc:s
+	place-content: start
+snippet pc:e
+	place-content: end
+snippet pc:c
+	place-content: center
+snippet pc:fs
+	place-content: flex-start
+snippet pc:fe
+	place-content: flex-end
+snippet pc:sb
+	place-content: space-between
+snippet pc:sa
+	place-content: space-around
+snippet pc:se
+	place-content: space-evenly
+snippet pc:st
+	place-content: stretch
 snippet pgba
 	page-break-after: ${0}
 snippet pgba:aw
@@ -755,6 +959,18 @@ snippet pgbi:a
 	page-break-inside: auto
 snippet pgbi:av
 	page-break-inside: avoid
+snippet pi
+	place-items: ${0}
+snippet pi+
+	place-items: ${1:stretch} ${0:stretch}
+snippet pi:s
+	place-items: start
+snippet pi:e
+	place-items: end
+snippet pi:c
+	place-items: center
+snippet pi:st
+	place-items: stretch
 snippet pos
 	position: ${0}
 snippet pos:a
@@ -765,6 +981,18 @@ snippet pos:r
 	position: relative
 snippet pos:s
 	position: static
+snippet ps
+	place-self: ${0}
+snippet ps+
+	place-self: ${1:stretch} ${0:stretch}
+snippet ps:s
+	place-self: start
+snippet ps:e
+	place-self: end
+snippet ps:c
+	place-self: center
+snippet ps:st
+	place-self: stretch
 snippet q
 	quotes: ${0}
 snippet q:en
diff --git a/snippets/stylus.snippets b/snippets/stylus.snippets
index 3ce35c269..ab703feec 100644
--- a/snippets/stylus.snippets
+++ b/snippets/stylus.snippets
@@ -1,5 +1,71 @@
 snippet !
 	!important
+snippet ac
+	align-content ${0}
+snippet ac:s
+	align-content start
+snippet ac:e
+	align-content end
+snippet ac:c
+	align-content center
+snippet ac:fs
+	align-content flex-start
+snippet ac:fe
+	align-content flex-end
+snippet ac:sb
+	align-content space-between
+snippet ac:sa
+	align-content space-around
+snippet ac:se
+	align-content space-evenly
+snippet ac:st
+	align-content stretch
+snippet ac:b
+	align-content baseline
+snippet ac:fb
+	align-content first baseline
+snippet ac:lb
+	align-content last baseline
+snippet ai
+	align-items ${0}
+snippet ai:s
+	align-items start
+snippet ai:e
+	align-items end
+snippet ai:c
+	align-items center
+snippet ai:fs
+	align-items flex-start
+snippet ai:fe
+	align-items flex-end
+snippet ai:st
+	align-items stretch
+snippet ai:b
+	align-items baseline
+snippet ai:fb
+	align-items first baseline
+snippet ai:lb
+	align-items last baseline
+snippet as
+	align-self ${0}
+snippet as:s
+	align-self start
+snippet as:e
+	align-self end
+snippet as:c
+	align-self center
+snippet as:st
+	align-self stretch
+snippet as:fs
+	align-self flex-start
+snippet as:fe
+	align-self flex-end
+snippet as:b
+	align-self baseline
+snippet as:fb
+	align-self first baseline
+snippet as:lb
+	align-self last baseline
 snippet bdi:m+
 	-moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
 snippet bdi:m
@@ -379,10 +445,12 @@ snippet d:mis
 	display -moz-inline-stack
 snippet d:b
 	display block
-snippet d:f
-	display flex
 snippet d:cp
 	display compact
+snippet d:g
+	display grid
+snippet d:f
+	display flex
 snippet d:ib
 	display inline-block
 snippet d:itb
@@ -533,6 +601,74 @@ snippet fw:n
 	font-weight normal
 snippet f
 	font ${0}
+snippet g
+	grid ${0}
+snippet gaf
+	grid-auto-flow ${0}
+snippet gaf+
+	grid-auto-flow ${1:row} ${0:dense}
+snippet gaf:r
+	grid-auto-flow row
+snippet gaf:c
+	grid-auto-flow column
+snippet gaf:d
+	grid-auto-flow dense
+snippet gaf:rd
+	grid-auto-flow row dense
+snippet gaf:cd
+	grid-auto-flow column dense
+snippet gar
+	grid-auto-rows ${0}
+snippet gar:a
+	grid-auto-rows auto
+snippet gar:mac
+	grid-auto-rows max-content
+snippet gar:mic
+	grid-auto-rows min-content
+snippet gac
+	grid-auto-columns ${0}
+snippet gac:a
+	grid-auto-columns auto
+snippet gac:mac
+	grid-auto-columns max-content
+snippet gac:mic
+	grid-auto-columns min-content
+snippet gt
+	grid-template ${0}
+snippet gt+
+	grid-template ${1} / ${0}
+snippet gtr
+	grid-template-rows ${0}
+snippet gtc
+	grid-template-columns ${0}
+snippet gta
+	grid-template-areas ${0}
+snippet gg
+	grid-gap ${0}
+snippet gg+
+	grid-gap ${1} ${0}
+snippet gg:0
+	grid-gap 0
+snippet grg
+	grid-row-gap ${0}
+snippet grg:0
+	grid-row-gap 0
+snippet gcg
+	grid-column-gap ${0}
+snippet gcg:0
+	grid-column-gap 0
+snippet gr
+	grid-row ${1} / ${0}
+snippet grs
+	grid-row-start ${0}
+snippet gre
+	grid-row-end ${0}
+snippet gc
+	grid-column ${1} / ${0}
+snippet gcs
+	grid-column-start ${0}
+snippet gce
+	grid-column-end ${0}
 snippet h
 	height ${0}
 snippet h:a
@@ -701,6 +837,28 @@ snippet p:2
 	padding ${1:0} ${0:0}
 snippet p:0
 	padding 0
+snippet pc
+	place-content ${0}
+snippet pc+
+	place-content ${1} ${0}
+snippet pc:s
+	place-content start
+snippet pc:e
+	place-content end
+snippet pc:c
+	place-content center
+snippet pc:fs
+	place-content flex-start
+snippet pc:fe
+	place-content flex-end
+snippet pc:sb
+	place-content space-between
+snippet pc:sa
+	place-content space-around
+snippet pc:se
+	place-content space-evenly
+snippet pc:st
+	place-content stretch
 snippet pgba
 	page-break-after ${0}
 snippet pgba:aw
@@ -727,6 +885,18 @@ snippet pgbi:a
 	page-break-inside auto
 snippet pgbi:av
 	page-break-inside avoid
+snippet pi
+	place-items ${0}
+snippet pi+
+	place-items ${1:stretch} ${0:stretch}
+snippet pi:s
+	place-items start
+snippet pi:e
+	place-items end
+snippet pi:c
+	place-items center
+snippet pi:st
+	place-items stretch
 snippet pos
 	position ${0}
 snippet pos:a
@@ -737,6 +907,18 @@ snippet pos:r
 	position relative
 snippet pos:s
 	position static
+snippet ps
+	place-self ${0}
+snippet ps+
+	place-self ${1:stretch} ${0:stretch}
+snippet ps:s
+	place-self start
+snippet ps:e
+	place-self end
+snippet ps:c
+	place-self center
+snippet ps:st
+	place-self stretch
 snippet q
 	quotes ${0}
 snippet q:en
@@ -993,7 +1175,47 @@ snippet for
 	for ${1:i} in ${0}
 snippet keyf
 	@keyframes ${0}
+snippet jc
+	justify-content ${0}
+snippet jc:s
+	justify-content start
+snippet jc:e
+	justify-content end
 snippet jc:c
 	justify-content center
-snippet jc
-	justify-content
+snippet jc:fs
+	justify-content flex-start
+snippet jc:fe
+	justify-content flex-end
+snippet jc:sb
+	justify-content space-between
+snippet jc:sa
+	justify-content space-around
+snippet jc:se
+	justify-content space-evenly
+snippet jc:st
+	justify-content space-evenly
+snippet jc:l
+	justify-content left
+snippet jc:r
+	justify-content right
+snippet ji
+	justify-items ${0}
+snippet ji:s
+	justify-items start
+snippet ji:e
+	justify-items end
+snippet ji:c
+	justify-items center
+snippet ji:st
+	justify-items stretch
+snippet js
+	justify-self ${0}
+snippet js:s
+	justify-self start
+snippet js:e
+	justify-self end
+snippet js:c
+	justify-self center
+snippet js:st
+	justify-self stretch

From 23869ac61cf08083e0784ee63f2f33ae8db038f5 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 19 Jul 2019 13:06:51 +0100
Subject: [PATCH 1247/1587] Remove overly common trigger go snippet

---
 snippets/go.snippets | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 7cbbf5e21..f59fb48d4 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -53,9 +53,6 @@ snippet dfr "defer recover"
 		}
 	}()
 
-snippet i "int"
-	int
-
 snippet im "import"
 	import (
 		"${1:package}"

From d83f4ee6dcf6dbb98428422344b3304ceefa001a Mon Sep 17 00:00:00 2001
From: Balamurali M <balamurali05@outlook.com>
Date: Fri, 19 Jul 2019 05:07:24 +0530
Subject: [PATCH 1248/1587] Add html phone URL snippet

---
 UltiSnips/html.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 924f02fd8..a81b1d883 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -333,6 +333,10 @@ snippet mailto "HTML <a mailto: >" w
 <a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
 endsnippet
 
+snippet tel "HTML <a tel: >" w
+<a href="tel:+${1:XX1234567890}">${2:call me}</a>
+endsnippet
+
 snippet main "<main>"
 <main>
 	${1:main content}

From 84ab7e118ca5fee5a67ce4c884c0c1d5c9308e21 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 19 Jul 2019 15:41:57 +0100
Subject: [PATCH 1249/1587] Remove overly common trigger go snippet

---
 snippets/go.snippets | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index f59fb48d4..bd7f541ae 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -31,9 +31,6 @@ snippet cs "case"
 	case ${1:value}:
 		${0:${VISUAL}}
 
-snippet c "const"
-	const ${1:NAME} = ${0:0}
-
 snippet co "constants with iota"
 	const (
 		${1:NAME1} = iota

From fdce2f1df1cada2f58e48e7737cd596224bfaf23 Mon Sep 17 00:00:00 2001
From: Weirong Xu <weirongxu.raidou@gmail.com>
Date: Tue, 6 Aug 2019 11:36:45 +0800
Subject: [PATCH 1250/1587] Unify shabang in ultisnips

---
 UltiSnips/javascript-node.snippets | 2 +-
 UltiSnips/lua.snippets             | 2 +-
 UltiSnips/python.snippets          | 6 +++++-
 UltiSnips/r.snippets               | 3 ++-
 UltiSnips/ruby.snippets            | 2 +-
 UltiSnips/sh.snippets              | 8 ++------
 UltiSnips/zsh.snippets             | 9 ++-------
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/UltiSnips/javascript-node.snippets b/UltiSnips/javascript-node.snippets
index e4a64e959..a46ed7f0a 100644
--- a/UltiSnips/javascript-node.snippets
+++ b/UltiSnips/javascript-node.snippets
@@ -1,6 +1,6 @@
 priority -50
 
-snippet #! "shebang"
+snippet #! "#!/usr/bin/env node" b
 #!/usr/bin/env node
 endsnippet
 
diff --git a/UltiSnips/lua.snippets b/UltiSnips/lua.snippets
index b6d0c1a34..0fd5eefc8 100644
--- a/UltiSnips/lua.snippets
+++ b/UltiSnips/lua.snippets
@@ -3,7 +3,7 @@ priority -50
 #################################
 # Snippets for the Lua language #
 #################################
-snippet #! "Shebang header" b
+snippet #! "#!/usr/bin/env lua" b
 #!/usr/bin/env lua
 $0
 endsnippet
diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index f79cb8567..cdbe517d2 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -5,8 +5,12 @@ priority -50
 ###########################################################################
 
 #! header
-snippet #! "Shebang header for python scripts" b
+snippet #! "#!/usr/bin/env python" b
 #!/usr/bin/env python
+$0
+endsnippet
+
+snippet "^# ?[uU][tT][fF]-?8" "# encoding: UTF-8" r
 # -*- coding: utf-8 -*-
 $0
 endsnippet
diff --git a/UltiSnips/r.snippets b/UltiSnips/r.snippets
index f81b0c9c2..773880b50 100644
--- a/UltiSnips/r.snippets
+++ b/UltiSnips/r.snippets
@@ -15,8 +15,9 @@ FIELD_TYPES = [
 'vector']
 endglobal
 
-snippet #! "Hashbang for Rscript (#!)" b
+snippet #! "#!/usr/bin/env Rscript" b
 #!/usr/bin/env Rscript
+$0
 endsnippet
 
 snippet setwd "Set workingdir" b
diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index cb90a9dbb..7b360ffae 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -21,7 +21,7 @@ endglobal
 # Snippets
 #
 
-snippet "^#!" "#!/usr/bin/env ruby" r
+snippet #! "#!/usr/bin/env ruby" b
 #!/usr/bin/env ruby
 $0
 endsnippet
diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 611b1ce32..9bacc7251 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -25,12 +25,8 @@ endglobal
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
-snippet #!
-`!p snip.rv = '#!/bin/' + getShell() + "\n\n" `
-endsnippet
-
-snippet !env "#!/usr/bin/env (!env)"
-`!p snip.rv = '#!/usr/bin/env ' + getShell() + "\n\n" `
+snippet #! "#!/usr/bin/env (!env)" b
+`!p snip.rv = '#!/usr/bin/env ' + getShell() + "\n" `
 endsnippet
 
 snippet sbash "safe bash options"
diff --git a/UltiSnips/zsh.snippets b/UltiSnips/zsh.snippets
index f7986ea52..678fbd19b 100644
--- a/UltiSnips/zsh.snippets
+++ b/UltiSnips/zsh.snippets
@@ -4,14 +4,9 @@ extends sh
 
 priority -49
 
-snippet #! "shebang" b
-#!/bin/zsh
-
-endsnippet
-
-snippet !env "#!/usr/bin/env (!env)" b
+snippet #! "#!/usr/bin/env zsh" b
 #!/usr/bin/env zsh
-
+$0
 endsnippet
 
 # vim:ft=snippets:

From 08118139b76744502d00ff1ea79d2bedff6b6c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20Nadeau?= <nadeau.emile@gmail.com>
Date: Wed, 7 Aug 2019 13:12:27 +0000
Subject: [PATCH 1251/1587] Remove space between caption and label in figure

---
 snippets/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 895fbe572..24d4ff8ac 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -248,7 +248,7 @@ snippet tikz figure environment (tikzpicture)
 		${2}
 	\\end{tikzpicture}
 	\\end{center}
-	\\caption{${3}}
+	\\caption{${3}}%
 	\\label{fig:${4}}
 	\\end{figure}
 	${0}

From bcdc3a6e3d511b39f380aacf79f396459bfe7fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20Nadeau?= <nadeau.emile@gmail.com>
Date: Wed, 7 Aug 2019 13:17:21 +0000
Subject: [PATCH 1252/1587] Remove the space between caption and label

---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index b3383aec7..355d9e46c 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -85,7 +85,7 @@ snippet fig "Figure environment" b
 \begin{figure}[${2:htpb}]
 	\centering
 	\includegraphics[width=${3:0.8}\linewidth]{${4:name.ext}}
-	\caption{${4/(\w+)\.\w+/\u$1/}$0}
+	\caption{${4/(\w+)\.\w+/\u$1/}$0}%
 	\label{fig:${4/(\w+)\.\w+/$1/}}
 \end{figure}
 endsnippet

From 2bea5ff4c464ce82f008f1b6bc7ad4e99545f4e6 Mon Sep 17 00:00:00 2001
From: kjssad <kimsadomia@protonmail.com>
Date: Sun, 11 Aug 2019 19:15:38 +0800
Subject: [PATCH 1253/1587] Add eelixir comment

---
 snippets/eelixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 9910975af..74f7018e7 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -4,6 +4,8 @@ snippet %
 	<% ${0} %>
 snippet =
 	<%= ${0} %>
+snippet # <%# %>
+	<%# ${0} %>
 snippet end
 	<% end %>
 snippet for

From 955997ec9d5fe589e719448ea0e7f7635dd76a35 Mon Sep 17 00:00:00 2001
From: kjssad <kimsadomia@protonmail.com>
Date: Sun, 11 Aug 2019 19:18:31 +0800
Subject: [PATCH 1254/1587] Add eelixir cond snippet

---
 snippets/eelixir.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 74f7018e7..c85c98fbb 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -22,6 +22,14 @@ snippet ife
 	<% else %>
 		${0}
 	<% end %>
+snippet cond
+	<%= cond do %>
+		<% ${1} -> %>
+			${2:${VISUAL}}
+
+		<% true -> %>
+			${0}
+	<% end %>
 snippet ft
 	<%= form_tag(${1:"/users"}, method: ${2::post}) %>
 		${0}

From 99c28869f4665e462ca9c4b6a2d6e9d3b126e8d5 Mon Sep 17 00:00:00 2001
From: kjssad <kimsadomia@protonmail.com>
Date: Sun, 11 Aug 2019 19:19:12 +0800
Subject: [PATCH 1255/1587] Add eelixir unless snippet

---
 snippets/eelixir.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index c85c98fbb..7f038527a 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -30,6 +30,10 @@ snippet cond
 		<% true -> %>
 			${0}
 	<% end %>
+snippet unless
+	<%= unless ${1} do %>
+		${0:${VISUAL}}
+	<% end %>
 snippet ft
 	<%= form_tag(${1:"/users"}, method: ${2::post}) %>
 		${0}

From 271ef5cb3cbeb896546134172ec3e3896d17f3df Mon Sep 17 00:00:00 2001
From: kjssad <kimsadomia@protonmail.com>
Date: Sun, 11 Aug 2019 19:28:21 +0800
Subject: [PATCH 1256/1587] Add eelixir error tag snippet

---
 snippets/eelixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 7f038527a..991f00f65 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -38,6 +38,8 @@ snippet ft
 	<%= form_tag(${1:"/users"}, method: ${2::post}) %>
 		${0}
 	</form>
+snippet et error_tag
+	<%= error_tag ${1:f}, :${2:field} %>
 snippet lin
 	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete} %>
 snippet ff

From dd31e2eee7e04b46b72746dc7fad35d4b3c3db95 Mon Sep 17 00:00:00 2001
From: kjssad <kimsadomia@protonmail.com>
Date: Sun, 11 Aug 2019 19:29:23 +0800
Subject: [PATCH 1257/1587] Add eelixir text input snippet

---
 snippets/eelixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 991f00f65..bf6e48db1 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -40,6 +40,8 @@ snippet ft
 	</form>
 snippet et error_tag
 	<%= error_tag ${1:f}, :${2:field} %>
+snippet ti text_input
+	<%= text_input ${1:f}, :${2:field} %>
 snippet lin
 	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete} %>
 snippet ff

From 2ff7fc4c308901390231337dfc0670266562c91d Mon Sep 17 00:00:00 2001
From: kjssad <kimsadomia@protonmail.com>
Date: Sun, 11 Aug 2019 19:31:20 +0800
Subject: [PATCH 1258/1587] Add eelixir label snippet

---
 snippets/eelixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index bf6e48db1..8250336e1 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -42,6 +42,8 @@ snippet et error_tag
 	<%= error_tag ${1:f}, :${2:field} %>
 snippet ti text_input
 	<%= text_input ${1:f}, :${2:field} %>
+snippet la label
+	<%= label ${1:f}, :${2:field}, "${3:Label}" %>
 snippet lin
 	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete} %>
 snippet ff

From 3396967c3347f163a474e64f37f225ed0d24059d Mon Sep 17 00:00:00 2001
From: kjssad <kimsadomia@protonmail.com>
Date: Sun, 11 Aug 2019 19:33:22 +0800
Subject: [PATCH 1259/1587] Add eelixir password input snippet

---
 snippets/eelixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 8250336e1..91dc9f176 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -44,6 +44,8 @@ snippet ti text_input
 	<%= text_input ${1:f}, :${2:field} %>
 snippet la label
 	<%= label ${1:f}, :${2:field}, "${3:Label}" %>
+snippet pi password_input
+	<%= password_input ${1:f}, :${2:password} %>
 snippet lin
 	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete} %>
 snippet ff

From 14664576b18e397a6ad7d71c9be64b61a132eb73 Mon Sep 17 00:00:00 2001
From: kjssad <kimsadomia@protonmail.com>
Date: Sun, 11 Aug 2019 19:34:05 +0800
Subject: [PATCH 1260/1587] Add eelixir render snippet

---
 snippets/eelixir.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 91dc9f176..3c90ed1ca 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -46,6 +46,8 @@ snippet la label
 	<%= label ${1:f}, :${2:field}, "${3:Label}" %>
 snippet pi password_input
 	<%= password_input ${1:f}, :${2:password} %>
+snippet render
+	<%= render "${1:index}.html", ${2:var: @var} %>
 snippet lin
 	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete} %>
 snippet ff

From 5dc42dbc6c4d9b5068ddde901b79c5e483c42114 Mon Sep 17 00:00:00 2001
From: kjssad <kimsadomia@protonmail.com>
Date: Sun, 11 Aug 2019 19:55:51 +0800
Subject: [PATCH 1261/1587] Add eelixir snippet descriptions

---
 snippets/eelixir.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 3c90ed1ca..456bed515 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -1,8 +1,8 @@
 extends html
 
-snippet %
+snippet % <% %>
 	<% ${0} %>
-snippet =
+snippet = <%= %>
 	<%= ${0} %>
 snippet # <%# %>
 	<%# ${0} %>
@@ -34,7 +34,7 @@ snippet unless
 	<%= unless ${1} do %>
 		${0:${VISUAL}}
 	<% end %>
-snippet ft
+snippet ft form_tag
 	<%= form_tag(${1:"/users"}, method: ${2::post}) %>
 		${0}
 	</form>
@@ -48,9 +48,9 @@ snippet pi password_input
 	<%= password_input ${1:f}, :${2:password} %>
 snippet render
 	<%= render "${1:index}.html", ${2:var: @var} %>
-snippet lin
+snippet lin link
 	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete} %>
-snippet ff
+snippet ff form_for
 	<%= form_for @changeset, ${1:"/users"}, fn f -> %>
 			${0}
 

From 55b29ff83e9f5b43a138fb42100be6d7b5777d0d Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 3 Sep 2019 20:02:14 +0100
Subject: [PATCH 1262/1587] Rust Rc, unimplemented!()

---
 snippets/rust.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 7a97fdc27..692a0bf16 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -232,3 +232,7 @@ snippet macro "macro_rules!" b
 	}
 snippet box "Box::new()"
 	Box::new(${0:${VISUAL}})
+snippet rc "Rc::new()"
+	Rc::new(${0:${VISUAL}})
+snippet unim "unimplemented!()"
+	unimplemented!()

From 489c641618116779309756cc3bc90aa885c83c5e Mon Sep 17 00:00:00 2001
From: webersa <samuel.weber@univ-grenoble-alpes.fr>
Date: Thu, 12 Sep 2019 15:45:15 +0200
Subject: [PATCH 1263/1587] tex: add tsub and tsup for textsubscript and
 textsuperscript

---
 UltiSnips/tex.snippets | 7 +++++++
 snippets/tex.snippets  | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 355d9e46c..d50ccad81 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -193,6 +193,13 @@ snippet acl "Acroynm expanded" b
 $0
 endsnippet
 
+snippet tsub "Text subscripted" b
+\textsubscript{${1:text}}$0
+endsnippet
+
+snippet tsup "Text superscripted" b
+\textsuperscript{${1:text}}$0
+endsnippet
 
 
 snippet ni "Non-indented paragraph" b
diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 24d4ff8ac..0f8f9c03d 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -222,6 +222,10 @@ snippet rm roman font text
 	\\textrm{${1:${VISUAL:text}}}${0}
 snippet tt typewriter (monospace) text
 	\\texttt{${1:${VISUAL:text}}}${0}
+snippet tsub subscripted text
+	\\textsubscript{${1:${VISUAL:text}}}${0}
+snippet tsup superscripted text
+	\\textsuperscript{${1:${VISUAL:text}}}${0}
 #Math font
 snippet mf mathfrak
 	\\mathfrak{${1:${VISUAL:text}}}${0}

From 2eb49231b70d6d79d950b2ba39b59f79d8acf2a3 Mon Sep 17 00:00:00 2001
From: webersa <samuel.weber@univ-grenoble-alpes.fr>
Date: Fri, 13 Sep 2019 15:18:11 +0200
Subject: [PATCH 1264/1587] Remove UltiSnips snippet (format is compatible to
 all plugins)

---
 UltiSnips/tex.snippets | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index d50ccad81..16286c8f9 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -193,15 +193,6 @@ snippet acl "Acroynm expanded" b
 $0
 endsnippet
 
-snippet tsub "Text subscripted" b
-\textsubscript{${1:text}}$0
-endsnippet
-
-snippet tsup "Text superscripted" b
-\textsuperscript{${1:text}}$0
-endsnippet
-
-
 snippet ni "Non-indented paragraph" b
 \noindent
 $0

From 2221222df8cbc1a99c29f3e55a7c340f4d16b1ff Mon Sep 17 00:00:00 2001
From: webersa <samuel.weber@univ-grenoble-alpes.fr>
Date: Fri, 13 Sep 2019 15:20:56 +0200
Subject: [PATCH 1265/1587] add blank lines to match master branch

---
 UltiSnips/tex.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 16286c8f9..355d9e46c 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -193,6 +193,8 @@ snippet acl "Acroynm expanded" b
 $0
 endsnippet
 
+
+
 snippet ni "Non-indented paragraph" b
 \noindent
 $0

From db67e54d5998dbfbe9fe4161a29d74323031b1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20N=C3=B8rgaard?= <b@noergaard.dk>
Date: Thu, 19 Sep 2019 14:38:51 +0200
Subject: [PATCH 1266/1587] Add go table test

This is a very common pattern when writing tests in go. It really needs
a snippet.
---
 snippets/go.snippets | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index bd7f541ae..0dab5e2b9 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -222,6 +222,23 @@ snippet test "test function"
 		${0:${VISUAL}}
 	}
 
+snippet testt "table test function"
+	func Test${1:name}(t *testing.T) {
+		tests := []struct {
+			name string 
+		}{
+			{
+				name: "${2:test name}",
+			},
+		}
+
+		for _, test := range tests {
+			t.Run(test.name, func(t *testing.T) {
+				${0:${VISUAL}}
+			}
+		}
+	}
+
 snippet bench "benchmark function"
 	func Benchmark${1:name}(b *testing.B) {
 		for i := 0; i < b.N; i++ {

From 67f54554409660af1b34562906c9feab4e2d9909 Mon Sep 17 00:00:00 2001
From: Johannes Raggam <thetetet@gmail.com>
Date: Thu, 26 Sep 2019 09:21:00 +0200
Subject: [PATCH 1267/1587] snippets for vue-i18n

---
 snippets/vue.snippets | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/snippets/vue.snippets b/snippets/vue.snippets
index 0f14caecd..61c06af68 100644
--- a/snippets/vue.snippets
+++ b/snippets/vue.snippets
@@ -176,3 +176,14 @@ snippet vstore
 			${1:key}: ${2:value}
 		}
 	});
+
+
+# vue-i18n snippets https://github.com/kazupon/vue-i18n
+
+snippet trans
+	$t('$1')
+
+# Translation with parameter
+snippet transc
+	$t('$1', { $2: $3 })
+

From eb76bee6e7b610298dfccb9653b1e6dbb571b0c8 Mon Sep 17 00:00:00 2001
From: Jeremy Lloyd Conlin <jlconlin@lanl.gov>
Date: Tue, 1 Oct 2019 10:47:14 -0600
Subject: [PATCH 1268/1587] Adding some generic parentheses snippets.

---
 UltiSnips/all.snippets | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index c50e69132..5b7442540 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -107,4 +107,23 @@ snippet uuid "Random UUID" w
 `!p if not snip.c: import uuid; snip.rv = uuid.uuid4()`
 endsnippet
 
+
+#################
+#  Parentheses  #
+#################
+snippet () "Parentheses surround" A
+$1(${2:${VISUAL}})$0
+endsnippet
+
+snippet [] "Bracket surround" A
+$1[${2:${VISUAL}}]$0
+endsnippet
+
+snippet {} "Brace surround" A
+$1{${2:${VISUAL}}}$0
+endsnippet
+
+snippet <> "Angle surround" A
+$1<${2:${VISUAL}}>$0
+endsnippet
 # vim:ft=snippets:

From 666e9a8d6515c697ae6acab699a25cace6bca149 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Thu, 3 Oct 2019 11:51:21 +0100
Subject: [PATCH 1269/1587] Revert "Adding some generic parentheses snippets."

This reverts commit eb76bee6e7b610298dfccb9653b1e6dbb571b0c8.
---
 UltiSnips/all.snippets | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 5b7442540..c50e69132 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -107,23 +107,4 @@ snippet uuid "Random UUID" w
 `!p if not snip.c: import uuid; snip.rv = uuid.uuid4()`
 endsnippet
 
-
-#################
-#  Parentheses  #
-#################
-snippet () "Parentheses surround" A
-$1(${2:${VISUAL}})$0
-endsnippet
-
-snippet [] "Bracket surround" A
-$1[${2:${VISUAL}}]$0
-endsnippet
-
-snippet {} "Brace surround" A
-$1{${2:${VISUAL}}}$0
-endsnippet
-
-snippet <> "Angle surround" A
-$1<${2:${VISUAL}}>$0
-endsnippet
 # vim:ft=snippets:

From be577b7aa91c3b3d5706d25d14397ab13357131c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20M=C3=BCller?= <gsenpo@gmail.com>
Date: Fri, 4 Oct 2019 16:33:53 +0200
Subject: [PATCH 1270/1587] Remove redundant whitespaces from comment format

---
 pythonx/vimsnippets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index d1cee17b9..510fe7206 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -69,7 +69,7 @@ def get_comment_format():
     commentstring = vim.eval("&commentstring")
     if commentstring.endswith("%s"):
         c = commentstring[:-2]
-        return (c, c, c, "")
+        return (c.rstrip(), c.rstrip(), c.rstrip(), "")
     comments = _parse_comments(vim.eval("&comments"))
     for c in comments:
         if c[0] == "SINGLE_CHAR":

From d92a3fd7a0b823c7b6a97287918bc37b5f14ab87 Mon Sep 17 00:00:00 2001
From: yatoogamii <bracaval.elias.pro@gmail.com>
Date: Mon, 7 Oct 2019 11:56:00 +0200
Subject: [PATCH 1271/1587] fix typo into sass/css.snippets jc:st = strech not
 space-evenly

---
 snippets/css.snippets  | 2 +-
 snippets/sass.snippets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/css.snippets b/snippets/css.snippets
index 54b529ae7..879cb3c72 100644
--- a/snippets/css.snippets
+++ b/snippets/css.snippets
@@ -724,7 +724,7 @@ snippet jc:sa
 snippet jc:se
 	justify-content: space-evenly;
 snippet jc:st
-	justify-content: space-evenly;
+	justify-content: stretch;
 snippet jc:l
 	justify-content: left;
 snippet jc:r
diff --git a/snippets/sass.snippets b/snippets/sass.snippets
index 5bef59377..30bac6c7e 100644
--- a/snippets/sass.snippets
+++ b/snippets/sass.snippets
@@ -722,7 +722,7 @@ snippet jc:sa
 snippet jc:se
 	justify-content: space-evenly
 snippet jc:st
-	justify-content: space-evenly
+	justify-content: stretch
 snippet jc:l
 	justify-content: left
 snippet jc:r

From 9e323311e5fff93482aeaebd4ae3a1c6339ca6f8 Mon Sep 17 00:00:00 2001
From: yatoogamii <bracaval.elias.pro@gmail.com>
Date: Mon, 7 Oct 2019 19:11:11 +0200
Subject: [PATCH 1272/1587] added some basic typescript snippets

---
 snippets/typescript.snippets | 42 ++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/snippets/typescript.snippets b/snippets/typescript.snippets
index aa87242fb..fddbeb1c6 100644
--- a/snippets/typescript.snippets
+++ b/snippets/typescript.snippets
@@ -1 +1,43 @@
 extends javascript
+
+snippet tconst "ts const"
+	const ${1}: ${2:any} = ${3};
+	${0}
+snippet tlet "ts let"
+	let ${1}: ${2:any} = ${3};
+	${0}
+snippet tvar "ts var"
+	var ${1}: ${2:any} = ${3};
+	${0}
+snippet + "var: type"
+	${1}: ${0:any}
+snippet int "interface"
+	interface ${1} {
+		${2}: ${3:any};
+		${0}
+	}
+snippet intx "interface extends"
+	interface ${1} extends ${2} {
+		${3}: ${4:any};
+		${0}
+	}
+snippet tfun "ts function"
+	function ${1}(${2}): ${3:any} {
+		${0}
+	}
+snippet tcla "ts class"
+	class ${1} {
+		${2}
+		constructor(public ${3}: ${4: any}) {
+			${5}
+		}
+		${0}
+	}
+snippet tclax "ts class extends"
+	class ${1} extends ${2} {
+		${3}
+		constructor(public ${4}: ${5: any}) {
+			${6}
+		}
+		${0}
+	}

From c965ce0710f9d2e88fc74ad803f0534f3f7928ab Mon Sep 17 00:00:00 2001
From: Enjoy <kanneg881@gmail.com>
Date: Sat, 12 Oct 2019 09:59:31 +0800
Subject: [PATCH 1273/1587] Add vim filename snippet in the snippets folder

---
 snippets/vim.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index 6822b8a98..ad35df737 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -76,3 +76,5 @@ snippet im
 	imap ${1} ${2}
 snippet exe
 	execute ${1}
+snippet filename
+	`Filename()`

From 5ee6d319bb895bb6672f253798263f53a93c2a06 Mon Sep 17 00:00:00 2001
From: baxter2 <baxcallan@gmail.com>
Date: Fri, 11 Oct 2019 00:25:15 +1100
Subject: [PATCH 1274/1587] Fix 'async function' snippet alias so it doesn't
 colide with 'function' snippet alias.

---
 snippets/javascript/javascript.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 8cf7c6e01..dae4c7ef2 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -9,7 +9,8 @@ snippet fun "function"
 	function ${1:function_name}(${2}) {
 		${0:${VISUAL}}
 	}
-snippet fun "async function"
+# Asynchronous Function
+snippet asf "async function"
 	async function ${1:function_name}(${2}) {
 		${0:${VISUAL}}
 	}

From 987d4d8a3f3138168a3cf8b225c1c43c3a3bddeb Mon Sep 17 00:00:00 2001
From: "alessandro.candini" <candini@ariadne.it>
Date: Wed, 16 Oct 2019 12:48:53 +0200
Subject: [PATCH 1275/1587] Extend freemarker snippets

[master | master]
---
 snippets/freemarker.snippets | 60 +++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 11 deletions(-)

diff --git a/snippets/freemarker.snippets b/snippets/freemarker.snippets
index 0114ac4c7..348542898 100644
--- a/snippets/freemarker.snippets
+++ b/snippets/freemarker.snippets
@@ -1,27 +1,65 @@
 extends html
 
-snippet assign
-	<#assign ${1} = ${0:${VISUAL}} />
+snippet int "${interpolation}"
+	\${${0:interpolation${VISUAL}}\}
 
-snippet if
-	<#if ${1}>
+snippet intd "${interpolation!"default_string"}"
+	\${${0:interpolation${VISUAL}}!"${1:default_string}"\}
+
+snippet com "<#-- comment -->"
+	<#-- ${0:comment${VISUAL}} -->
+
+snippet ass "<#assign variable_name = value />"
+	<#assign ${1:variable_name} = ${0:value${VISUAL}} />
+
+snippet assm "<#assign <#-- multiple lines --> />"
+	<#assign
+		${1:variable_name} = ${0:value${VISUAL}}
+	/>
+
+snippet loc "<#local variable_name = value />"
+	<#local ${1:variable_name} = ${0:value${VISUAL}} />
+
+snippet locm "<#local <#-- multiple lines --> />"
+	<#local
+		${1:variable_name} = ${0:value${VISUAL}}
+	/>
+
+snippet inc "<#include \"file.ftl\" />"
+	<#include "${0:file.ftl${VISUAL}}" />
+
+snippet if "<#if condition>...</#if>"
+	<#if ${1:true}>
 		${0:${VISUAL}}
 	</#if>
 
-snippet ife
-	<#if ${1}>
-		${2:${VISUAL}}
+snippet ife "<#if condition>...<#else>...</#if>"
+	<#if ${1:true}>
+		${0:${VISUAL}}
 	<#else>
-		${0}
+		${2}
 	</#if>
 
-snippet list
-	<#list ${1} as ${2}>
+snippet lis "<#list sequence as element>...</#list>"
+	<#list ${1:sequence} as ${2:element}>
 		${0:${VISUAL}}
 	</#list>
 
-snippet attempt
+snippet mac "<#macro macro_name param1>...</#macro>"
+	<#macro ${1:macro_name} ${2:param1}>
+		${0:${VISUAL}}
+	</#macro>
+
+snippet fun "<#function function_name param1>...</#function>"
+	<#function ${1:function_name} ${2:param1}>
+		${0:${VISUAL}}
+	</#function>
+
+snippet att "<#attempt>...<#recover></#attempt>"
 	<#attempt>
 		${0:${VISUAL}}
 	<#recover>
 	</#attempt>
+
+snippet the "?then(true, false)"
+	?then(${1:true}, ${0:false${VISUAL}})

From 36dcd284108db9594435993a539f1ddae24f4ea4 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 18 Oct 2019 16:31:13 +0100
Subject: [PATCH 1276/1587] Golang syntax error

---
 snippets/go.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 0dab5e2b9..b8d3e6f89 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -225,7 +225,7 @@ snippet test "test function"
 snippet testt "table test function"
 	func Test${1:name}(t *testing.T) {
 		tests := []struct {
-			name string 
+			name string
 		}{
 			{
 				name: "${2:test name}",
@@ -235,7 +235,7 @@ snippet testt "table test function"
 		for _, test := range tests {
 			t.Run(test.name, func(t *testing.T) {
 				${0:${VISUAL}}
-			}
+			})
 		}
 	}
 

From b8261628b55b6733e245dbf55f0ed8cc1a9371cd Mon Sep 17 00:00:00 2001
From: Alessandro Candini <canduc17@gmail.com>
Date: Sun, 20 Oct 2019 14:22:25 +0100
Subject: [PATCH 1277/1587] Update freemarker snippets

---
 snippets/freemarker.snippets | 39 ++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/snippets/freemarker.snippets b/snippets/freemarker.snippets
index 348542898..1030f52a4 100644
--- a/snippets/freemarker.snippets
+++ b/snippets/freemarker.snippets
@@ -1,65 +1,74 @@
 extends html
 
+# Freemarker version
+snippet ver "${.version}"
+	\${.version}
+# Interpolation
 snippet int "${interpolation}"
 	\${${0:interpolation${VISUAL}}\}
-
+# Interpolation with default string
 snippet intd "${interpolation!"default_string"}"
 	\${${0:interpolation${VISUAL}}!"${1:default_string}"\}
-
+# Comment
 snippet com "<#-- comment -->"
 	<#-- ${0:comment${VISUAL}} -->
-
+# Variable assignment on a single line
 snippet ass "<#assign variable_name = value />"
 	<#assign ${1:variable_name} = ${0:value${VISUAL}} />
-
+# Variable assignments on multiple lines
 snippet assm "<#assign <#-- multiple lines --> />"
 	<#assign
 		${1:variable_name} = ${0:value${VISUAL}}
 	/>
-
+# Local variable assignment on a single
 snippet loc "<#local variable_name = value />"
 	<#local ${1:variable_name} = ${0:value${VISUAL}} />
-
+# Local variable assignments on multiple lines
 snippet locm "<#local <#-- multiple lines --> />"
 	<#local
 		${1:variable_name} = ${0:value${VISUAL}}
 	/>
-
+# Include Freemarker file
 snippet inc "<#include \"file.ftl\" />"
 	<#include "${0:file.ftl${VISUAL}}" />
-
+# If statement
 snippet if "<#if condition>...</#if>"
 	<#if ${1:true}>
 		${0:${VISUAL}}
 	</#if>
-
+# If/else statement
 snippet ife "<#if condition>...<#else>...</#if>"
 	<#if ${1:true}>
 		${0:${VISUAL}}
 	<#else>
 		${2}
 	</#if>
-
+# Iteration over a sequence
 snippet lis "<#list sequence as element>...</#list>"
 	<#list ${1:sequence} as ${2:element}>
 		${0:${VISUAL}}
 	</#list>
-
+# Iteration over an hashmap
+snippet lish "<#list hashmap?keys as element>...</#list>"
+	<#list ${1:hashmap}?keys as ${2:key}>
+		\${$2\}: \${$1[$2]\}${0:${VISUAL}}
+	</#list>
+# Macro statement
 snippet mac "<#macro macro_name param1>...</#macro>"
 	<#macro ${1:macro_name} ${2:param1}>
 		${0:${VISUAL}}
 	</#macro>
-
+# Function statement
 snippet fun "<#function function_name param1>...</#function>"
 	<#function ${1:function_name} ${2:param1}>
 		${0:${VISUAL}}
 	</#function>
-
+# Attempt statement (try-catch to prevent runtime exceptions)
 snippet att "<#attempt>...<#recover></#attempt>"
 	<#attempt>
 		${0:${VISUAL}}
 	<#recover>
 	</#attempt>
-
-snippet the "?then(true, false)"
+# Then built-in for booleans
+snippet ?th "?then(true, false)"
 	?then(${1:true}, ${0:false${VISUAL}})

From 9ccd2ac19010b80deb7bebe36d91c70bae26e259 Mon Sep 17 00:00:00 2001
From: baxter2 <baxcallan@gmail.com>
Date: Wed, 23 Oct 2019 14:20:38 +1100
Subject: [PATCH 1278/1587] extend javascript snippets.

---
 snippets/javascript/javascript.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index dae4c7ef2..147e897fd 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -283,6 +283,8 @@ snippet timeout
 	setTimeout(function () {${0}}${2}, ${1:10});
 snippet const
 	const ${1} = ${0};
+snippet constn
+	const ${1} = new ${0};
 snippet let
 	let ${1} = ${0};
 snippet im "import xyz from 'xyz'"

From 0e5c36c4fec8ae2abe0ce334dbc58c82b094705a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20L=C3=A9vigne?= <florent.levigne@obspm.fr>
Date: Thu, 24 Oct 2019 17:18:36 +0200
Subject: [PATCH 1279/1587] Respect puppet style guide

No spaces between the title and colon.
---
 snippets/puppet.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index adb781dd8..5a1dd6a13 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -207,7 +207,7 @@ snippet define
 	}
 
 snippet service
-	service { "${1:service}" :
+	service { "${1:service}":
 		ensure    => running,
 		enable    => true,
 		require   => [ Package["${2:package}"], File["${3:file}"], ],
@@ -215,7 +215,7 @@ snippet service
 	}
 
 snippet file
-	file { "${1:filename}" :
+	file { "${1:filename}":
 		ensure  => ${2:present},
 		owner   => "${3:root}",
 		group   => "${4:root}",
@@ -227,7 +227,7 @@ snippet file
 	}
 
 snippet archive
-	archive { "${1:filename}" :
+	archive { "${1:filename}":
 		ensure     => ${2:present},
 		url        => "http://${3:url}",
 		extension  => "${4:tgz}",
@@ -237,7 +237,7 @@ snippet archive
 	}
 
 snippet firewall
-	firewall { "${1:comment}" :
+	firewall { "${1:comment}":
 		proto	=> ${2:tcp},
 		action	=> ${3:accept},
 		port	=> ${4},

From 8a0dd8ea4af3485ecb0fb875cdbf919067c99a33 Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Thu, 31 Oct 2019 12:08:46 +0800
Subject: [PATCH 1280/1587] refactor complete function to allow 'fuzzy' match

---
 pythonx/vimsnippets.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index 510fe7206..4fce07f70 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -1,25 +1,25 @@
 """Helper methods used in UltiSnips snippets."""
 
-import string, vim
+import string, vim, re
 
 def complete(tab, opts):
     """
-    get options that start with tab
+    get options that match with tab
 
     :param tab: query string
     :param opts: list that needs to be completed
 
-    :return: a string that start with tab
+    :return: a string that match with tab
     """
-    msg = "({0})"
-    if tab:
-        opts = [m[len(tab):] for m in opts if m.startswith(tab)]
-    if len(opts) == 1:
-        return opts[0]
-
-    if not len(opts):
-        msg = "{0}"
-    return msg.format("|".join(opts))
+    el = [x for x in tab]
+    pat = "".join(list(map(lambda x: x + "\w*" if re.match("\w", x) else x,
+                           el)))
+    mats = [x for x in opts if re.search(pat, x, re.IGNORECASE)]
+    if len(mats) == 0 or str.lower(tab) in list(map(str.lower, mats)):
+        return ""
+    cads = "|".join(mats[:5])
+    if len(mats) > 5: cads += "|..."
+    return "({0})".format(cads)
 
 def _parse_comments(s):
     """ Parses vim's comments option to extract comment format """

From 7b6991e17e057f5ec44ea05be69c1e8979b2ac6c Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Thu, 31 Oct 2019 14:57:49 +0800
Subject: [PATCH 1281/1587] deal with exception of complete function

---
 pythonx/vimsnippets.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index 4fce07f70..4666bc74b 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -14,11 +14,14 @@ def complete(tab, opts):
     el = [x for x in tab]
     pat = "".join(list(map(lambda x: x + "\w*" if re.match("\w", x) else x,
                            el)))
-    mats = [x for x in opts if re.search(pat, x, re.IGNORECASE)]
-    if len(mats) == 0 or str.lower(tab) in list(map(str.lower, mats)):
+    try:
+        opts = [x for x in opts if re.search(pat, x, re.IGNORECASE)]
+    except:
+        opts = [x for x in opts if x.startswith(tab)]
+    if not len(opts) or str.lower(tab) in list(map(str.lower, opts)):
         return ""
-    cads = "|".join(mats[:5])
-    if len(mats) > 5: cads += "|..."
+    cads = "|".join(opts[:5])
+    if len(opts) > 5: cads += "|..."
     return "({0})".format(cads)
 
 def _parse_comments(s):

From c059abfbd2d2b988180dcbeaed7c87cb15d9126a Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Thu, 31 Oct 2019 22:28:03 +0800
Subject: [PATCH 1282/1587] refine rst snippets

---
 UltiSnips/rst.snippets | 59 +++++++++++++++++++++++++-----------------
 snippets/rst.snippets  | 43 ++++++++++++++++--------------
 2 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index efd8c86d9..a07074e4c 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -14,34 +14,37 @@ from collections import Counter
 
 from vimsnippets import complete
 
-#http://docutils.sourceforge.net/docs/ref/rst/roles.html
-TEXT_ROLES = ['emphasis','literal','code','math',
-			  'pep-reference','rfc-reference',
-			  'strong','subscript','superscript',
-			  'title-reference','raw']
+# http://docutils.sourceforge.net/docs/ref/rst/roles.html
+TEXT_ROLES = ['emphasis', 'literal', 'code', 'math',
+			  'pep-reference', 'rfc-reference',
+			  'strong', 'subscript', 'superscript',
+			  'title-reference', 'raw']
 TEXT_ROLES_REGEX = r'\.\.\srole::?\s(w+)'
 
-#http://docutils.sourceforge.net/docs/ref/rst/directives.html#specific-admonitions
+# http://docutils.sourceforge.net/docs/ref/rst/directives.html#specific-admonitions
 SPECIFIC_ADMONITIONS = ["attention", "caution", "danger",
 						"error", "hint", "important", "note",
 						"tip", "warning"]
-#http://docutils.sourceforge.net/docs/ref/rst/directives.html
-DIRECTIVES = ['topic','sidebar','math','epigraph',
-			  'parsed-literal','code','highlights',
-			  'pull-quote','compound','container','table','csv-table',
-			  'list-table','class','sectnum',
-			  'role','default-role','unicode',
-			  'raw']
+# http://docutils.sourceforge.net/docs/ref/rst/directives.html
+DIRECTIVES = ['code', 'contents', 'admonition', 'table', 'csv-table', 'list-table',
+			  'class', 'container', 'sidebar', 'topic', 'title',
+			  'role', 'default-role', 'raw']
 
-NONE_CONTENT_DIRECTIVES = ['rubric', 'contents', 'header',
-						   'footer', 'date', 'include', 'title']
+# DIRECTIVES_WITHOUT_TITLE means directive arguments equal None
+DIRECTIVES_WITHOUT_TITLE = ['math', 'meta', 'parsed-literal', 'line-block',
+							'header', 'compound', 'highlights', 'pull-quote',
+							'footer', 'epigraph', 'rubric', 'sectnum']
 
 INCLUDABLE_DIRECTIVES = ['image', 'figure', 'include']
+
+# Directives for Subsubsection Definition
+DIRECTIVES_FOR_SUBSTITUTION = ['replace', 'unicode', 'date']
+
 # CJK chars
 # http://stackoverflow.com/questions/2718196/find-all-chinese-text-in-a-string-using-python-and-regex
 CJK_RE = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-鿃豈-鶴侮-頻並-龎]', re.UNICODE)
 
-#http://www.pygal.org/en/stable/documentation/types/index.html
+# http://www.pygal.org/en/stable/documentation/types/index.html
 CHART_TYPES = ["Line", "StackedLine", "HorizontalLine", "Bar", "StackedBar", "HorizontalBar", "Histogram", "XY", "DateLine", "TimeLine", "TimeDeltaLine", "DateTimeLine", "Pie", "Radar", "Box", "Dot", "Funnel", "Gauge", "SolidGauge", "Pyramid", "Treemap"]
 
 def has_cjk(s):
@@ -264,23 +267,30 @@ snippet di "Directives" b
 $0
 endsnippet
 
-snippet nd "None Content Directives" b
-.. $1`!p snip.rv=complete(t[1], NONE_CONTENT_DIRECTIVES)`:: $2
+snippet dt "Directives without title" b
+.. $1`!p snip.rv=complete(t[1], DIRECTIVES_WITHOUT_TITLE)`::
+
+	${2:${VISUAL:Content}}
+$0
+endsnippet
+
+snippet ds "Directives for subscription" b
+.. |$1| $2`!p snip.rv=complete(t[2], DIRECTIVES_FOR_SUBSTITUTION)`:: ${3:Content}
 $0
 endsnippet
 
 snippet sa "Specific Admonitions" b
-.. $1`!p snip.rv =complete(t[1], SPECIFIC_ADMONITIONS)`::
+.. $1`!p snip.rv =complete(t[1], SPECIFIC_ADMONITIONS)`:: $2
 
-	${2:${VISUAL:Content}}
+	${3:${VISUAL:Content}}
 
 $0
 endsnippet
 
-#it will be trigger at start of line or after a word
+# it will be trigger at start of line or after a word
 snippet ro "Text Roles" w
 \ :$1`!p snip.rv=complete(t[1],
-						  TEXT_ROLES+look_up_directives(TEXT_ROLES_REGEX,
+							   TEXT_ROLES+look_up_directives(TEXT_ROLES_REGEX,
 														path))`:\`$2\`\
 endsnippet
 
@@ -306,7 +316,7 @@ snippet chart "Pygal chart for Nikola" b
 .. chart:: $1`!p snip.rv=complete(t[1], CHART_TYPES)`
 	:title: '${2:Browser usage evolution (in %)}'
 	:x_labels: [${3:"2002", "2003", "2004", "2005", "2006", "2007"}]
-	
+
 	'Firefox', [None, None, 0, 16.6, 25, 31]
 	'Chrome',  [None, None, None, None, None, None]
 	'IE',      [85.8, 84.6, 84.7, 74.5, 66, 58.6]
@@ -323,4 +333,5 @@ snippet sid "SideBar" b
 
 	${2:${VISUAL:SideBar Content}}
 endsnippet
-# vim:ft=snippets:
+
+# vim:set list noet sts=0 sw=4 ts=4:
diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index dd47863ed..31b4fec20 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -19,16 +19,17 @@ snippet -
 	${0}
 #some directive
 snippet img:
-	.. |${0:alias}| image:: ${1:img}
+	.. |${1:alias}| image:: ${0:img}
 snippet fig:
 	.. figure:: ${1:img}
-		:alt: ${0:alter text}
+		:alt: ${2:alter text}
+
+		$0
+snippet con:
+	.. contents:: ${1:Table of Contents}
 
-		$2
-snippet cont:
-	.. contents::
 		${0:content}
-snippet code:
+snippet cod:
 	.. code:: ${1:type}
 
 		${0:write some code}
@@ -65,34 +66,36 @@ snippet tod:
 	.. todo::
 		${0}
 snippet lis:
-	.. list-table:: ${0:Title}
+	.. list-table:: ${1:Title}
 		:header-rows: 1
-		:stub-columns: 1
+		:stub-columns: 0
 
-		* - x1,y1
-		  - x2,y1
-		  - x3,y1
-		* - x1,y2
-		  - x2,y2
-		  - x3,y2
-		* - x1,y3
-		  - x2,y3
-		  - x3,y3
+		* - ${0:R1C1}
+		  - R1C2
+		* - R2C1
+		  - R2C2
+snippet csv:
+	.. csv-table:: ${1:Title}
+		:header-rows: 1
+		:stub-columns: 0
 
+		${0:R1C1}, R1C2
+		R2C1, R2C2
 snippet toc:
 	.. toctree::
 		:maxdepth: 2
 
 		${0}
 snippet dow:
-	:download:\`${0:text} <${1:path}>\`
+	:download:\`${1:text} <${0:path}>\`
 snippet ref:
-	:ref:\`${0:text} <${1:path}>\`
+	:ref:\`${1:text} <${0:path}>\`
 snippet doc:
-	:doc:`${0:text} <${1:path}>`
+	:doc:\`${1:text} <${0:path}>\`
 # CJK optimize, CJK has no space between charaters
 snippet *c
 	\ *${1:Emphasis}*\ ${0}
 snippet **c
 	\ **${1:Strong emphasis}**\ ${0}
 
+# vim:set list noet sts=0 sw=4 ts=4:

From 7a8436882340ad2c759ca6ac5e94db3f37c4f904 Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Tue, 5 Nov 2019 22:32:17 +0800
Subject: [PATCH 1283/1587] Update table for markdown

---
 UltiSnips/markdown.snippets | 71 ++++++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 20 deletions(-)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index 577554c36..bc8664bb0 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -1,25 +1,55 @@
 priority -50
 
 global !p
+# A overkill(dirty) table with automatic alignment feature
 def create_table(snip):
-    # retrieving single line from current string and treat it like tabstops count
-    placeholders_string = snip.buffer[snip.line].strip()[2:].split("x",1)
-    rows_amount = int(placeholders_string[0])
-    columns_amount = int(placeholders_string[1])
-
-    # erase current line
-    snip.buffer[snip.line] = ''
-
-    # create anonymous snippet with expected content and number of tabstops
-    anon_snippet_title = ' | '.join(['$' + str(col) for col in range(1,columns_amount+1)]) + "\n"
-    anon_snippet_delimiter = ':-|' * (columns_amount-1) + ":-\n"
-    anon_snippet_body = ""
-    for row in range(1,rows_amount+1):
-        anon_snippet_body += ' | '.join(['$' + str(row*columns_amount+col) for col in range(1,columns_amount+1)]) + "\n"
-    anon_snippet_table = anon_snippet_title + anon_snippet_delimiter + anon_snippet_body
-
-    # expand anonymous snippet
-    snip.expand_anon(anon_snippet_table)
+	# retrieving single line from current string and treat it like tabstops count
+	placeholders_string = snip.buffer[snip.line].strip()
+	rows_amount = int(placeholders_string[0])
+	columns_amount = int(placeholders_string[1])
+
+	prefix_str = "from vimsnippets import display_width;"
+
+	# erase current line
+	snip.buffer[snip.line] = ""
+
+	# create anonymous snippet with expected content and number of tabstops
+	anon_snippet_title = "| "
+	anon_snippet_delimiter = "|"
+	for col in range(1, columns_amount+1):
+		sync_rows = [x*columns_amount+col for x in range(rows_amount+1)]
+		sync_str = ",".join(["t[{0}]".format(x) for x in sync_rows])
+		max_width_str = "max(list(map(display_width, [" + sync_str + "])))"
+		cur_width_str = "display_width(t[" + str(col) + "])"
+		rv_val = "(" + max_width_str + "-" + cur_width_str + ")*' '"
+		anon_snippet_title += "${" + str(col)  + ":head" + str(col)\
+			+ "}`!p " + prefix_str + "snip.rv=" + rv_val + "` | "
+		anon_snippet_delimiter += ":`!p " + prefix_str + "snip.rv = "\
+			+ max_width_str + "*'-'" + "`-|"
+
+	anon_snippet_title += "\n"
+
+	anon_snippet_delimiter += "\n"
+	anon_snippet_body = ""
+	for row in range(1, rows_amount+1):
+		body_row = "| "
+		for col in range(1, columns_amount+1):
+			sync_rows = [x*columns_amount+col for x in range(rows_amount+1)]
+			sync_str = ",".join(["t[{0}]".format(x) for x in sync_rows])
+			max_width_str = "max(list(map(display_width, [" + sync_str + "])))"
+			cur_width_str = "display_width(t[" + str(row*columns_amount+col) + "])"
+			rv_val = "(" + max_width_str + "-" + cur_width_str + ")*' '"
+			placeholder = "R{0}C{1}".format(row, col)
+			body_row += "${" + str(row*columns_amount+col)  + ":" + placeholder\
+				+ "}`!p " + prefix_str + "snip.rv=" + rv_val + "` | "
+
+		body_row += "\n"
+		anon_snippet_body += body_row
+
+	anon_snippet_table = anon_snippet_title + anon_snippet_delimiter + anon_snippet_body
+
+	# expand anonymous snippet
+	snip.expand_anon(anon_snippet_table)
 endglobal
 
 ###########################
@@ -101,8 +131,9 @@ snippet fnt "Footnote"
 [^$1]:${2:Text}
 endsnippet
 
-pre_expand "create_table(snip)"
-snippet "tb(\d+x\d+)" "Customizable table" br
+post_jump "create_table(snip)"
+snippet "tb([1-9][1-9])" "Fancy table" br
+`!p snip.rv = match.group(1)`
 endsnippet
 
 # vim:ft=snippets:

From 6f92e631db4fa0c8494bc09c6235cf8f9918eb71 Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Tue, 5 Nov 2019 22:28:10 +0800
Subject: [PATCH 1284/1587] Remove unnecessary modules import; Move has_cjk,
 display_width to vimsnippets.py for common use

---
 UltiSnips/rst.snippets | 52 +++++++++++-------------------------------
 pythonx/vimsnippets.py | 23 +++++++++++++++++++
 2 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index a07074e4c..6e31e6164 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -6,13 +6,8 @@ priority -50
 #							   General Stuff							  #
 ###########################################################################
 global !p
-import vim
-from os import path as ospath
-from string import Template
-import re
 from collections import Counter
-
-from vimsnippets import complete
+from vimsnippets import complete, has_cjk, display_width
 
 # http://docutils.sourceforge.net/docs/ref/rst/roles.html
 TEXT_ROLES = ['emphasis', 'literal', 'code', 'math',
@@ -40,22 +35,14 @@ INCLUDABLE_DIRECTIVES = ['image', 'figure', 'include']
 # Directives for Subsubsection Definition
 DIRECTIVES_FOR_SUBSTITUTION = ['replace', 'unicode', 'date']
 
-# CJK chars
-# http://stackoverflow.com/questions/2718196/find-all-chinese-text-in-a-string-using-python-and-regex
-CJK_RE = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-鿃豈-鶴侮-頻並-龎]', re.UNICODE)
-
 # http://www.pygal.org/en/stable/documentation/types/index.html
 CHART_TYPES = ["Line", "StackedLine", "HorizontalLine", "Bar", "StackedBar", "HorizontalBar", "Histogram", "XY", "DateLine", "TimeLine", "TimeDeltaLine", "DateTimeLine", "Pie", "Radar", "Box", "Dot", "Funnel", "Gauge", "SolidGauge", "Pyramid", "Treemap"]
 
-def has_cjk(s):
-	"""Detect if s contains CJK characters."""
-	return CJK_RE.search(s) is not None
-
 def real_filename(filename):
 	"""pealeextension name off if possible
 	# i.e. "foo.bar.png will return "foo.bar"
 	"""
-	return ospath.splitext(filename)[0]
+	return os.path.splitext(filename)[0]
 
 def check_file_exist(rst_path, relative_path):
 	"""
@@ -65,23 +52,10 @@ def check_file_exist(rst_path, relative_path):
 	:param relative_path: path related to rst file
 	:return: relative file's absolute path if file exist
 	"""
-	abs_path = ospath.join(ospath.dirname(rst_path), relative_path)
-	if ospath.isfile(abs_path):
+	abs_path = os.path.join(os.path.dirname(rst_path), relative_path)
+	if os.path.isfile(abs_path):
 		return abs_path
 
-
-try:
-	rst_char_len = vim.strwidth  # Requires Vim 7.3+
-except AttributeError:
-	from unicodedata import east_asian_width
-	def rst_char_len(s):
-		"""Return the required over-/underline length for s."""
-		result = 0
-		for c in s:
-			result += 2 if east_asian_width(c) in ('W', 'F') else 1
-		return result
-
-
 def	make_items(times, leading='+'):
 	"""
 	make lines with leading char multitimes
@@ -133,45 +107,45 @@ def get_popular_code_type():
 endglobal
 
 snippet part "Part" b
-`!p snip.rv = rst_char_len(t[1])*'#'`
+`!p snip.rv = display_width(t[1])*'#'`
 ${1:${VISUAL:Part name}}
-`!p snip.rv = rst_char_len(t[1])*'#'`
+`!p snip.rv = display_width(t[1])*'#'`
 
 $0
 endsnippet
 
 snippet chap "Chapter" b
-`!p snip.rv = rst_char_len(t[1])*'*'`
+`!p snip.rv = display_width(t[1])*'*'`
 ${1:${VISUAL:Chapter name}}
-`!p snip.rv = rst_char_len(t[1])*'*'`
+`!p snip.rv = display_width(t[1])*'*'`
 
 $0
 endsnippet
 
 snippet sec "Section" b
 ${1:${VISUAL:Section name}}
-`!p snip.rv = rst_char_len(t[1])*'='`
+`!p snip.rv = display_width(t[1])*'='`
 
 $0
 endsnippet
 
 snippet ssec "Subsection" b
 ${1:${VISUAL:Subsection name}}
-`!p snip.rv = rst_char_len(t[1])*'-'`
+`!p snip.rv = display_width(t[1])*'-'`
 
 $0
 endsnippet
 
 snippet sssec "Subsubsection" b
 ${1:${VISUAL:Subsubsection name}}
-`!p snip.rv = rst_char_len(t[1])*'^'`
+`!p snip.rv = display_width(t[1])*'^'`
 
 $0
 endsnippet
 
 snippet para "Paragraph" b
 ${1:${VISUAL:Paragraph name}}
-`!p snip.rv = rst_char_len(t[1])*'"'`
+`!p snip.rv = display_width(t[1])*'"'`
 
 $0
 endsnippet
@@ -231,7 +205,7 @@ endsnippet
 # img, inc, fig
 snippet id "Includable Directives" b
 `!p
-real_name=real_filename(ospath.basename(t[2]))
+real_name=real_filename(os.path.basename(t[2]))
 di=t[1][:2]
 
 link=""
diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index 4666bc74b..3c638a17f 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -93,3 +93,26 @@ def make_box(twidth, bwidth=None):
 def foldmarker():
     "Return a tuple of (open fold marker, close fold marker)"
     return vim.eval("&foldmarker").split(",")
+
+
+def display_width(str):
+    """Return the required over-/underline length for str."""
+    try:
+        # Respect &ambiwidth and &tabstop, but old vim may not support this
+        return vim.strdisplaywidth(str)
+    except AttributeError:
+        # Fallback
+        from unicodedata import east_asian_width
+        result = 0
+        for c in str:
+            result += 2 if east_asian_width(c) in ('W', 'F') else 1
+        return result
+
+# http://stackoverflow.com/questions/2718196/find-all-chinese-text-in-a-string-using-python-and-regex
+def has_cjk(s):
+    """Detect if s contains CJK characters."""
+    cjk_re = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-鿃豈-鶴侮-頻並-龎]', re.UNICODE)
+
+    return cjk_re.search(s) is not None
+
+# vim:set et sts=0 sw=4 ts=4:

From efecc996d48ca4a2df835ebfe4c72724238fabd4 Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Tue, 5 Nov 2019 22:07:35 +0800
Subject: [PATCH 1285/1587] Regex match lorem[num], works for all

---
 UltiSnips/all.snippets | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index c50e69132..2e185f6f8 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -11,6 +11,12 @@ priority -60
 ##############
 global !p
 from vimsnippets import foldmarker, make_box, get_comment_format
+LOREM = """
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod \
+tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At \
+vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, \
+no sea takimata sanctus est Lorem ipsum dolor sit amet.
+"""
 endglobal
 
 snippet box "A nice box with the current comment symbol" b
@@ -56,11 +62,8 @@ endsnippet
 ##########################
 # LOREM IPSUM GENERATORS #
 ##########################
-snippet lorem "Lorem Ipsum - 50 Words" b
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
-tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
-vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
-no sea takimata sanctus est Lorem ipsum dolor sit amet.
+snippet "lorem(([1-4])?[0-9])?" "Lorem Ipsum" r
+`!p snip.rv = " ".join(LOREM.split()[:int(match.group(1))]) if match.group(1) else LOREM`
 endsnippet
 
 ##########################

From 5d259617f5198e511a759ccf4fb3000921abae21 Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Thu, 7 Nov 2019 19:34:27 +0800
Subject: [PATCH 1286/1587] Fix deff for python (Issue #961, Issue #1133); Fix
 uuid

---
 UltiSnips/all.snippets    | 2 +-
 UltiSnips/python.snippets | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/all.snippets b/UltiSnips/all.snippets
index 2e185f6f8..84ddaa40e 100644
--- a/UltiSnips/all.snippets
+++ b/UltiSnips/all.snippets
@@ -107,7 +107,7 @@ endsnippet
 #  Misc  #
 ##########
 snippet uuid "Random UUID" w
-`!p if not snip.c: import uuid; snip.rv = uuid.uuid4()`
+`!p if not snip.c: import uuid; snip.rv = str(uuid.uuid4())`
 endsnippet
 
 # vim:ft=snippets:
diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index cdbe517d2..6e7750413 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -497,8 +497,8 @@ def __coerce__(self, other):
 	${25:pass}
 endsnippet
 
-snippet deff
-def ${1:fname}(`!p snip.rv = vim.eval('indent(".") ? "self" : ""')`$2):
+snippet deff "function or class method"
+def ${1:fname}(`!p snip.rv = "self, " if snip.indent else ""`$2):
 	$0
 endsnippet
 

From 7454ec49eab13c73431a5fa9991d62f89a4f34f2 Mon Sep 17 00:00:00 2001
From: yhu266 <56977205+yhu266@users.noreply.github.com>
Date: Sun, 24 Nov 2019 01:53:01 -0800
Subject: [PATCH 1287/1587] fix the `$0` issue

---
 snippets/fortran.snippets | 46 +++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
index e04d4fda0..8cb6f9a75 100644
--- a/snippets/fortran.snippets
+++ b/snippets/fortran.snippets
@@ -1,13 +1,13 @@
 snippet impl
 	implicit none
-		$0
+		${0}
 snippet prog
 	program ${1:main}
-		$0
+		${0}
 	end program $1
 snippet mod
 	module ${1:modulename}
-		$0
+		${0}
 	end module $1
 snippet proc
 	procedure ${1:name}
@@ -25,7 +25,7 @@ snippet doc
 	! Github: `g:snips_github`
 	! Description: $1
 	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-	$0
+	${0}
 snippet dox
 	!> @brief ${1}
 	!!
@@ -37,45 +37,45 @@ snippet doxp
 # Variables definitions
 # Boolean
 snippet bool
-	logical :: $0
+	logical :: ${0}
 # Integer
 snippet int
-	integer :: $0
+	integer :: ${0}
 snippet real
-	real :: $0
+	real :: ${0}
 # Double Precision
 snippet double
-	double precision :: $0
+	double precision :: ${0}
 # Char
 snippet str
 	character(len=${1:*}) :: ${0:}
 # Types
 snippet type
 	type(${1:name})
-		$0
+		${0}
 	end type
 snippet const
-	${1:type}, parameter :: $2 = $0
+	${1:type}, parameter :: $2 = ${0}
 snippet arr
-	${1:type}, ${2:allocatable, }dimension(${3::}) :: $0
+	${1:type}, ${2:allocatable, }dimension(${3::}) :: ${0}
 snippet intent
-	${1:type}, intent(inout) :: $0
+	${1:type}, intent(inout) :: ${0}
 # Array
 snippet /
-	(/ $1 /) ${2:,&} $0
+	(/ $1 /) ${2:,&} ${0}
 snippet if
 	if (${1:condition}) then
-		$0
+		${0}
 	end if
 snippet case
 	select case (${1:expr})
 		case ($2)
 		case default
 			$3
-	end select $0
+	end select ${0}
 snippet do
 	do ${1:i} = ${2:start}, ${3:end}, ${4:incr}
-		$0
+		${0}
 	end do
 snippet dow
 	do while (${1:condition})
@@ -83,21 +83,21 @@ snippet dow
 	end do
 snippet sub
 	subroutine ${1:name}($2)
-		$0
+		${0}
 	end subroutine $1
 snippet func
 	function ${1:name}($2) result($3)
-		$0
+		${0}
 	end function $1
 snippet pr
-	write(*,*) $0
+	write(*,*) ${0}
 snippet dpr
 	write(*,*) '$1 = ', $1
 snippet read
-	read(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0
+	read(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) ${0}
 snippet write
-	write(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0
+	write(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) ${0}
 snippet open
-	open(unit = ${1:fp}, file = ${2:filename}, status = ${3:unknown}, iostat = ${4:ierr}) $0
+	open(unit = ${1:fp}, file = ${2:filename}, status = ${3:unknown}, iostat = ${4:ierr}) ${0}
 snippet close
-	close(unit = ${1:fp}) $0
+	close(unit = ${1:fp}) ${0}

From 2d3c81cf322e8f260ac30b6e4275f685639ea71c Mon Sep 17 00:00:00 2001
From: Azarel Doroteo Pacheco <azarel.doroteo@logicalbricks.com>
Date: Sat, 23 Nov 2019 21:02:16 -0600
Subject: [PATCH 1288/1587] Fix some rails snippets that were failing because
 of a closing brace

---
 UltiSnips/rails.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index ffd76613c..7d073d4b8 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -69,7 +69,7 @@ endsnippet
 
 # FIXME: handling literal bracket pair inside of nested tab groups?
 snippet tcr "Create references column"
-t.references :${1:taggable}${2:, polymorphic ${3:{ :default: '${4:Photo}' \}}}
+t.references :${1:taggable}${2:, polymorphic ${3:{ :default: '${4:Photo}' }}}
 $0
 endsnippet
 
@@ -597,7 +597,7 @@ endsnippet
 
 snippet rest "respond_to"
 respond_to do |wants|
-	wants.${1:html}${2: { $0 \}}
+	wants.${1:html}${2: { $0 }}
 end
 endsnippet
 
@@ -655,7 +655,7 @@ t.$0
 endsnippet
 
 snippet t. "t.references (tcr)"
-t.references :${1:taggable}${2:, polymorphic ${3:{ :default: '${4:Photo}' \}}}
+t.references :${1:taggable}${2:, polymorphic ${3:{ :default: '${4:Photo}' }}}
 t.$0
 endsnippet
 
@@ -780,7 +780,7 @@ verify only: [:$1], session: :user, params: :id, redirect_to {:action: '${2:inde
 endsnippet
 
 snippet wants "wants_format"
-wants.${1:js|json|html}${2: { $0 \}}
+wants.${1:js|json|html}${2: { $0 }}
 endsnippet
 
 snippet xdelete "xhr delete"

From c1d1cdce4f34d861cedebc948ef9cdecf633ae0a Mon Sep 17 00:00:00 2001
From: Azarel Doroteo Pacheco <azarel.doroteo@logicalbricks.com>
Date: Sat, 23 Nov 2019 21:20:32 -0600
Subject: [PATCH 1289/1587] Fix hash syntax

---
 UltiSnips/rails.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index 7d073d4b8..22b71901d 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -69,7 +69,7 @@ endsnippet
 
 # FIXME: handling literal bracket pair inside of nested tab groups?
 snippet tcr "Create references column"
-t.references :${1:taggable}${2:, polymorphic ${3:{ :default: '${4:Photo}' }}}
+t.references :${1:taggable}${2:, polymorphic: ${3:{ default: '${4:Photo}' }}}
 $0
 endsnippet
 
@@ -655,7 +655,7 @@ t.$0
 endsnippet
 
 snippet t. "t.references (tcr)"
-t.references :${1:taggable}${2:, polymorphic ${3:{ :default: '${4:Photo}' }}}
+t.references :${1:taggable}${2:, polymorphic: ${3:{ default: '${4:Photo}' }}}
 t.$0
 endsnippet
 

From a7a7d4d2dd252b71b904d362ba74572c660da67f Mon Sep 17 00:00:00 2001
From: Azarel Doroteo Pacheco <azarel.doroteo@logicalbricks.com>
Date: Sun, 24 Nov 2019 21:16:12 -0600
Subject: [PATCH 1290/1587] Guess class name from filename for class and module
 snippet in ruby

---
 UltiSnips/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/ruby.snippets b/UltiSnips/ruby.snippets
index 7b360ffae..b5cb870e2 100644
--- a/UltiSnips/ruby.snippets
+++ b/UltiSnips/ruby.snippets
@@ -307,7 +307,7 @@ end
 endsnippet
 
 snippet class "class <class_name> def initialize ... end end"
-class ${1:class_name}
+class ${1:`!p snip.rv = snip.basename.title().replace('_', '')`}
 	def initialize(${2:*args})
 		$0
 	end
@@ -315,7 +315,7 @@ end
 endsnippet
 
 snippet module "module"
-module ${1:module_name}
+module ${1:`!p snip.rv = snip.basename.title().replace('_', '')`}
 	$0
 end
 endsnippet

From 3ba36bb710988349140138707731baeebd6337e4 Mon Sep 17 00:00:00 2001
From: antoinemadec <ajamadec@gmail.com>
Date: Wed, 11 Dec 2019 18:29:33 -0800
Subject: [PATCH 1291/1587] Extend verilog snippets

Add: for, forever, task, function
---
 snippets/systemverilog.snippets |  2 +-
 snippets/verilog.snippets       | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/snippets/systemverilog.snippets b/snippets/systemverilog.snippets
index 70a9d2d37..f510750d6 100644
--- a/snippets/systemverilog.snippets
+++ b/snippets/systemverilog.snippets
@@ -1,7 +1,7 @@
 extends verilog
 
 # Foreach Loop
-snippet fe
+snippet forea
 	foreach (${1}) begin
 		${0}
 	end
diff --git a/snippets/verilog.snippets b/snippets/verilog.snippets
index 5cd80f39b..df5eeb815 100644
--- a/snippets/verilog.snippets
+++ b/snippets/verilog.snippets
@@ -61,3 +61,23 @@ snippet mod
 	module ${1:module_name} (${2});
 		${0}
 	endmodule
+# For
+snippet for
+	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) begin
+		${4}
+	end
+# Forever
+snippet forev
+	forever begin
+		${0}
+	end
+# Function
+snippet fun
+	function ${1:void} ${2:name}(${3});
+		${0}
+	endfunction: $2
+# Task
+snippet task
+	task ${1:name}(${2});
+		${0}
+	endtask: $1

From 180d239935a2cb496c7b702d9fbe38f05fe3dea2 Mon Sep 17 00:00:00 2001
From: scooke11 <scooke.novo@gmail.com>
Date: Wed, 18 Dec 2019 13:12:05 -0500
Subject: [PATCH 1292/1587] updated Ultisnips puppet exec snip to reflect more
 commonly used fields

---
 UltiSnips/puppet.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/puppet.snippets b/UltiSnips/puppet.snippets
index 7b39094c9..eacc8fc88 100644
--- a/UltiSnips/puppet.snippets
+++ b/UltiSnips/puppet.snippets
@@ -67,7 +67,8 @@ endsnippet
 
 snippet exec "Exec resource type" b
 exec { '${1:command}':
-	refreshonly => true,
+	command => "${2:$1}",
+	user    => "${3:root}",
 }
 endsnippet
 

From 0856ec44ed56f88ecc40a1ce3d8892ab8011a7ed Mon Sep 17 00:00:00 2001
From: David Briscoe <idbrii@gmail.com>
Date: Tue, 24 Dec 2019 13:59:39 -0800
Subject: [PATCH 1293/1587] Use VISUAL for shell control statements

Follow the "Things to consider when contributing" guideline to avoid
pointless placeholder text.
---
 UltiSnips/sh.snippets | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 9bacc7251..586c2bcdf 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -47,24 +47,24 @@ endsnippet
 snippet case "case .. esac (case)"
 case ${1:word} in
 	${2:pattern} )
-		$0;;
+		${0:${VISUAL}};;
 esac
 endsnippet
 
 snippet elif "elif .. (elif)"
 elif ${2:[[ ${1:condition} ]]}; then
-	${0:#statements}
+	${0:${VISUAL}}
 endsnippet
 
 snippet for "for ... done (for)"
 for (( i = 0; i < ${1:10}; i++ )); do
-	${0:#statements}
+	${0:${VISUAL}}
 done
 endsnippet
 
 snippet forin "for ... in ... done (forin)"
 for ${1:i}${2/.+/ in /}${2:words}; do
-	${0:#statements}
+	${0:${VISUAL}}
 done
 endsnippet
 
@@ -76,19 +76,19 @@ endsnippet
 
 snippet if "if ... then (if)"
 if ${2:[[ ${1:condition} ]]}; then
-	${0:#statements}
+	${0:${VISUAL}}
 fi
 endsnippet
 
 snippet until "until ... (done)"
 until ${2:[[ ${1:condition} ]]}; do
-	${0:#statements}
+	${0:${VISUAL}}
 done
 endsnippet
 
 snippet while "while ... (done)"
 while ${2:[[ ${1:condition} ]]}; do
-	${0:#statements}
+	${0:${VISUAL}}
 done
 endsnippet
 

From a8e89d40b642636deaa5c7b0e45b2aa67f39f55f Mon Sep 17 00:00:00 2001
From: David Briscoe <idbrii@gmail.com>
Date: Tue, 24 Dec 2019 14:05:31 -0800
Subject: [PATCH 1294/1587] Use standard triggers for while

---
 UltiSnips/sh.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 586c2bcdf..51bbdd837 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -86,7 +86,7 @@ until ${2:[[ ${1:condition} ]]}; do
 done
 endsnippet
 
-snippet while "while ... (done)"
+snippet /wh(ile)?/ "while ... (done)" r
 while ${2:[[ ${1:condition} ]]}; do
 	${0:${VISUAL}}
 done

From a3e0ad0d0e6f24ee18149bb4bc28407b8246d56a Mon Sep 17 00:00:00 2001
From: David Briscoe <idbrii@gmail.com>
Date: Tue, 24 Dec 2019 14:05:42 -0800
Subject: [PATCH 1295/1587] Use standard triggers for switch(case)

---
 UltiSnips/sh.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 51bbdd837..d68bd181d 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -44,7 +44,7 @@ ${5:${6/(.+)/trap "/}${6:rm -f '$${1/.*\s//}'}${6/(.+)/" 0               # EXIT\
 
 endsnippet
 
-snippet case "case .. esac (case)"
+snippet /case|sw(itch)?/ "case .. esac (case)" r
 case ${1:word} in
 	${2:pattern} )
 		${0:${VISUAL}};;

From 2f653c1f3662cfe429e675e6dafec8ce6808bc53 Mon Sep 17 00:00:00 2001
From: David Briscoe <idbrii@gmail.com>
Date: Tue, 24 Dec 2019 14:07:12 -0800
Subject: [PATCH 1296/1587] Limit snippets to beginning of line

For ones that only make sense at the beginning, limit them to beginning
of line.
---
 UltiSnips/sh.snippets | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index d68bd181d..37bf0c4f1 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -29,14 +29,14 @@ snippet #! "#!/usr/bin/env (!env)" b
 `!p snip.rv = '#!/usr/bin/env ' + getShell() + "\n" `
 endsnippet
 
-snippet sbash "safe bash options"
+snippet sbash "safe bash options" b
 #!/usr/bin/env bash
 set -euo pipefail
 IFS=$'\n\t'
 `!p snip.rv ='\n\n' `
 endsnippet
 
-snippet temp "Tempfile"
+snippet temp "Tempfile" b
 ${1:TMPFILE}="$(mktemp -t ${3:--suffix=${4:.SUFFIX}} ${2:`!p
 snip.rv = re.sub(r'[^a-zA-Z]', '_', snip.fn) or "untitled"
 `}.XXXXXX)"
@@ -44,25 +44,25 @@ ${5:${6/(.+)/trap "/}${6:rm -f '$${1/.*\s//}'}${6/(.+)/" 0               # EXIT\
 
 endsnippet
 
-snippet /case|sw(itch)?/ "case .. esac (case)" r
+snippet /case|sw(itch)?/ "case .. esac (case)" rb
 case ${1:word} in
 	${2:pattern} )
 		${0:${VISUAL}};;
 esac
 endsnippet
 
-snippet elif "elif .. (elif)"
+snippet elif "elif .. (elif)" b
 elif ${2:[[ ${1:condition} ]]}; then
 	${0:${VISUAL}}
 endsnippet
 
-snippet for "for ... done (for)"
+snippet for "for ... done (for)" b
 for (( i = 0; i < ${1:10}; i++ )); do
 	${0:${VISUAL}}
 done
 endsnippet
 
-snippet forin "for ... in ... done (forin)"
+snippet forin "for ... in ... done (forin)" b
 for ${1:i}${2/.+/ in /}${2:words}; do
 	${0:${VISUAL}}
 done
@@ -74,19 +74,19 @@ snippet here "here document (here)"
 ${1/['"`](.+)['"`]/$1/}
 endsnippet
 
-snippet if "if ... then (if)"
+snippet if "if ... then (if)" b
 if ${2:[[ ${1:condition} ]]}; then
 	${0:${VISUAL}}
 fi
 endsnippet
 
-snippet until "until ... (done)"
+snippet until "until ... (done)" b
 until ${2:[[ ${1:condition} ]]}; do
 	${0:${VISUAL}}
 done
 endsnippet
 
-snippet /wh(ile)?/ "while ... (done)" r
+snippet /wh(ile)?/ "while ... (done)" rb
 while ${2:[[ ${1:condition} ]]}; do
 	${0:${VISUAL}}
 done

From f324a43a5f6a941a55ee992bb852f3c2c504a509 Mon Sep 17 00:00:00 2001
From: Freed-Wu <Wuzy01@qq.com>
Date: Thu, 2 Jan 2020 23:09:22 +0800
Subject: [PATCH 1297/1587] Add octave & pandoc

---
 UltiSnips/octave.snippets | 2 ++
 snippets/octave.snippets  | 2 ++
 snippets/pandoc.snippets  | 2 ++
 3 files changed, 6 insertions(+)
 create mode 100644 UltiSnips/octave.snippets
 create mode 100644 snippets/octave.snippets
 create mode 100644 snippets/pandoc.snippets

diff --git a/UltiSnips/octave.snippets b/UltiSnips/octave.snippets
new file mode 100644
index 000000000..c11805ffc
--- /dev/null
+++ b/UltiSnips/octave.snippets
@@ -0,0 +1,2 @@
+extends matlab
+
diff --git a/snippets/octave.snippets b/snippets/octave.snippets
new file mode 100644
index 000000000..c11805ffc
--- /dev/null
+++ b/snippets/octave.snippets
@@ -0,0 +1,2 @@
+extends matlab
+
diff --git a/snippets/pandoc.snippets b/snippets/pandoc.snippets
new file mode 100644
index 000000000..1dd9e82eb
--- /dev/null
+++ b/snippets/pandoc.snippets
@@ -0,0 +1,2 @@
+extends markdown
+

From 7224df39f4ec69f7c5f2c9c1df57368dd838d952 Mon Sep 17 00:00:00 2001
From: Joseph An <an.joseph891@gmail.com>
Date: Tue, 7 Jan 2020 10:56:00 -0500
Subject: [PATCH 1298/1587] Elixir - add piping pry

---
 snippets/elixir.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 64b63f6e5..58f8c16f7 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -188,6 +188,12 @@ snippet try try .. rescue .. end
 snippet pry
 	require IEx; IEx.pry
 	${0}
+snippet ppry
+	|> (fn x ->
+				require IEx
+				IEx.pry()
+				x
+			end).()${0}
 snippet qu
 	quote do
 		${1}

From 38ab6663b901098096404af19b0e7cf953a78a10 Mon Sep 17 00:00:00 2001
From: Joseph An <an.joseph891@gmail.com>
Date: Tue, 7 Jan 2020 11:02:09 -0500
Subject: [PATCH 1299/1587] fix formatting

---
 snippets/elixir.snippets | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 58f8c16f7..97d4b11e2 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -190,10 +190,9 @@ snippet pry
 	${0}
 snippet ppry
 	|> (fn x ->
-				require IEx
-				IEx.pry()
-				x
-			end).()${0}
+	  require IEx; IEx.pry
+		x
+	end).()${0}
 snippet qu
 	quote do
 		${1}

From e3650624c7b500dd4eeb4fe0f99664e18972e92e Mon Sep 17 00:00:00 2001
From: Joseph An <an.joseph891@gmail.com>
Date: Tue, 7 Jan 2020 11:02:54 -0500
Subject: [PATCH 1300/1587] fix formatting again

---
 snippets/elixir.snippets | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 97d4b11e2..69d4046b6 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -189,10 +189,8 @@ snippet pry
 	require IEx; IEx.pry
 	${0}
 snippet ppry
-	|> (fn x ->
-	  require IEx; IEx.pry
-		x
-	end).()${0}
+	|> (fn x -> require IEx; IEx.pry; x end).()
+	${0}
 snippet qu
 	quote do
 		${1}

From 977cc05194bdac51970bf83d0fe6fafc297012de Mon Sep 17 00:00:00 2001
From: Joseph An <an.joseph891@gmail.com>
Date: Tue, 7 Jan 2020 11:06:46 -0500
Subject: [PATCH 1301/1587] move cursor to end of snippet instead of newline
 (because normally you'd save and run your code rather than write more code)

---
 snippets/elixir.snippets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 69d4046b6..468575d09 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -189,8 +189,7 @@ snippet pry
 	require IEx; IEx.pry
 	${0}
 snippet ppry
-	|> (fn x -> require IEx; IEx.pry; x end).()
-	${0}
+	|> (fn x -> require IEx; IEx.pry; x end).()${0}
 snippet qu
 	quote do
 		${1}

From 5279654b3e9fc280742d02c9509d4313d9da18e9 Mon Sep 17 00:00:00 2001
From: Sh3Rm4n <f.vioel@googlemail.com>
Date: Sun, 12 Jan 2020 22:27:21 +0100
Subject: [PATCH 1302/1587] Remove undefined "pipefail" from shell snippet

For POSIX shells pipefail is undefined.
bash on the other hand has defined pipefail

Reference:

https://github.com/koalaman/shellcheck/wiki/SC2039
---
 snippets/sh.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 35afa3019..2ce67ec4f 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -4,10 +4,10 @@ snippet #!
 
 snippet s#!
 	#!/usr/bin/env sh
-	set -euo pipefail
+	set -eu
 
 snippet safe
-	set -euo pipefail
+	set -eu
 
 snippet bash
 	#!/usr/bin/env bash

From 867f5cc995aec6c6f065d0ad76f5f0c914df4493 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Wed, 15 Jan 2020 12:24:20 +0000
Subject: [PATCH 1303/1587] Add snippets for new glossary items in TeX

Adds:

- gln: new glossary entry
- glnl: new long glossary entry
---
 UltiSnips/tex.snippets | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 355d9e46c..b5be4b74d 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -220,4 +220,25 @@ ${2:${VISUAL:code}}
 
 $0
 endsnippet
+
+snippet gln "New glossary item" b
+\newglossaryentry{${1:identifier}}
+{
+  name={${2:name}},
+  first={${3:first occurrence}},
+  sort={${4:sort value}},
+  description={${0:description}},
+}
+endsnippet
+snippet glnl "New long glossary item" b
+\longnewglossaryentry{${1:identifier}}
+{
+  name={${2:name}},
+  first={${3:first occurrence}},
+  sort={${4:sort value}},
+}
+{
+  ${0:description}
+}
+endsnippet
 # vim:ft=snippets:

From 71b30be0012448178b3371ea50909e097fdf9b55 Mon Sep 17 00:00:00 2001
From: Miguel Montalvo <miguel.montalvo@barrelny.com>
Date: Thu, 30 Jan 2020 21:30:42 -0800
Subject: [PATCH 1304/1587] Update snippet to include Render

---
 snippets/liquid.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/liquid.snippets b/snippets/liquid.snippets
index 4f11f086c..a39a0876d 100644
--- a/snippets/liquid.snippets
+++ b/snippets/liquid.snippets
@@ -63,6 +63,10 @@ snippet include
 	{% include '${0:snippet}' %}
 snippet includewith
 	{% include '${1:snippet}', ${2:variable}: ${0:value} %}
+snippet render
+	{% render '${0:snippet}' %}
+snippet renderwith
+	{% render '${1:snippet}', ${2:variable}: ${0:value} %}
 snippet section
 	{% section '${1:snippet}' %}
 snippet raw

From bda7ca48e67ab2f83e936e1f71306f432c659dbe Mon Sep 17 00:00:00 2001
From: David Briscoe <idbrii@gmail.com>
Date: Wed, 22 Jan 2020 16:05:48 -0800
Subject: [PATCH 1305/1587] Rust: Fix description of function snippet

pfn is the public version.
---
 UltiSnips/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index fbf459d1b..39dff8f02 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -4,7 +4,7 @@
 
 priority -50
 
-snippet fn "pub fn name(?) -> ? {}"
+snippet fn "fn name(?) -> ? {}"
 fn ${1:function_name}($2)${3/..*/ -> /}$3 {
 	${VISUAL}$0
 }

From f0289e816c737c415e07aac15326bdd299894b02 Mon Sep 17 00:00:00 2001
From: statquant <statquant@outlook.com>
Date: Sat, 14 Sep 2019 16:19:19 +0100
Subject: [PATCH 1306/1587] update r.snippets and add rmd.snippets for
 rmarkdown (copied from https://github.com/jalvesaq/Nvim-R/tree/master/R)

---
 snippets/r.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/r.snippets b/snippets/r.snippets
index 7bdeeec05..9dbe0f39d 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -32,6 +32,10 @@ snippet for
 	for (${1:item} in ${2:list}) {
 		${3}
 	}
+snippet foreach
+	foreach (${1:item} = ${2:list}) {
+		${3}
+	}
 
 # functions
 snippet fun

From 56e5bb1046a0ef6a0b385491c1a12271eb5e4aee Mon Sep 17 00:00:00 2001
From: statquant <statquant@outlook.com>
Date: Sat, 14 Sep 2019 16:21:28 +0100
Subject: [PATCH 1307/1587] Add rmd.snippets

---
 snippets/rmd.snippets | 205 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 snippets/rmd.snippets

diff --git a/snippets/rmd.snippets b/snippets/rmd.snippets
new file mode 100644
index 000000000..96b0ea0e4
--- /dev/null
+++ b/snippets/rmd.snippets
@@ -0,0 +1,205 @@
+#
+# Snipmate Snippets for Pandoc Markdown
+#
+# Many snippets have starred versions, i.e., versions
+# that end with an asterisk (`*`). These snippets use
+# vim's `"*` register---i.e., the contents of the
+# system clipboard---to insert text.
+
+# Insert Title Block
+snippet %%
+	% ${1:`Filename('', 'title')`}
+	% ${2:`g:snips_author`}
+	% ${3:`strftime("%d %B %Y")`}
+
+	${4}
+snippet %%*
+	% ${1:`Filename('', @*)`}
+	% ${2:`g:snips_author`}
+	% ${3:`strftime("%d %b %Y")`}
+
+	${4}
+
+# Insert Definition List
+snippet ::
+	${1:term}
+	  ~  ${2:definition}
+
+# Underline with `=`s or `-`s
+snippet ===
+	`repeat('=', strlen(getline(line(".") - 1)))`
+	
+	${1}
+snippet ---
+	`repeat('-', strlen(getline(line(".") - 1)))`
+	
+	${1}
+
+# Links and their kin
+# -------------------
+#
+# (These don't play very well with delimitMate)
+#
+
+snippet [
+	[${1:link}](http://${2:url} "${3:title}")${4}
+snippet [*
+	[${1:link}](${2:`@*`} "${3:title}")${4}
+
+snippet [:
+	[${1:id}]: http://${2:url} "${3:title}"
+snippet [:*
+	[${1:id}]: ${2:`@*`} "${3:title}"
+
+snippet [@
+	[${1:link}](mailto:${2:email})${3}
+snippet [@*
+	[${1:link}](mailto:${2:`@*`})${3}
+
+snippet [:@
+	[${1:id}]: mailto:${2:email} "${3:title}"
+snippet [:@*
+	[${1:id}]: mailto:${2:`@*`} "${3:title}"
+
+snippet ![
+	![${1:alt}](${2:url} "${3:title}")${4}
+snippet ![*
+	![${1:alt}](${2:`@*`} "${3:title}")${4}
+
+snippet ![:
+	![${1:id}]: ${2:url} "${3:title}"
+snippet ![:*
+	![${1:id}]: ${2:`@*`} "${3:title}"
+
+snippet [^:
+	[^${1:id}]: ${2:note}
+snippet [^:*
+	[^${1:id}]: ${2:`@*`}
+
+#
+
+# library()
+snippet req
+	require(${1:}, quietly = TRUE)
+# If Condition
+snippet if
+	if ( ${1:condition} )
+	{
+		${2:}
+	}
+snippet el
+	else
+	{
+		${1:}
+	}
+
+# Function
+snippet fun
+	${1:funname} <- 			# ${2:}
+		function
+	(
+	 	${3:}
+	)
+	{
+	  ${4:}
+	}
+# repeat
+snippet re
+	repeat{
+	  ${2:}
+	  if(${1:condition}) break
+	}
+
+# matrix
+snippet ma
+	matrix(NA, nrow = ${1:}, ncol = ${2:})
+
+# data frame
+snippet df
+	data.frame(${1:}, header = TRUE)
+
+snippet cmdarg
+	args <- commandArgs(TRUE)
+	if (length(args) == 0)
+	    stop("Please give ${1:}!")
+	if (!all(file.exists(args)))
+	     stop("Couln't find input files!")
+
+snippet getopt
+	require('getopt', quietly = TRUE)
+	opt_spec <- matrix(c(
+					'help',     'h', 0, "logical", 	"Getting help",
+					'file',     'f', 1, "character","File to process"
+	                ), ncol = 5, byrow = TRUE)
+	opt <- getopt(spec = opt_spec)
+	if ( !is.null(opt$help) || is.null(commandArgs()) )   {
+	    cat(getopt(spec = opt_spec, usage = TRUE, command = "yourCmd"))
+	    q(status=0)
+	}
+	# some inital value
+	if ( is.null(opt$???) )    { opt$??? <- ??? }
+
+snippet optparse
+	require("optparse", quietly = TRUE)
+	option_list <-
+	    list(make_option(c("-n", "--add_numbers"), action="store_true", default=FALSE,
+	                     help="Print line number at the beginning of each line [default]")
+	         )
+	parser <- OptionParser(usage = "%prog [options] file", option_list=option_list)
+	arguments <- parse_args(parser, positional_arguments = TRUE)
+	opt <- arguments$options
+	
+	if(length(arguments$args) != 1) {
+	    cat("Incorrect number of required positional arguments\n\n")
+	    print_help(parser)
+	    stop()
+	} else {
+	    file <- arguments$args
+	}
+	
+	if( file.access(file) == -1) {
+	    stop(sprintf("Specified file ( %s ) does not exist", file))
+	} else {
+	    file_text <- readLines(file)
+	}
+
+snippet #!
+	#!/usr/bin/env Rscript
+
+snippet debug
+	# Development & Debugging, don't forget to uncomment afterwards!
+	#--------------------------------------------------------------------------------
+	#setwd("~/Projekte/${1:}")
+	#opt <- list(${2:}
+	#            )
+	#--------------------------------------------------------------------------------
+
+
+# Took from pandoc-plugin <<<<
+# Underline with `=`s or `-`s
+snippet #===
+	#`repeat('=', strlen(getline(line(".") - 1)))`
+	${1}
+snippet #---
+	#`repeat('-', strlen(getline(line(".") - 1)))`
+	${1}
+
+# >>>>
+
+snippet r
+	\`\`\`{r ${1:chung_tag}, echo = FALSE ${2:options}}
+	${3:}
+	\`\`\`
+snippet ri
+	\`{r ${1:}}\`
+
+snippet copt
+	\`\`\` {r setup, echo = FALSE}
+		opts_chunk$set(fig.path='../figures/${1:}', cache.path='../cache/-'
+		, fig.align='center', fig.show='hold', par=TRUE)	
+		#opts_knit$set(upload.fun = imgur_upload) # upload images
+	\`\`\`
+
+	
+# End of File ===================================================================
+# vim: set noexpandtab:

From cca8bdc4df751c1f262030b8409845aa657f5043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20Altay=C3=B3?= <jordialtayo@gmail.com>
Date: Tue, 4 Feb 2020 11:49:53 +0100
Subject: [PATCH 1308/1587] added process with reset snipped for VHDL

---
 snippets/vhdl.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/snippets/vhdl.snippets b/snippets/vhdl.snippets
index f13f5bf9b..7a991344d 100644
--- a/snippets/vhdl.snippets
+++ b/snippets/vhdl.snippets
@@ -75,6 +75,16 @@ snippet prc
 			${2}
 		end if;
 	end process;
+# process with clock and reset
+snippet prcr
+	process (${1:clk}, ${2:nrst})
+	begin
+		if ($2 = '${3:0}') then
+			${4}
+		elsif rising_edge($1) then
+			${5}
+		end if;
+	end process;
 # process all
 snippet pra
 	process (${1:all})

From b765719ce8012d3977f756c9c9e48bf92641cd09 Mon Sep 17 00:00:00 2001
From: jagjordi <jordialtayo@gmail.com>
Date: Tue, 18 Feb 2020 10:20:27 +0100
Subject: [PATCH 1309/1587] Update tex.snippets

chagned the title for frame environment
---
 snippets/tex.snippets | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 0f8f9c03d..c02d34015 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -289,7 +289,9 @@ snippet sum \sum^{}_{}
 snippet lim \lim_{}
 	\\lim_{${1:n \\to \\infty}} ${0}
 snippet frame frame environment
-	\\begin{frame}[${1:t}]{${2:title}}
+	\\begin{frame}[${1:t}]
+		\frametitle{${2:title}}
+		\framesubtitle{${3:subtitle}}
 		${0:${VISUAL}}
 	\\end{frame}
 snippet block block environment

From 2ee1ce0c0202ee554ac338986f64bc71c51159eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Salvan?= <apieum@gmail.com>
Date: Fri, 21 Feb 2020 00:03:18 +0100
Subject: [PATCH 1310/1587] Added julia test snippets

\@t for \@testset with \@test and \@tt for \@testset with \@test_throws
---
 snippets/julia.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snippets/julia.snippets b/snippets/julia.snippets
index 490d050d3..75cbc7417 100644
--- a/snippets/julia.snippets
+++ b/snippets/julia.snippets
@@ -100,3 +100,15 @@ snippet wa
 snippet err
 	error("${1}")
 	${0}
+
+snippet @t @testset with @test 
+	@testset "${1}" begin
+		${2}
+		@test ${0}
+	end
+	
+snippet @tt @testset with @test_throws
+	@testset "${1}" begin
+		${2}
+		@test_throws ${0}
+	end

From 35067caeca1c17fa5d38d5de031b26610e939cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Salvan?= <apieum@gmail.com>
Date: Fri, 21 Feb 2020 00:44:35 +0100
Subject: [PATCH 1311/1587] Replace old logging functions in julia by macros

move cursor at the end of line to enable to add variables in the log
ref https://docs.julialang.org/en/v1/stdlib/Logging/
---
 snippets/julia.snippets | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/snippets/julia.snippets b/snippets/julia.snippets
index 75cbc7417..1e0d3f2f2 100644
--- a/snippets/julia.snippets
+++ b/snippets/julia.snippets
@@ -89,17 +89,17 @@ snippet thr throw
 	${0}
 
 # Messages
-snippet in
-	info("${1}")
-	${0}
+snippet @i
+	@info "${1}" ${0}
 
-snippet wa
-	warn("${1}")
-	${0}
+snippet @w
+	@warn "${1}" ${0}
 
-snippet err
-	error("${1}")
-	${0}
+snippet @e
+	@error "${1}" ${0}
+	
+snippet @d
+	@debug "${1}" ${0}
 
 snippet @t @testset with @test 
 	@testset "${1}" begin

From 66975121c7c824cb7c4fa8f2ea53f824e538e3cb Mon Sep 17 00:00:00 2001
From: Craig Maloney <craig@decafbad.net>
Date: Wed, 26 Feb 2020 12:23:08 -0500
Subject: [PATCH 1312/1587] Add pudbr for remote pudb debugging

Added a snippet I've found helpful for remote pudb debugging.
---
 snippets/python.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 428328155..619e55978 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -182,6 +182,10 @@ snippet ptpython
 # python console debugger (pudb)
 snippet pudb
 	__import__('pudb').set_trace()
+# python console debugger remote (pudb)
+snippet pudbr
+	from pudb.remote import set_trace
+	set_trace()
 # pdb in nosetests
 snippet nosetrace
 	__import__('nose').tools.set_trace()

From 28ad6344e1ce59d11c095405e1e76c0183142de5 Mon Sep 17 00:00:00 2001
From: Jeremy Kun <j2kun@users.noreply.github.com>
Date: Sun, 1 Mar 2020 10:29:52 -0500
Subject: [PATCH 1313/1587] tex.snippets: generalize \begin snippet

I tend to type a true prefix `\b` or `\begin` before I think to hit the autocomplete button, and this change supports that while still allowing the old behavior.

I've been using this minor modification for a while now and haven't run into any issues.
---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index b5be4b74d..0243b468c 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -44,7 +44,7 @@ def add_row(snip):
 
 endglobal
 
-snippet "b(egin)?" "begin{} / end{}" br
+snippet "\\?b(egin)?" "begin{} / end{}" br
 \begin{${1:something}}
 	${0:${VISUAL}}
 \end{$1}

From 8eafafe246152c94b64149dd04d9e03b87527eac Mon Sep 17 00:00:00 2001
From: Bin Chen <bin.chen@cba.com.au>
Date: Wed, 11 Mar 2020 14:06:05 +1100
Subject: [PATCH 1314/1587] markdown: add tb scripts

---
 snippets/markdown.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index 303271ed1..b1aa3e148 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -129,6 +129,12 @@ snippet img
 snippet youtube
 	{% youtube ${0:video_id} %}
 
+snippet tb
+	|  ${0:factors}      |    ${1:a}       |  ${2:b}   	|
+	| ------------- |-------------  | ------- |
+	|    ${3:f1}    |    Y          | N       |
+	|    ${4:f2}    |    Y          | N       |
+
 # The quote should appear only once in the text. It is inherently part of it.
 # See http://octopress.org/docs/plugins/pullquote/ for more info.
 

From 6e6b69fd5c12d4645225e7a3ba7d9f3414d83d25 Mon Sep 17 00:00:00 2001
From: Baksi <myself@baksili.codes>
Date: Thu, 19 Mar 2020 05:52:48 +0000
Subject: [PATCH 1315/1587] Update Comment, Disclosure for markdown

Cf [GFW specs](https://github.github.com/gfm/#raw-html).
---
 UltiSnips/markdown.snippets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index bc8664bb0..b9962a102 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -96,6 +96,9 @@ snippet *** "bold italics"
 ***${1:${VISUAL}}***$0
 endsnippet
 
+snippet /* "Comment"
+<!-- ${1:${VISUAL}} -->$0
+endsnippet
 
 ################
 # Common stuff #
@@ -131,6 +134,12 @@ snippet fnt "Footnote"
 [^$1]:${2:Text}
 endsnippet
 
+snippet detail "Disclosure"
+<details${3: open=""}>
+  ${1:summary>${2}</summary>}$0
+</details>
+endsnippet
+
 post_jump "create_table(snip)"
 snippet "tb([1-9][1-9])" "Fancy table" br
 `!p snip.rv = match.group(1)`

From 7e8a72c093540a8fd4c172005c333e8414be7469 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 25 Mar 2020 15:20:18 +0000
Subject: [PATCH 1316/1587] Javascript a snippet

---
 snippets/javascript/javascript.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 147e897fd..d5467bae7 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -339,3 +339,5 @@ snippet ${
 	${${1}}${0}
 snippet aw "await"
 	await ${0:${VISUAL}}
+snippet f "() =>"
+	(${1}) => ${0:${VISUAL}}

From 33f89dbf202441ffd75e69927283f3199b0a8f20 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 25 Mar 2020 15:22:17 +0000
Subject: [PATCH 1317/1587] Javascript af afb snippet

---
 snippets/javascript/javascript.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index d5467bae7..c3d5a8b8f 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -327,7 +327,9 @@ snippet =>
 	(${1}) => {
 		${0:${VISUAL}}
 	}
-snippet af
+snippet af "() =>"
+	(${1}) => ${0:${VISUAL}}
+snippet afb "() => {}"
 	(${1}) => {
 		${0:${VISUAL}}
 	}
@@ -339,5 +341,3 @@ snippet ${
 	${${1}}${0}
 snippet aw "await"
 	await ${0:${VISUAL}}
-snippet f "() =>"
-	(${1}) => ${0:${VISUAL}}

From 30fad6c2c48054057341efa16d1cc43e61636808 Mon Sep 17 00:00:00 2001
From: AK <artyomkarpov@gmail.com>
Date: Fri, 27 Mar 2020 10:08:50 +0300
Subject: [PATCH 1318/1587] C# Equals snippet added

---
 UltiSnips/cs.snippets | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/cs.snippets b/UltiSnips/cs.snippets
index 303fd2094..9de333d18 100644
--- a/UltiSnips/cs.snippets
+++ b/UltiSnips/cs.snippets
@@ -309,15 +309,22 @@ endsnippet
 #############
 
 snippet equals "Equals method" b
-public override bool Equals(object obj)
+public override bool Equals(object obj) => Equals(obj as ${1:TYPE});
+
+public bool Equals($1 other) 
 {
-	if (obj == null || GetType() != obj.GetType())
-	{
+	if (other == null)
 		return false;
-	}
-	$0
-	return base.Equals(obj);
+	${0}
+	return base.Equals(other);
 }
+
+public override int GetHashCode() => this.GetHashCode(); // TODO
+
+public static bool operator ==($1 x, $1 y) => x.Equals(y);
+
+public static bool operator !=($1 x, $1 y) => !x.Equals(y); 
+
 endsnippet
 
 snippet mth "Method" b

From 6bc21b994e87e9a88a167d1763d337958d3073d9 Mon Sep 17 00:00:00 2001
From: AK <artyomkarpov@gmail.com>
Date: Fri, 27 Mar 2020 11:27:58 +0300
Subject: [PATCH 1319/1587] Fixes: 'null == null' and performance improvements

---
 UltiSnips/cs.snippets | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/UltiSnips/cs.snippets b/UltiSnips/cs.snippets
index 9de333d18..4c58bcbe6 100644
--- a/UltiSnips/cs.snippets
+++ b/UltiSnips/cs.snippets
@@ -308,22 +308,28 @@ endsnippet
 #  methods  #
 #############
 
-snippet equals "Equals method" b
+snippet equals "Equality for a type" b
 public override bool Equals(object obj) => Equals(obj as ${1:TYPE});
 
-public bool Equals($1 other) 
+public bool Equals($1 other)  // IEquatable<$1>
 {
-	if (other == null)
+	if (object.ReferenceEquals(other, null))
 		return false;
-	${0}
+	if (object.ReferenceEquals(this, other))
+		return true;
+	if (this.GetType() != other.GetType())
+		return false;
+	$0
 	return base.Equals(other);
 }
 
-public override int GetHashCode() => this.GetHashCode(); // TODO
+public override int GetHashCode() => base.GetHashCode();
 
-public static bool operator ==($1 x, $1 y) => x.Equals(y);
+public static bool operator ==($1 x, $1 y) =>
+	(object.ReferenceEquals(x, null) && object.ReferenceEquals(y, null))
+	|| (!object.ReferenceEquals(x, null) && x.Equals(y));
 
-public static bool operator !=($1 x, $1 y) => !x.Equals(y); 
+public static bool operator !=($1 x, $1 y) => !(x == y);
 
 endsnippet
 

From a18c2155dd219edcb94dab573b005f40433fbc84 Mon Sep 17 00:00:00 2001
From: Daniel Vinciguerra <daniel.vinciguerra@bivee.com.br>
Date: Thu, 26 Mar 2020 09:18:24 -0300
Subject: [PATCH 1320/1587] Add perl ddp snippet

Add `ddp` snippet by using DDP module for a better debugging dump experience.

https://metacpan.org/pod/DDP
---
 snippets/perl.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index 2ed2932a6..b318d18c5 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -357,6 +357,10 @@ snippet dump
 	use Data::Dump qw(dump);
 	warn dump ${1:variable}
 
+snippet ddp
+	use DDP;
+	p ${1:variable}
+
 snippet subtest
 	subtest '${1: test_name}' => sub {
 		${2}

From 1ed162971d0b859dc940f2bd3bb16ee49f8a3474 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Sun, 29 Mar 2020 18:46:05 +0100
Subject: [PATCH 1321/1587] awk: removed empty lines

Removing empty lines, as the undesirably become part of the snippet.
---
 snippets/awk.snippets | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/snippets/awk.snippets b/snippets/awk.snippets
index 5c94734a4..64f61c0c3 100644
--- a/snippets/awk.snippets
+++ b/snippets/awk.snippets
@@ -1,88 +1,70 @@
 # cannot use /usr/bin/env because it does not support parameters (as -f)
 snippet #! #!/usr/bin/awk -f
 	#!/usr/bin/awk -f
-
 # @include is a gawk extension
 snippet inc @include
 	@include "${1}"${0}
-
 # @load is a gawk extension
 snippet loa @load
 	@load "${1}"${0}
-
 snippet beg BEGIN { ... }
 	BEGIN {
 		${0}
 	}
-
 # BEGINFILE is a gawk extension
 snippet begf BEGINFILE { ... }
 	BEGINFILE {
 		${0}
 	}
-
 snippet end END { ... }
 	END {
 		${0}
 	}
-
 # ENDFILE is a gawk extension
 snippet endf ENDFILE { ... }
 	ENDFILE {
 		${0}
 	}
-
 snippet pri print
 	print ${1:"${2}"}${0}
-
 snippet printf printf
 	printf("${1:%s}\n", ${2})${0}
-
 snippet ign IGNORECASE
 	IGNORECASE = ${1:1}
-
 snippet if if {...}
 	if (${1}) {
 		${0:${VISUAL}}
 	}
-
 snippet ife if ... else ...
 	if (${1}) {
 		${2:${VISUAL}}
 	} else {
 		${0}
 	}
-
 snippet eif else if ...
 	else if (${1}) {
 		${0}
 	}
-
 snippet el else {...}
 	else {
 		${0}
 	}
-
 snippet wh while
 	while (${1}) {
 		${2}
 	}
-
 snippet do do ... while
 	do {
 		${0}
 	} while (${1})
-
 snippet for for
 	for (${2:i} = 0; i < ${1:n}; ${3:++i}) {
 		${0}
 	}
-
 snippet fore for each
 	for (${1:i} in ${2:array}) {
 		${0}
 	}
-
 # the switch is a gawk extension
 snippet sw switch
 	switch (${1}) {
@@ -93,10 +75,8 @@ snippet sw switch
 		${0}
 		break
 	}
-
 # the switch is a gawk extension
 snippet case case
 	case ${1}:
 		${0}
 		break
-

From bb3f87e4447b26c3b350d7fff418481a16959240 Mon Sep 17 00:00:00 2001
From: Hwasoo Cho <hscho817@gmail.com>
Date: Sat, 13 Jul 2019 12:35:23 +0900
Subject: [PATCH 1322/1587] Add Flutter snippets

---
 snippets/dart.snippets | 58 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index de5cb6239..666765fff 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -81,3 +81,61 @@ snippet tryf
 	} catch (${1:Exception e}) {
 	} finally {
 	}
+
+# Flutter stateless widget
+snippet stless
+	class $1 extends StatelessWidget {
+		@override
+		Widget build(BuildContext context) {
+			return Container(
+				$2
+			);
+		}
+	}
+
+# Flutter stateful widget
+snippet stful
+	class $1 extends StatefulWidget {
+		@override
+		_$1State createState() => _$1State();
+	}
+
+	class _$1State extends State<$1> {
+		@override
+		Widget build(BuildContext context) {
+			return Container(
+				$2
+			);
+		}
+	}
+
+# Flutter widget with AnimationController
+snippet stanim
+	class $1 extends StatefulWidget {
+		@override
+		_$1State createState() => _$1State();
+	}
+
+	class _$1State extends State<$1>
+			with SingleTickerProviderStateMixin {
+		AnimationController _controller;
+
+		@override
+		void initState() {
+			super.initState();
+			_controller = AnimationController(vsync: this);
+		}
+
+		@override
+		void dispose() {
+			super.dispose();
+			_controller.dispose();
+		}
+
+		@override
+		Widget build(BuildContext context) {
+			return Container(
+				$2
+			);
+		}
+	}

From b62dfce8449d8a8196720ddd3cfecbca8bb7fe45 Mon Sep 17 00:00:00 2001
From: bigzhu <vermiliondun@gmail.com>
Date: Fri, 3 Apr 2020 14:52:42 +0800
Subject: [PATCH 1323/1587] Add Dart Flutter snippets

---
 snippets/dart-flutter.snippets | 59 ++++++++++++++++++++++++++++++++++
 snippets/dart.snippets         | 58 ---------------------------------
 2 files changed, 59 insertions(+), 58 deletions(-)
 create mode 100644 snippets/dart-flutter.snippets

diff --git a/snippets/dart-flutter.snippets b/snippets/dart-flutter.snippets
new file mode 100644
index 000000000..f3ded26a8
--- /dev/null
+++ b/snippets/dart-flutter.snippets
@@ -0,0 +1,59 @@
+# Snippets for dart in flutter project, to use add the following to your .vimrc
+# `autocmd BufRead,BufNewFile,BufEnter *.dart UltiSnipsAddFiletypes dart-flutter`
+# Flutter stateless widget
+snippet stless
+	class $1 extends StatelessWidget {
+		@override
+		Widget build(BuildContext context) {
+			return Container(
+				$2
+			);
+		}
+	}
+
+# Flutter stateful widget
+snippet stful
+	class $1 extends StatefulWidget {
+		@override
+		_$1State createState() => _$1State();
+	}
+
+	class _$1State extends State<$1> {
+		@override
+		Widget build(BuildContext context) {
+			return Container(
+				$2
+			);
+		}
+	}
+
+# Flutter widget with AnimationController
+snippet stanim
+	class $1 extends StatefulWidget {
+		@override
+		_$1State createState() => _$1State();
+	}
+
+	class _$1State extends State<$1>
+			with SingleTickerProviderStateMixin {
+		AnimationController _controller;
+
+		@override
+		void initState() {
+			super.initState();
+			_controller = AnimationController(vsync: this);
+		}
+
+		@override
+		void dispose() {
+			super.dispose();
+			_controller.dispose();
+		}
+
+		@override
+		Widget build(BuildContext context) {
+			return Container(
+				$2
+			);
+		}
+	}
diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index 666765fff..de5cb6239 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -81,61 +81,3 @@ snippet tryf
 	} catch (${1:Exception e}) {
 	} finally {
 	}
-
-# Flutter stateless widget
-snippet stless
-	class $1 extends StatelessWidget {
-		@override
-		Widget build(BuildContext context) {
-			return Container(
-				$2
-			);
-		}
-	}
-
-# Flutter stateful widget
-snippet stful
-	class $1 extends StatefulWidget {
-		@override
-		_$1State createState() => _$1State();
-	}
-
-	class _$1State extends State<$1> {
-		@override
-		Widget build(BuildContext context) {
-			return Container(
-				$2
-			);
-		}
-	}
-
-# Flutter widget with AnimationController
-snippet stanim
-	class $1 extends StatefulWidget {
-		@override
-		_$1State createState() => _$1State();
-	}
-
-	class _$1State extends State<$1>
-			with SingleTickerProviderStateMixin {
-		AnimationController _controller;
-
-		@override
-		void initState() {
-			super.initState();
-			_controller = AnimationController(vsync: this);
-		}
-
-		@override
-		void dispose() {
-			super.dispose();
-			_controller.dispose();
-		}
-
-		@override
-		Widget build(BuildContext context) {
-			return Container(
-				$2
-			);
-		}
-	}

From 94b0aa4f9b00810eeb02e63e10524ea89b1c051e Mon Sep 17 00:00:00 2001
From: Douglas <douglas@pop-os.localdomain>
Date: Tue, 14 Apr 2020 20:48:34 +0200
Subject: [PATCH 1324/1587] added ejs.snippets file

---
 UltiSnips/ejs.snippets | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 UltiSnips/ejs.snippets

diff --git a/UltiSnips/ejs.snippets b/UltiSnips/ejs.snippets
new file mode 100644
index 000000000..1e3c0044f
--- /dev/null
+++ b/UltiSnips/ejs.snippets
@@ -0,0 +1,10 @@
+snippet for "ejs for loop" b
+<% for (let ${1:i = 0}; ${2:i<arr.length}; ${3:i++}) { %>
+	${0:body}
+<% } %>
+endsnippet
+snippet forE "ejs for Each loop" b
+<% ${1:array}.forEach((${2:single var}) => { %>
+	${0:body}
+<% }) %>
+endsnippet

From 15304b94395a306eb04c8f05b9255ae7591068b9 Mon Sep 17 00:00:00 2001
From: Douglas <douglas@pop-os.localdomain>
Date: Tue, 14 Apr 2020 22:08:15 +0200
Subject: [PATCH 1325/1587] added javascript_react.snippets file

---
 UltiSnips/javascript_react.snippets | 42 +++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 UltiSnips/javascript_react.snippets

diff --git a/UltiSnips/javascript_react.snippets b/UltiSnips/javascript_react.snippets
new file mode 100644
index 000000000..d529c54cf
--- /dev/null
+++ b/UltiSnips/javascript_react.snippets
@@ -0,0 +1,42 @@
+# Functional components
+snippet rfc "react functional component" b
+import React, {useState} from "react"
+
+function ${1:`!p snip.rv = snip.basename`}(${2}){
+	return(
+		<div>
+			${3:<p>Body</p>}
+		</div>
+		)
+}
+
+export default $4`!p snip.rv = snip.basename`
+endsnippet
+# React Hooks
+snippet useS "useState Hook" b
+const [${1}, set$1`!p snip.rv=t[1].title()`] = useState(${3:"${4}"})
+endsnippet
+snippet useE "useEffect Hook" b
+useEffect(() => {
+	${1:${0}}
+		}${2})
+endsnippet
+snippet useC "useContext Hook" b
+const ${1:context} = useContext(${2})
+endsnippet
+snippet useRe "useReducer Hook" b
+const [${3:state}, ${4:dispatch}] = useReducer(${5:reducer}, ${2:initial_value})
+endsnippet
+snippet useCB "useCallback(fn, inputs)" b
+const ${1:callback} = useCallback((${2})) => ${3:{
+	${4}
+}}, [${5}]
+endsnippet
+snippet useM "useMemo(fn, inputs)" b
+const ${1:memorized} = useMemo(() => ${2:{
+	${3}
+}}, [${4}])
+endsnippet
+snippet useR "useRef(defaultValue)" b
+const ${1:ref} = useRef(${2:null})
+endsnippet

From 0344b2dbce400b900ed9f99ad2a9d1a9ec497e80 Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <mr.felixoid@gmail.com>
Date: Sat, 18 Apr 2020 17:32:38 +0200
Subject: [PATCH 1326/1587] Add python snippet to assign attributes to self.

---
 snippets/python.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 619e55978..cd1224dfc 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -123,6 +123,8 @@ snippet ret
 	return ${0}
 snippet .
 	self.
+snippet sa self.attribute = attribute
+	self.${1:attribute} = $1
 snippet try Try/Except
 	try:
 		${1:${VISUAL}}

From dbfffb971b46bfb9bc90763d4ccad97e3277cd7b Mon Sep 17 00:00:00 2001
From: Lane East <laneast@laneast.com>
Date: Mon, 20 Apr 2020 21:47:47 +0800
Subject: [PATCH 1327/1587] c.snippets: make argv modifiable

C standard 5.1.2.2.1:

The parameters argc and argv and the strings pointed to by the argv
array shall be modifiable by the program, and retain their last-stored
values between program startup and program termination.
---
 snippets/c.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index 614a48827..5c084154e 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -1,7 +1,7 @@
 ## Main
 # main
 snippet main
-	int main(int argc, const char *argv[])
+	int main(int argc, char *argv[])
 	{
 		${0}
 		return 0;

From ad4407f31bf170b0813fb9b03f851cf79b5f65ca Mon Sep 17 00:00:00 2001
From: John Karahalis <john.karahalis@gmail.com>
Date: Tue, 21 Apr 2020 14:37:29 -0400
Subject: [PATCH 1328/1587] Add basic Svelte snippets

Like Vue, Svelte[1] files are templates composed of HTML, CSS, and
JavaScript. I don't have enough experience with Svelte to add
Svelte-specific snippets, but perhaps others can add to this over time.

[1] https://svelte.dev/
---
 UltiSnips/svelte.snippets | 1 +
 snippets/svelte.snippets  | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 UltiSnips/svelte.snippets
 create mode 100644 snippets/svelte.snippets

diff --git a/UltiSnips/svelte.snippets b/UltiSnips/svelte.snippets
new file mode 100644
index 000000000..4e09d0cc6
--- /dev/null
+++ b/UltiSnips/svelte.snippets
@@ -0,0 +1 @@
+extends html, javascript, css
diff --git a/snippets/svelte.snippets b/snippets/svelte.snippets
new file mode 100644
index 000000000..4e09d0cc6
--- /dev/null
+++ b/snippets/svelte.snippets
@@ -0,0 +1 @@
+extends html, javascript, css

From 63a72e1a30012fb9c0e853b03a68d3f7cc21247b Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Sat, 25 Apr 2020 10:38:00 +0100
Subject: [PATCH 1329/1587] haskell: removed repeated whitespaces

Whitespaces were used to make the snippet code look prettier and
aligned, but this introduces actual whitespace when the snippets
are expanded.
---
 snippets/haskell.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/haskell.snippets b/snippets/haskell.snippets
index 3965f1da5..585d35222 100644
--- a/snippets/haskell.snippets
+++ b/snippets/haskell.snippets
@@ -21,9 +21,9 @@ snippet info
 snippet imp
 	import ${0:Data.Text}
 snippet import
-	import           ${0:Data.Text}
+	import ${0:Data.Text}
 snippet import2
-	import           ${1:Data.Text} (${0:head})
+	import ${1:Data.Text} (${0:head})
 snippet impq
 	import qualified ${1:Data.Text} as ${0:T}
 snippet importq

From 5332d404e48d1f90f1dff52f0c8fa53161612b9d Mon Sep 17 00:00:00 2001
From: narimiran <narimiran@disroot.org>
Date: Sun, 26 Apr 2020 08:42:49 +0200
Subject: [PATCH 1330/1587] add more Racket snippets

---
 snippets/racket.snippets | 113 +++++++++++++++++++++++++++++----------
 1 file changed, 86 insertions(+), 27 deletions(-)

diff --git a/snippets/racket.snippets b/snippets/racket.snippets
index 723d7383a..5304cd8b6 100644
--- a/snippets/racket.snippets
+++ b/snippets/racket.snippets
@@ -1,3 +1,4 @@
+# Languages
 snippet #r
 	#lang racket
 snippet #tr
@@ -10,63 +11,121 @@ snippet #d
 	#lang datalog
 snippet #wi
 	#lang web-server/insta
+
+# Defines
 snippet def
 	(define ${1} ${0})
 snippet defun
 	(define (${1})
 		${0})
+snippet defv "define-values"
+	(define-values (${1}) (${0}))
+snippet defm "define/match"
+	(define/match (${1})
+	  [(${2}) ${3}]
+		${0})
+snippet defs "define-syntax"
+	(define-syntax (${1})
+		${0})
+
+# Conditionals
 snippet if
 	(if ${1} ${2} ${0})
 snippet ifn
-	(if (not ${1}) ${2} {0})
+	(if (not ${1}) ${2} ${0})
 snippet ifl
 	(if ${1}
-		(let ()
-			${2})
+		(let (${2})
+			${3})
 		${0})
 snippet ifnl
 	(if (not ${1})
-		(let ()
+		(let (${2})
+			${3})
+		${0})
+snippet ifb
+	(if ${1}
+		(begin
+			${2})
+		${0})
+snippet ifnb
+	(if (not ${1})
+		(begin
 			${2})
 		${0})
 snippet when
 	(when ${1}
 		${0})
+snippet unless
+	(unless ${1} ${2} ${0})
 snippet cond
 	(cond
-		[(${1})
-			${0}])
+		[(${1}) ${0}])
+snippet conde
+	(cond
+		[(${1}) ${2}]
+		[else ${0}])
 snippet case
 	(case ${1}
-		[(${2})
-			${0}])
+		[(${2}) ${0}])
 snippet match
 	(match ${1}
-		[(${2})
-			${0}])
-snippet letcc
-	(let/cc here (set! ${1} here) ${0})
+		[(${2}) ${0}])
+
+# For iterations
 snippet for
-	(for ([${1} ${2}])
+	(for ([${1}])
+		${0})
+snippet forl "for/list"
+	(for/list ([${1}])
+		${0})
+snippet forf "for/fold"
+	(for/fold
+		([${1}])
+		([${2}])
+		${0})
+snippet forfr "for/foldr"
+	(for/foldr
+		([${1}])
+		([${2}])
+		${0})
+snippet fora "for/and"
+	(for/and ([${1}])
+		${0})
+snippet foro "for/or"
+	(for/or ([${1}])
 		${0})
+snippet fors "for/sum"
+	(for/sum ([${1}])
+		${0})
+snippet forp "for/product"
+	(for/product ([${1}])
+		${0})
+snippet forfi "for/first"
+	(for/first ([${1}])
+		${0})
+snippet forla "for/last"
+	(for/last ([${1}])
+		${0})
+
+snippet lambda
+	(lambda (${1}) ${0})
+snippet apply
+	(apply ${1} ${0})
+snippet map
+	(map ${1} ${0})
+snippet filter
+	(filter ${1} ${0})
+
 snippet req
 	(require ${0})
-snippet unless
-	(unless ${1} ${2} ${0})
+snippet prov
+	(provide ${0})
+
 snippet let
 	(let ([${1}]) ${0})
+snippet letcc
+	(let/cc here (set! ${1} here) ${0})
 snippet begin
 	(begin
 		${0})
-snippet lambda
-	(lambda (${1}) ${0})
-snippet ifb
-	(if ${1}
-		(begin
-			${2})
-		${0})
-snippet ifnb
-	(if (not ${1})
-		(begin
-			${2})
-		${0})

From f1ae43d6e2110c7f6a714261cb1e11ab82d62f12 Mon Sep 17 00:00:00 2001
From: douglas86 <douglasmaxton@gmail.com>
Date: Wed, 29 Apr 2020 21:49:36 +0200
Subject: [PATCH 1331/1587] fixes useState hook in javascript_react file

---
 UltiSnips/javascript_react.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/javascript_react.snippets b/UltiSnips/javascript_react.snippets
index d529c54cf..e80ec86f7 100644
--- a/UltiSnips/javascript_react.snippets
+++ b/UltiSnips/javascript_react.snippets
@@ -14,7 +14,7 @@ export default $4`!p snip.rv = snip.basename`
 endsnippet
 # React Hooks
 snippet useS "useState Hook" b
-const [${1}, set$1`!p snip.rv=t[1].title()`] = useState(${3:"${4}"})
+const [${1}, set`!p snip.rv=t[1].title()`] = useState(${3:"${4}"})
 endsnippet
 snippet useE "useEffect Hook" b
 useEffect(() => {

From 541f50ac92c96af5247fb9ef0de018f5acbcf716 Mon Sep 17 00:00:00 2001
From: Alex <alex@42layers.io>
Date: Fri, 1 May 2020 09:37:05 -0700
Subject: [PATCH 1332/1587] async function definitions

---
 UltiSnips/rust.snippets | 12 ++++++++++++
 snippets/rust.snippets  |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 39dff8f02..0e3db68e7 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -16,6 +16,18 @@ pub fn ${1:function_name}($2)${3/..*/ -> /}$3 {
 }
 endsnippet
 
+snippet afn "async fn name(?) -> ? {}"
+fn ${1:function_name}($2)${3/..*/ -> /}$3 {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet pafn "pub async fn name(?) -> ? {}"
+pub fn ${1:function_name}($2)${3/..*/ -> /}$3 {
+	${VISUAL}$0
+}
+endsnippet
+
 snippet pri "print!(..)" b
 print!("$1"${2/..*/, /}$2);
 endsnippet
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 692a0bf16..98088b0f8 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -11,6 +11,14 @@ snippet pfn "Function definition"
 	pub fn ${1:function_name}(${2})${3} {
 		${0}
 	}
+snippet afn "Async function definition"
+	async fn ${1:function_name}(${2})${3} {
+		${0}
+	}
+snippet pafn "Async function definition"
+	pub async fn ${1:function_name}(${2})${3} {
+		${0}
+	}
 snippet bench "Bench function" b
 	#[bench]
 	fn ${1:bench_function_name}(b: &mut test::Bencher) {

From a75c8eaec455ff6613a2d656069fcd1dccdedbc8 Mon Sep 17 00:00:00 2001
From: Roman Bereziuk <roma.physicist@gmail.com>
Date: Mon, 11 May 2020 23:23:59 +0300
Subject: [PATCH 1333/1587] Add missing quote in src attribute of audio tag

---
 snippets/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 0410d2237..bc42f9440 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -175,7 +175,7 @@ snippet aside#
 		${0}
 	</aside>
 snippet audio
-	<audio src="${1}>${0}</audio>
+	<audio src="${1}">${0}</audio>
 snippet b
 	<b>${0}</b>
 snippet base

From e2267a7fb5fbaea153826c87a00964602a8ad34b Mon Sep 17 00:00:00 2001
From: Yigit Sever <yigit.sever@tedu.edu.tr>
Date: Tue, 12 May 2020 15:35:12 +0300
Subject: [PATCH 1334/1587] Add UltiSnips formatted rust impl snippet

This snippet was added in 982f3472380187eabd56cc72bf2371c90b63e39e but
was removed in df26062a37500390c53f3efa7462384a86695e89 due to
duplication (#903). However, the snipmate formatted impl snippet does
not play well with UltiSnips due to nesting.

Fixes #1223
---
 UltiSnips/rust.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 0e3db68e7..196d322dd 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -44,4 +44,10 @@ snippet .it ".iter()" i
 .iter()$0
 endsnippet
 
+snippet impl "Struct/Trait implementation" b
+impl ${1:Type/Trait}${2: for ${3:Type}} {
+	$0
+}
+endsnippet
+
 # vim:ft=snippets:

From 25aee70abf467c4d4aba322ec918009c37e2982f Mon Sep 17 00:00:00 2001
From: Faule Socke <mail@ursschulz.de>
Date: Thu, 14 May 2020 09:17:25 +0200
Subject: [PATCH 1335/1587] Fix async function definitions to actually be async

---
 UltiSnips/rust.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index 196d322dd..b284f0a2d 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -17,13 +17,13 @@ pub fn ${1:function_name}($2)${3/..*/ -> /}$3 {
 endsnippet
 
 snippet afn "async fn name(?) -> ? {}"
-fn ${1:function_name}($2)${3/..*/ -> /}$3 {
+async fn ${1:function_name}($2)${3/..*/ -> /}$3 {
 	${VISUAL}$0
 }
 endsnippet
 
 snippet pafn "pub async fn name(?) -> ? {}"
-pub fn ${1:function_name}($2)${3/..*/ -> /}$3 {
+pub async fn ${1:function_name}($2)${3/..*/ -> /}$3 {
 	${VISUAL}$0
 }
 endsnippet

From 087d3e7c72912baeb6b1d7ba626e61d50092c848 Mon Sep 17 00:00:00 2001
From: Qiu Yu <unicell@gmail.com>
Date: Fri, 15 May 2020 09:31:39 -0700
Subject: [PATCH 1336/1587] Add missing angle bracket for markdown Disclosure
 snippet

---
 UltiSnips/markdown.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index b9962a102..72b9f8f73 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -136,7 +136,7 @@ endsnippet
 
 snippet detail "Disclosure"
 <details${3: open=""}>
-  ${1:summary>${2}</summary>}$0
+  ${1:<summary>${2}</summary>}$0
 </details>
 endsnippet
 

From 7f61b57981c851236931db45b1602bdf7f5a6930 Mon Sep 17 00:00:00 2001
From: Gianluca Recchia <gianluca.recchia97@gmail.com>
Date: Tue, 2 Jun 2020 17:48:44 +0200
Subject: [PATCH 1337/1587] Rename box snippet to boxp

Closes #1227.
---
 snippets/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 98088b0f8..5f90245e5 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -238,7 +238,7 @@ snippet macro "macro_rules!" b
 			$3
 		)
 	}
-snippet box "Box::new()"
+snippet boxp "Box::new()"
 	Box::new(${0:${VISUAL}})
 snippet rc "Rc::new()"
 	Rc::new(${0:${VISUAL}})

From f80f6426ff9679cc443e5057d820f0f608cca198 Mon Sep 17 00:00:00 2001
From: Gianluca Recchia <gianluca.recchia97@gmail.com>
Date: Tue, 2 Jun 2020 17:51:06 +0200
Subject: [PATCH 1338/1587] Add if-let and while-let snippets

---
 snippets/rust.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 5f90245e5..fc0de3394 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -122,6 +122,10 @@ snippet ife "if / else"
 	} else {
 		${0}
 	}
+snippet ifl "if let (...)"
+	if let ${1:Some(${2})} = $3 {
+		${0:${VISUAL}}
+	}
 snippet el "else"
 	else {
 		${0:${VISUAL}}
@@ -146,6 +150,10 @@ snippet wh "while loop"
 	while ${1:condition} {
 		${0:${VISUAL}}
 	}
+snippet whl "while let (...)"
+	while let ${1:Some(${2})} = $3 {
+		${0:${VISUAL}}
+	}
 snippet for "for ... in ... loop"
 	for ${1:i} in ${2} {
 		${0}

From 2347d4b2daf0e6db316538692b5ad36ffc843f26 Mon Sep 17 00:00:00 2001
From: Gianluca Recchia <gianluca.recchia97@gmail.com>
Date: Tue, 2 Jun 2020 17:53:39 +0200
Subject: [PATCH 1339/1587] Improve generic support for some snippets

---
 snippets/rust.snippets | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index fc0de3394..978f333b2 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -165,21 +165,21 @@ snippet fixme "FIXME comment"
 	// FIXME: $0
 # Struct
 snippet st "Struct definition"
-	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}${2:<${3:T}>} {
 		${0}
 	}
 snippet impl "Struct/Trait implementation"
-	impl ${1:Type/Trait}${2: for ${3:Type}} {
+	impl$4 ${1:Type/Trait}${2: for ${3:Type}}${4:<${5:T}>} {
 		${0}
 	}
 snippet stn "Struct with new constructor"
-	pub struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+	pub struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}${2:<${3:T}>} {
 		${0}
 	}
 
-	impl $1 {
-		pub fn new(${2}) -> Self {
-			$1 { ${3} }
+	impl$2 $1$2 {
+		pub fn new(${4}) -> Self {
+			$1 { ${5} }
 		}
 	}
 snippet ty "Type alias"
@@ -198,7 +198,7 @@ snippet trait "Trait definition"
 		${0}
 	}
 snippet drop "Drop trait implementation (destructor)"
-	impl Drop for ${1:Name} {
+	impl$2 Drop for ${1:Name}${2:<${3:T}>} {
 		fn drop(&mut self) {
 			${0}
 		}

From 900bf93c6680e38ce568dba26c3f48b4365ac730 Mon Sep 17 00:00:00 2001
From: Gianluca Recchia <gianluca.recchia97@gmail.com>
Date: Tue, 2 Jun 2020 18:05:50 +0200
Subject: [PATCH 1340/1587] Add use snippet

---
 snippets/rust.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 978f333b2..66b3d3e42 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -252,3 +252,5 @@ snippet rc "Rc::new()"
 	Rc::new(${0:${VISUAL}})
 snippet unim "unimplemented!()"
 	unimplemented!()
+snippet use "use ...;" b
+	use ${1:std::${2:io}};

From 3f805a0101e5fdfea4eab992af5aa50e8a242459 Mon Sep 17 00:00:00 2001
From: Alex Riina <alex.riina@gmail.com>
Date: Sat, 27 Jun 2020 18:48:05 -0400
Subject: [PATCH 1341/1587] add snippet for gitcommit co-author directive

---
 snippets/gitcommit.snippets | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 snippets/gitcommit.snippets

diff --git a/snippets/gitcommit.snippets b/snippets/gitcommit.snippets
new file mode 100644
index 000000000..93b2c5d0e
--- /dev/null
+++ b/snippets/gitcommit.snippets
@@ -0,0 +1,2 @@
+snippet co
+	Co-authored-by: ${1} <${2}>

From 2a4beefc7dfff8419f40f2672cfaaa726bdbff72 Mon Sep 17 00:00:00 2001
From: Duc Nghiem Xuan <xuanduc987@users.noreply.github.com>
Date: Fri, 10 Jul 2020 11:52:57 +0900
Subject: [PATCH 1342/1587] Add missing closing paren in useCallback hook

---
 UltiSnips/javascript_react.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/javascript_react.snippets b/UltiSnips/javascript_react.snippets
index e80ec86f7..666c80e34 100644
--- a/UltiSnips/javascript_react.snippets
+++ b/UltiSnips/javascript_react.snippets
@@ -30,7 +30,7 @@ endsnippet
 snippet useCB "useCallback(fn, inputs)" b
 const ${1:callback} = useCallback((${2})) => ${3:{
 	${4}
-}}, [${5}]
+}}, [${5}])
 endsnippet
 snippet useM "useMemo(fn, inputs)" b
 const ${1:memorized} = useMemo(() => ${2:{

From 64567da52e98d0e02cb4b87a2b0f5a7417970b60 Mon Sep 17 00:00:00 2001
From: Grzegorz Smajdor <grzegorz.smajdor@gmail.com>
Date: Wed, 15 Jul 2020 20:38:03 +0200
Subject: [PATCH 1343/1587] fix clojure snippets

---
 snippets/clojure.snippets | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/snippets/clojure.snippets b/snippets/clojure.snippets
index 152f896e9..048ce9fee 100644
--- a/snippets/clojure.snippets
+++ b/snippets/clojure.snippets
@@ -8,21 +8,21 @@ snippet def
 	(def ${0})
 snippet defm
 	(defmethod ${1:multifn} "${2:doc-string}" ${3:dispatch-val} [${4:args}]
-		${0})
+		${0:code})
 snippet defmm
 	(defmulti ${1:name} "${2:doc-string}" ${0:dispatch-fn})
 snippet defma
 	(defmacro ${1:name} "${2:doc-string}" ${0:dispatch-fn})
 snippet defn
 	(defn ${1:name} "${2:doc-string}" [${3:arg-list}]
-		${0})
+		${0:code})
 snippet defp
 	(defprotocol ${1:name}
-		${0})
+		${0:code})
 snippet defr
 	(defrecord ${1:name} [${2:fields}]
 		${3:protocol}
-		${0})
+		${0:code})
 snippet deft
 	(deftest ${1:name}
 		(is (= ${0:assertion})))
@@ -31,12 +31,12 @@ snippet is
 snippet defty
 	(deftype ${1:Name} [${2:fields}]
 		${3:Protocol}
-		${0})
+		${0:code})
 snippet doseq
 	(doseq [${1:elem} ${2:coll}]
-		${0})
+		${0:code})
 snippet fn
-	(fn [${1:arg-list}] ${0})
+	(fn [${1:arg-list}] ${0:code})
 snippet if
 	(if ${1:test-expr}
 		${2:then-expr}
@@ -50,24 +50,24 @@ snippet imp
 		& {:keys [${1:keys}] :or {${0:defaults}}}
 snippet let
 	(let [${1:name} ${2:expr}]
-		${0})
+		${0:code})
 snippet letfn
 	(letfn [(${1:name}) [${2:args}]
-		${0})])
+		${0:code})])
 snippet map
 	(map ${1:func} ${0:coll})
 snippet mapl
 	(map #(${1:lambda}) ${0:coll})
 snippet met
 	(${1:name} [${2:this} ${3:args}]
-		${0})
+		${0:code})
 snippet ns
 	(ns ${0:name})
 snippet dotimes
 	(dotimes [_ 10]
 		(time
 			(dotimes [_ ${1:times}]
-				${0})))
+				${0:code})))
 snippet pmethod
 	(${1:name} [${2:this} ${0:args}])
 snippet refer

From bf94550e930e1b79cd27c04b9bb2c5aa32ee8a0e Mon Sep 17 00:00:00 2001
From: Eyal Kalderon <ebkalderon@gmail.com>
Date: Thu, 16 Jul 2020 20:24:54 +0800
Subject: [PATCH 1344/1587] Eliminate Python encoding error on every startup

Because `pythonx/vimsnippets.py` lacks a magic comment declaring the
file encoding compliant with PEP 263, I've been seeing the following
`SyntaxError` interrupt my flow every single time I open the editor.

```
[coc.nvim] Error on execute python script: request error nvim_command - Vim(return):Error invoking 'python_execute_file' on channel 4 (python2-script-host):
Traceback (most recent call last):
  File "/var/folders/dg/cqpqw4cd2vx68kl1rw6cgs8h0000gn/T/coc.nvim-49796/coc-ultisnips-NFLbThHae1.py", line 286, in <module>
    from vimsnippets import foldmarker, make_box, get_comment_format
  File "/usr/local/lib/python2.7/site-packages/pynvim/plugin/script_host.py", line 235,
in load_module
    return imp.load_module(fullname, *self.module)
  File "/Users/eyalkalderon/.config/nvim/plugged/vim-snippets/pythonx/vimsnippets.py", line 114
SyntaxError: Non-ASCII character '\xe2' in file /Users/eyalkalderon/.config/nvim/plugged/vim-snippets/pythonx/vimsnippets.py on line 114, but no encoding declared; see http://python.org/dev/peps/pep-0263/ for details
```

Adding the necessary magic comment to the file and putting it at the
top instead of the bottom thankfully silences the error.

Also, the problematic lines of Python which trigger this error seem to
be copied verbatim from https://stackoverflow.com/a/2718268. In the
posted solution, they include the magic comment, but this file does not.
---
 pythonx/vimsnippets.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index 3c638a17f..0dcf30e98 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -1,3 +1,5 @@
+# vim:set et fileencoding=utf8 sts=0 sw=4 ts=4:
+
 """Helper methods used in UltiSnips snippets."""
 
 import string, vim, re
@@ -114,5 +116,3 @@ def has_cjk(s):
     cjk_re = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-鿃豈-鶴侮-頻並-龎]', re.UNICODE)
 
     return cjk_re.search(s) is not None
-
-# vim:set et sts=0 sw=4 ts=4:

From 75e828ab9295b0b4cc475691ee3d7e484282b192 Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <KoviRobi@users.noreply.github.com>
Date: Wed, 22 Jul 2020 19:15:52 +0100
Subject: [PATCH 1345/1587] Elixir: Fix mirror of `defsd`, add `defs`

Mirror is not using braces, so it's `$1` not `${1}` (at least for UltiSnips, but SnipMate supports this syntax too https://github.com/garbas/vim-snipmate/blob/master/doc/SnipMate.txt#L379).

Seems like this is a feature and not a bug of UltiSnips (https://github.com/SirVer/ultisnips/issues/875, https://github.com/SirVer/ultisnips/issues/875).

I have also added a `defs` which hasn't got the docstring, but is otherwise the same as `defsd`. Perhaps I should always use a docstring, but sometimes I feel the name of the function is descriptive enough.
---
 snippets/elixir.snippets | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 468575d09..c81b8eac0 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -92,12 +92,17 @@ snippet defd
 	def ${2:name} do
 		${0}
 	end
+snippet defs
+	@spec ${1:name}(${2:arg types}) :: ${3:no_return}
+	def $1(${4:args}) do
+		${0}
+	end
 snippet defsd
 	@doc """
 	${1:doc string}
 	"""
-	@spec ${2:name} :: ${3:no_return}
-	def ${2} do
+	@spec ${2:name}(${3:arg types}) :: ${4:no_return}
+	def $2(${5:args}) do
 		${0}
 	end
 snippet defim

From ab824142634fb0e9dc8a455356a15730f48361f0 Mon Sep 17 00:00:00 2001
From: Gianluca Recchia <gianluca.recchia97@gmail.com>
Date: Mon, 27 Jul 2020 07:01:48 +0200
Subject: [PATCH 1346/1587] Fix PowerShell snippet

A dollar sign was missing to make the snippet work.
---
 snippets/ps1.snippets | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/snippets/ps1.snippets b/snippets/ps1.snippets
index 41099d9d9..08de1efd8 100644
--- a/snippets/ps1.snippets
+++ b/snippets/ps1.snippets
@@ -29,8 +29,8 @@ snippet function
 # PowerShell Splatting
 snippet splatting
 	$Params = @{
-		${1:Param1} = '{2:Value1}'
-		${3:Param2} = '{4:Value2}'
+		${1:Param1} = '${2:Value1}'
+		${3:Param2} = '${4:Value2}'
 	}
 	${5:CommandName} @Params
 
@@ -99,4 +99,3 @@ snippet switch
 		${2:condition1} { ${3:action} }
 		${4:condition2} { ${5:action} }
 		default { ${6:action} }
-

From 2a273f1914489b5f199b68607e5e37c0025a9c35 Mon Sep 17 00:00:00 2001
From: Gianluca Recchia <gianluca.recchia97@gmail.com>
Date: Sat, 1 Aug 2020 08:39:17 +0200
Subject: [PATCH 1347/1587] Remove nested snippets from snipMate snippets

snipMate doesn't seem to support them so they're incorrectly expanded.
---
 UltiSnips/rust.snippets |  4 ++--
 snippets/rust.snippets  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets
index b284f0a2d..6fc07e933 100644
--- a/UltiSnips/rust.snippets
+++ b/UltiSnips/rust.snippets
@@ -45,8 +45,8 @@ snippet .it ".iter()" i
 endsnippet
 
 snippet impl "Struct/Trait implementation" b
-impl ${1:Type/Trait}${2: for ${3:Type}} {
-	$0
+impl$4 ${1:Type/Trait}${2: for ${3:Type}}${4:<${5:T}>} {
+	${0}
 }
 endsnippet
 
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 66b3d3e42..99fd38783 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -123,7 +123,7 @@ snippet ife "if / else"
 		${0}
 	}
 snippet ifl "if let (...)"
-	if let ${1:Some(${2})} = $3 {
+	if let ${1:Some($2)} = $3 {
 		${0:${VISUAL}}
 	}
 snippet el "else"
@@ -151,7 +151,7 @@ snippet wh "while loop"
 		${0:${VISUAL}}
 	}
 snippet whl "while let (...)"
-	while let ${1:Some(${2})} = $3 {
+	while let ${1:Some($2)} = $3 {
 		${0:${VISUAL}}
 	}
 snippet for "for ... in ... loop"
@@ -165,15 +165,15 @@ snippet fixme "FIXME comment"
 	// FIXME: $0
 # Struct
 snippet st "Struct definition"
-	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}${2:<${3:T}>} {
+	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	}
 snippet impl "Struct/Trait implementation"
-	impl$4 ${1:Type/Trait}${2: for ${3:Type}}${4:<${5:T}>} {
+	impl ${1:Type/Trait}${2: for $3} {
 		${0}
 	}
 snippet stn "Struct with new constructor"
-	pub struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}${2:<${3:T}>} {
+	pub struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
 		${0}
 	}
 
@@ -198,7 +198,7 @@ snippet trait "Trait definition"
 		${0}
 	}
 snippet drop "Drop trait implementation (destructor)"
-	impl$2 Drop for ${1:Name}${2:<${3:T}>} {
+	impl Drop for $1 {
 		fn drop(&mut self) {
 			${0}
 		}
@@ -253,4 +253,4 @@ snippet rc "Rc::new()"
 snippet unim "unimplemented!()"
 	unimplemented!()
 snippet use "use ...;" b
-	use ${1:std::${2:io}};
+	use ${1:std::$2};

From 15f882c001e524762c6fa61b758ca9d699693965 Mon Sep 17 00:00:00 2001
From: Jeffin Mathew <jeffin@jusfocus.com>
Date: Sat, 8 Aug 2020 11:47:39 +0530
Subject: [PATCH 1348/1587] removed reference to models.permalink decorator as
 it removed from Django 2.1

---
 UltiSnips/django.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/UltiSnips/django.snippets b/UltiSnips/django.snippets
index d6e2d434f..a03cf1e3c 100644
--- a/UltiSnips/django.snippets
+++ b/UltiSnips/django.snippets
@@ -148,7 +148,6 @@ class ${1:MODELNAME}(models.Model):
 	def save(self):
 		return super($1, self).save()
 
-	@models.permalink
 	def get_absolute_url(self):
 		return ('')
 

From f8c88a8375b130944252d39739697821c3be9bca Mon Sep 17 00:00:00 2001
From: Ashish Panigrahi <ashish.panigrahi@protonmail.com>
Date: Wed, 12 Aug 2020 00:04:18 +0530
Subject: [PATCH 1349/1587] added tex snippets and removed unneccesary newlines

---
 UltiSnips/tex.snippets | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 0243b468c..8a096b291 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -9,15 +9,15 @@ def create_table(snip):
 	cols = snip.buffer[snip.line].split('x')[1]
 
 	int_val = lambda string: int(''.join(s for s in string if s.isdigit()))
-	
+
 	rows = int_val(rows)
 	cols = int_val(cols)
 
 	offset = cols + 1
 	old_spacing = snip.buffer[snip.line][:snip.buffer[snip.line].rfind('\t') + 1]
-	
+
 	snip.buffer[snip.line] = ''
-	
+
 	final_str = old_spacing + "\\begin{tabular}{|" + "|".join(['$' + str(i + 1) for i in range(cols)]) + "|}\n"
 
 	for i in range(rows):
@@ -35,7 +35,7 @@ def add_row(snip):
 	old_spacing = snip.buffer[snip.line][:snip.buffer[snip.line].rfind('\t') + 1]
 
 	snip.buffer[snip.line] = ''
-	
+
 	final_str = old_spacing
 	final_str += " & ".join(['$' + str(j + 1) for j in range(row_len)])
 	final_str += " \\\\\\"
@@ -63,7 +63,7 @@ $0${2/(?<=.)(c|l|r)|./(?1: & )/g}
 endsnippet
 
 pre_expand "create_table(snip)"
-snippet "gentbl(\d+)x(\d+)" "Generate table of *width* by *height*" r  
+snippet "gentbl(\d+)x(\d+)" "Generate table of *width* by *height*" r
 endsnippet
 
 pre_expand "add_row(snip)"
@@ -193,8 +193,6 @@ snippet acl "Acroynm expanded" b
 $0
 endsnippet
 
-
-
 snippet ni "Non-indented paragraph" b
 \noindent
 $0
@@ -241,4 +239,20 @@ snippet glnl "New long glossary item" b
   ${0:description}
 }
 endsnippet
+
+# Bold text
+snippet bf "Bold"
+\textbf{$1} $0
+endsnippet
+
+# Italic text
+snippet it "Italics"
+\textit{$1} $0
+endsnippet
+
+# Underlined text
+snippet und "Underline"
+\underline{$1} $0
+endsnippet
+
 # vim:ft=snippets:

From a7486b266a5e1dc92228e575969e10b5b95efad8 Mon Sep 17 00:00:00 2001
From: lambtho <github@thl.ovh>
Date: Fri, 14 Aug 2020 10:58:41 +0000
Subject: [PATCH 1350/1587] [FIX] Tex conflicting snippets for `it`

The `it` snippet was already used for `/item`. PR #1243 reused it for italics, leading to a conflict.
This PR uses `ita` for italics, as it is already the case in  [/snippets/tex.snippets](https://github.com/honza/vim-snippets/blob/master/snippets/tex.snippets).
---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 8a096b291..5c5721f30 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -246,7 +246,7 @@ snippet bf "Bold"
 endsnippet
 
 # Italic text
-snippet it "Italics"
+snippet ita "Italics"
 \textit{$1} $0
 endsnippet
 

From cbc87fe912a34fc59aea6f156984f69c33f7f76c Mon Sep 17 00:00:00 2001
From: Nahkryv <victor.s.ney@gmail.com>
Date: Wed, 19 Aug 2020 11:05:46 -0300
Subject: [PATCH 1351/1587] fixed the snippet cs and created the fcs

---
 snippets/eruby.snippets | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index b8879c5c5..daf98db08 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -46,8 +46,9 @@ snippet conf
 	<% content_for :${1:head} do %>
 		${0}
 	<% end %>
-snippet cs
-	<%= collection_select <+object+>, <+method+>, <+collection+>, <+value_method+>, <+text_method+><+, <+[options]+>, <+[html_options]+>+> %>
+
+snippet cs 
+	<%= collection_select(:${1:object}, :${2:method}, ${3:collection}, :${4:value_method}, :${5:text_method}, options = {${0:prompt: true}} %>        
 snippet ct
 	<%= content_tag '${1:DIV}', ${2:content}${0:,options} %>
 snippet ff
@@ -80,6 +81,8 @@ snippet ffta
 	<%= ${1:f}.text_area :${0:attribute} %>
 snippet fftf
 	<%= ${1:f}.text_field :${0:attribute} %>
+snippet fcs
+	<%= ${1:f}.collection_select(:${2:method}, ${3:collection}, :${4:value_method}, :${5:text_method}, options = {${0:prompt: true} %>
 snippet fields
 	<%= fields_for :${1:model}, @$1 do |${2:f}| %>
 		${0}

From c093074fec6ba83aced4958ea44af11c5e5dff30 Mon Sep 17 00:00:00 2001
From: nahkryv <48871377+nahkryv@users.noreply.github.com>
Date: Wed, 19 Aug 2020 11:13:09 -0300
Subject: [PATCH 1352/1587] Update eruby.snippets

---
 snippets/eruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index daf98db08..3d6391603 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -48,7 +48,7 @@ snippet conf
 	<% end %>
 
 snippet cs 
-	<%= collection_select(:${1:object}, :${2:method}, ${3:collection}, :${4:value_method}, :${5:text_method}, options = {${0:prompt: true}} %>        
+	<%= collection_select(:${1:object}, :${2:method}, ${3:collection}, :${4:value_method}, :${5:text_method}, options = {${0:prompt: true}}) %>        
 snippet ct
 	<%= content_tag '${1:DIV}', ${2:content}${0:,options} %>
 snippet ff
@@ -82,7 +82,7 @@ snippet ffta
 snippet fftf
 	<%= ${1:f}.text_field :${0:attribute} %>
 snippet fcs
-	<%= ${1:f}.collection_select(:${2:method}, ${3:collection}, :${4:value_method}, :${5:text_method}, options = {${0:prompt: true} %>
+	<%= ${1:f}.collection_select(:${2:method}, ${3:collection}, :${4:value_method}, :${5:text_method}, options = {${0:prompt: true}}) %>
 snippet fields
 	<%= fields_for :${1:model}, @$1 do |${2:f}| %>
 		${0}

From 7a6f32e05fbba64a143c5418b9e93da04fc07214 Mon Sep 17 00:00:00 2001
From: Ashish Panigrahi <ashish.panigrahi@tutanota.com>
Date: Thu, 27 Aug 2020 13:49:38 +0530
Subject: [PATCH 1353/1587] added a bunch of math tex snippets

---
 UltiSnips/tex.snippets | 95 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 5c5721f30..5331009c7 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -255,4 +255,99 @@ snippet und "Underline"
 \underline{$1} $0
 endsnippet
 
+# converts sympy code into latex
+snippet sympy "sympy block" w
+sympy $1 sympy$0
+endsnippet
+
+# corresponding snippet for the above
+snippet 'sympy(.*)sympy' "evaluate sympy" wr
+`!p
+from sympy import *
+x, y, z, t = symbols('x y z t')
+k, m, n = symbols('k m n', integer=True)
+f, g, h = symbols('f g h', cls=Function)
+init_printing()
+snip.rv = eval('latex(' + match.group(1).replace('\\', '') \
+		.replace('^', '**') \
+		.replace('{', '(') \
+		.replace('}', ')') + ')')
+`
+endsnippet
+
+# Time derivative
+snippet ddt "ddt"
+\frac{d}{dt} $1 $0
+endsnippet
+
+# Limit
+snippet lim "limit"
+\lim_{$1} {$2} $0
+endsnippet
+
+# Partial derivative
+snippet pdv "partial derivation"
+\frac{\partial $1}{\partial $2} $0
+endsnippet
+
+# Second order partial derivative
+snippet ppdv "partial derivation"
+\frac{\partial^2 $1}{\partial $2 \partial $3} $0
+endsnippet
+
+# Ordinary derivative
+snippet dv "derivative"
+\frac{d $1}{d $2} $0
+endsnippet
+
+# Summation
+snippet sum "summation"
+\sum_{$1} $0
+endsnippet
+
+# Shorthand for time derivative
+snippet dot "dot"
+\dot{$1} $0
+endsnippet
+
+# Shorthand for second order time derivative
+snippet ddot "dot"
+\ddot{$1} $0
+endsnippet
+
+# Vector
+snippet vec "vector"
+\vec{$1} $0
+endsnippet
+
+# Cross product
+snippet \x "cross product"
+\times $0
+endsnippet
+
+# Dot product
+snippet . "dot product"
+\cdot $0
+endsnippet
+
+# Integral
+snippet int "integral"
+\int_{$1}^{$2} $3 \: d$4 $5
+endsnippet
+
+# Fancy math letters
+snippet mc "mathcal"
+\mathcal{$1} $0
+endsnippet
+
+# Right arrow
+snippet ra "rightarrow"
+\rightarrow $0
+endsnippet
+
+# Long right arrow
+snippet lra "longrightarrow"
+\longrightarrow $0
+endsnippet
+
 # vim:ft=snippets:

From 2be9e440f72a07135277a0792918dfd2e3eeb2d8 Mon Sep 17 00:00:00 2001
From: Ashish Panigrahi <ashish.panigrahi@tutanota.com>
Date: Thu, 27 Aug 2020 13:51:28 +0530
Subject: [PATCH 1354/1587] corrected a comment

---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 5331009c7..1bd484a89 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -260,7 +260,7 @@ snippet sympy "sympy block" w
 sympy $1 sympy$0
 endsnippet
 
-# corresponding snippet for the above
+# corresponding snippet for evaluating sympy
 snippet 'sympy(.*)sympy' "evaluate sympy" wr
 `!p
 from sympy import *

From 3805db7f2d539ef5c92b54263a97355bfb1609df Mon Sep 17 00:00:00 2001
From: Ashish Panigrahi <ashish.panigrahi@tutanota.com>
Date: Thu, 27 Aug 2020 17:06:42 +0530
Subject: [PATCH 1355/1587] ported snippets to snipmate format

---
 UltiSnips/tex.snippets | 95 ------------------------------------------
 snippets/tex.snippets  | 56 +++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 95 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 1bd484a89..5c5721f30 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -255,99 +255,4 @@ snippet und "Underline"
 \underline{$1} $0
 endsnippet
 
-# converts sympy code into latex
-snippet sympy "sympy block" w
-sympy $1 sympy$0
-endsnippet
-
-# corresponding snippet for evaluating sympy
-snippet 'sympy(.*)sympy' "evaluate sympy" wr
-`!p
-from sympy import *
-x, y, z, t = symbols('x y z t')
-k, m, n = symbols('k m n', integer=True)
-f, g, h = symbols('f g h', cls=Function)
-init_printing()
-snip.rv = eval('latex(' + match.group(1).replace('\\', '') \
-		.replace('^', '**') \
-		.replace('{', '(') \
-		.replace('}', ')') + ')')
-`
-endsnippet
-
-# Time derivative
-snippet ddt "ddt"
-\frac{d}{dt} $1 $0
-endsnippet
-
-# Limit
-snippet lim "limit"
-\lim_{$1} {$2} $0
-endsnippet
-
-# Partial derivative
-snippet pdv "partial derivation"
-\frac{\partial $1}{\partial $2} $0
-endsnippet
-
-# Second order partial derivative
-snippet ppdv "partial derivation"
-\frac{\partial^2 $1}{\partial $2 \partial $3} $0
-endsnippet
-
-# Ordinary derivative
-snippet dv "derivative"
-\frac{d $1}{d $2} $0
-endsnippet
-
-# Summation
-snippet sum "summation"
-\sum_{$1} $0
-endsnippet
-
-# Shorthand for time derivative
-snippet dot "dot"
-\dot{$1} $0
-endsnippet
-
-# Shorthand for second order time derivative
-snippet ddot "dot"
-\ddot{$1} $0
-endsnippet
-
-# Vector
-snippet vec "vector"
-\vec{$1} $0
-endsnippet
-
-# Cross product
-snippet \x "cross product"
-\times $0
-endsnippet
-
-# Dot product
-snippet . "dot product"
-\cdot $0
-endsnippet
-
-# Integral
-snippet int "integral"
-\int_{$1}^{$2} $3 \: d$4 $5
-endsnippet
-
-# Fancy math letters
-snippet mc "mathcal"
-\mathcal{$1} $0
-endsnippet
-
-# Right arrow
-snippet ra "rightarrow"
-\rightarrow $0
-endsnippet
-
-# Long right arrow
-snippet lra "longrightarrow"
-\longrightarrow $0
-endsnippet
-
 # vim:ft=snippets:
diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index c02d34015..cbf64680f 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -358,3 +358,59 @@ snippet hrefc
 # enquote from package csquotes
 snippet enq enquote
 	\\enquote{${1:${VISUAL:text}}} ${0}
+
+# Time derivative
+snippet ddt time derivative
+	\\frac{d}{dt} {$1} {$0}
+
+# Limit
+snippet lim limit
+	\\lim_{{$1}} {{$2}} {$0}
+
+# Partial derivative
+snippet pdv partial derivation
+	\\frac{\\partial {$1}}{\partial {$2}} {$0}
+
+# Second order partial derivative
+snippet ppdv second partial derivation
+	\\frac{\partial^2 {$1}}{\partial {$2} \partial {$3}} {$0}
+
+# Ordinary derivative
+snippet dv derivative
+	\\frac{d {$1}}{d {$2}} {$0}
+
+# Summation
+snippet sum summation
+	\\sum_{{$1}} {$0}
+
+# Shorthand for time derivative
+snippet dot dot
+	\\dot{{$1}} {$0}
+
+# Shorthand for second order time derivative
+snippet ddot ddot
+	\\ddot{{$1}} {$0}
+
+# Vector
+snippet vec vector
+	\\vec{{$1}} {$0}
+
+# Cross product
+snippet \x cross product
+	\\times {$0}
+
+# Dot product
+snippet . dot product
+	\\cdot {$0}
+
+# Integral
+snippet int integral
+	\\int_{{$1}}^{{$2}} {$3} \: d{$4} {$5}
+
+# Right arrow
+snippet ra rightarrow
+	\\rightarrow {$0}
+
+# Long right arrow
+snippet lra longrightarrow
+	\\longrightarrow {$0}

From c609efe753ccc2f2631908149e94febc0b257052 Mon Sep 17 00:00:00 2001
From: Aaron Batilo <AaronBatilo@gmail.com>
Date: Sun, 30 Aug 2020 07:09:09 -0600
Subject: [PATCH 1356/1587] Correct typo in go.snippets

---
 snippets/go.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index b8d3e6f89..202b7e800 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -129,7 +129,7 @@ snippet fum "method"
 	}
 	${0}
 
-snippet fumh "http handler function on reciever"
+snippet fumh "http handler function on receiver"
 	func (${1:receiver} ${2:type}) ${3:funcName}(${4:w} http.ResponseWriter, ${5:r} *http.Request) {
 		${0:${VISUAL}}
 	}

From 791c72d53399c7db9ec5a19922efee15d8f5a94b Mon Sep 17 00:00:00 2001
From: Rick Jones <rick.jones@playtimestudios.com>
Date: Sat, 5 Sep 2020 00:25:51 +0100
Subject: [PATCH 1357/1587] Add const async arrow function JavaScript snippets

---
 snippets/javascript/javascript.snippets | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index c3d5a8b8f..f84736d00 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -319,10 +319,18 @@ snippet c=>
 	const ${1:function_name} = (${2}) => {
 		${0:${VISUAL}}
 	}
-snippet caf
+snippet ca=>
+	const ${1:function_name} = async (${2}) => {
+		${0:${VISUAL}}
+	}
+snippet canf
 	const ${1:function_name} = (${2}) => {
 		${0:${VISUAL}}
 	}
+snippet casf
+	const ${1:function_name} = async (${2}) => {
+		${0:${VISUAL}}
+	}
 snippet =>
 	(${1}) => {
 		${0:${VISUAL}}

From d4c285e8e7b482db810f453a308d45f259facbf9 Mon Sep 17 00:00:00 2001
From: Fingalzzz <Fingal.ZHOU@gmail.com>
Date: Sat, 19 Sep 2020 14:50:11 +0800
Subject: [PATCH 1358/1587] Set author, email and GitHub address automatically
 from git config.

---
 plugin/vimsnippets.vim | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugin/vimsnippets.vim b/plugin/vimsnippets.vim
index f58374cd8..e40e6e8d9 100644
--- a/plugin/vimsnippets.vim
+++ b/plugin/vimsnippets.vim
@@ -4,15 +4,21 @@ endif
 let b:done_vimsnippets = 1
 
 " Some variables need default value
-if !exists("g:snips_author")
+if !exists("g:snips_author") && executable('git')
+    let g:snips_author = trim(system('git config --global user.name'))
+elseif
     let g:snips_author = "yourname"
 endif
 
-if !exists("g:snips_email")
+if !exists("g:snips_email") && executable('git')
+    let g:snips_email = trim(system('git config --global user.email'))
+elseif
     let g:snips_email = "yourname@email.com"
 endif
 
-if !exists("g:snips_github")
+if !exists("g:snips_github") && executable('git')
+    let g:snips_github = trim("https://github.com/" . system("git config --global user.name"))
+elseif
     let g:snips_github = "https://github.com/yourname"
 endif
 

From 5b5cc3650a062c180f0c3861c5f1c8030c27dfd3 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Wed, 23 Sep 2020 14:26:48 +0100
Subject: [PATCH 1359/1587] Correct syntax

---
 plugin/vimsnippets.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin/vimsnippets.vim b/plugin/vimsnippets.vim
index e40e6e8d9..1fff41a3c 100644
--- a/plugin/vimsnippets.vim
+++ b/plugin/vimsnippets.vim
@@ -6,19 +6,19 @@ let b:done_vimsnippets = 1
 " Some variables need default value
 if !exists("g:snips_author") && executable('git')
     let g:snips_author = trim(system('git config --global user.name'))
-elseif
+else
     let g:snips_author = "yourname"
 endif
 
 if !exists("g:snips_email") && executable('git')
     let g:snips_email = trim(system('git config --global user.email'))
-elseif
+else
     let g:snips_email = "yourname@email.com"
 endif
 
 if !exists("g:snips_github") && executable('git')
     let g:snips_github = trim("https://github.com/" . system("git config --global user.name"))
-elseif
+else
     let g:snips_github = "https://github.com/yourname"
 endif
 

From 459dcc21c0cd753af00022730929a784cc523258 Mon Sep 17 00:00:00 2001
From: Pavlo Solntsev <p.sun.fun@gmail.com>
Date: Wed, 23 Sep 2020 23:27:21 -0500
Subject: [PATCH 1360/1587] cpp: Adding support for BOOST tests

---
 UltiSnips/cpp.snippets | 63 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index 1abd50963..9fb4331a2 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -106,5 +106,68 @@ ${1:ReturnType} ${2:FunctionName}(${3:param})
 {
 	${0:FunctionBody}
 }
+endsnippet
+
+snippet boost_test "Boost test module" b
+#define BOOST_TEST_MODULE ${1:TestModuleName}
+#include <boost/test/included/unit_test.hpp>
+
+BOOST_AUTO_TEST_CASE(${2:TestCaseName})
+{
+	${0:TestDefinition}
+}
+
+endsnippet
+
+snippet boost_suite "Boost test suite module" b
+#define BOOST_TEST_MODULE ${1:TestModuleName}
+#include <boost/test/included/unit_test.hpp>
+
+BOOST_AUTO_TEST_SUITE(${2:SuiteName})
+
+BOOST_AUTO_TEST_CASE(${3:TestCaseName})
+{
+	${0:TestDefinition}
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+endsnippet
+snippet boost_test_fixture "Boost test module with fixture" b
+#define BOOST_TEST_MODULE ${1:TestModuleName}
+#include <boost/test/included/unit_test.hpp>
+
+struct ${2:FixtureName} {
+	$2() {}
+	virtual ~$2() {}
+	/* define members here */
+};
+
+BOOST_FIXTURE_TEST_CASE(${3:SuiteName}, $2)
+{
+	${0:TestDefinition}
+}
+
+endsnippet
+
+snippet boost_suite_fixture "Boost test suite with fixture" b
+#define BOOST_TEST_MODULE ${1:TestModuleName}
+#include <boost/test/included/unit_test.hpp>
+
+struct ${2:FixtureName} {
+	$2() {}
+	virtual ~$2() {}
+	/* define members here */
+};
+
+BOOST_FIXTURE_TEST_SUITE(${3:SuiteName}, $2)
+
+BOOST_AUTO_TEST_CASE(${4:TestCaseName})
+{
+	${0:TestDefinition}
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
 endsnippet
 # vim:ft=snippets:

From 06fbadd9b3c8e4be1e1343addb51cd0582c047f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leiser=20Fern=C3=A1ndez=20Gallo?= <leiserfg@gmail.com>
Date: Thu, 24 Sep 2020 16:18:11 +0200
Subject: [PATCH 1361/1587] Speed up the startup time

Now git is called only 2 times and using `command` makes the shell avoid resolving aliases. That decreases the startup time of the plugin by around 300ms on my laptop.
Anyways IMHO those vars should be on the README, because, even with my fix, this plugin makes vim to take noticeable time to start if they are not set.
---
 plugin/vimsnippets.vim | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugin/vimsnippets.vim b/plugin/vimsnippets.vim
index 1fff41a3c..480409c74 100644
--- a/plugin/vimsnippets.vim
+++ b/plugin/vimsnippets.vim
@@ -4,24 +4,25 @@ endif
 let b:done_vimsnippets = 1
 
 " Some variables need default value
-if !exists("g:snips_author") && executable('git')
-    let g:snips_author = trim(system('git config --global user.name'))
+let s:has_git = executable('git')
+
+if !exists("g:snips_author") && s:has_git
+    let g:snips_author = trim(system('command git config --global user.name'))
 else
     let g:snips_author = "yourname"
 endif
 
-if !exists("g:snips_email") && executable('git')
-    let g:snips_email = trim(system('git config --global user.email'))
+if !exists("g:snips_email") && s:has_git
+    let g:snips_email = trim(system('command git config --global user.email'))
 else
     let g:snips_email = "yourname@email.com"
 endif
 
-if !exists("g:snips_github") && executable('git')
-    let g:snips_github = trim("https://github.com/" . system("git config --global user.name"))
-else
-    let g:snips_github = "https://github.com/yourname"
+if !exists("g:snips_github")
+    let g:snips_github = "https://github.com/" . g:snips_author
 endif
 
+
 " Expanding the path is not needed on Vim 7.4
 if &cp || version >= 704
     finish

From db91ad48017e51e6b323fe1a7fac36626689b2fd Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 25 Sep 2020 13:41:46 +0100
Subject: [PATCH 1362/1587] Update logic using
 https://github.com/honza/vim-snippets/issues/1257

---
 plugin/vimsnippets.vim | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/plugin/vimsnippets.vim b/plugin/vimsnippets.vim
index 480409c74..d4e8fb4a6 100644
--- a/plugin/vimsnippets.vim
+++ b/plugin/vimsnippets.vim
@@ -6,16 +6,20 @@ let b:done_vimsnippets = 1
 " Some variables need default value
 let s:has_git = executable('git')
 
-if !exists("g:snips_author") && s:has_git
-    let g:snips_author = trim(system('command git config --global user.name'))
-else
-    let g:snips_author = "yourname"
+if !exists("g:snips_author")
+    if s:has_git
+        let g:snips_author = trim(system('command git config --global user.name'))
+    else
+        let g:snips_author = "yourname"
+    endif
 endif
 
-if !exists("g:snips_email") && s:has_git
-    let g:snips_email = trim(system('command git config --global user.email'))
-else
-    let g:snips_email = "yourname@email.com"
+if !exists("g:snips_email")
+    if s:has_git
+        let g:snips_email = trim(system('command git config --global user.email'))
+    else
+        let g:snips_email = "yourname@email.com"
+    endif
 endif
 
 if !exists("g:snips_github")

From a0441888b7a1e7ef8ab8b309d6c5c314d53096df Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 25 Sep 2020 21:08:22 +0100
Subject: [PATCH 1363/1587] Remove command

---
 plugin/vimsnippets.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/vimsnippets.vim b/plugin/vimsnippets.vim
index d4e8fb4a6..9259a59bd 100644
--- a/plugin/vimsnippets.vim
+++ b/plugin/vimsnippets.vim
@@ -8,7 +8,7 @@ let s:has_git = executable('git')
 
 if !exists("g:snips_author")
     if s:has_git
-        let g:snips_author = trim(system('command git config --global user.name'))
+        let g:snips_author = trim(system('git config --global user.name'))
     else
         let g:snips_author = "yourname"
     endif
@@ -16,7 +16,7 @@ endif
 
 if !exists("g:snips_email")
     if s:has_git
-        let g:snips_email = trim(system('command git config --global user.email'))
+        let g:snips_email = trim(system('git config --global user.email'))
     else
         let g:snips_email = "yourname@email.com"
     endif

From 730443a98e9bfa8709ed51a355f17a9ce86a9fb4 Mon Sep 17 00:00:00 2001
From: ashfinal <ashfinal@gmail.com>
Date: Sat, 26 Sep 2020 21:37:10 +0800
Subject: [PATCH 1364/1587] trim() not exist in old version of Vim.

close #1255
---
 plugin/vimsnippets.vim | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/plugin/vimsnippets.vim b/plugin/vimsnippets.vim
index 9259a59bd..df5540ac2 100644
--- a/plugin/vimsnippets.vim
+++ b/plugin/vimsnippets.vim
@@ -8,7 +8,12 @@ let s:has_git = executable('git')
 
 if !exists("g:snips_author")
     if s:has_git
-        let g:snips_author = trim(system('git config --global user.name'))
+        let s:author = substitute(system('git config --global user.name'), '\n', '', 'g')
+        if s:author == ''
+            let g:snips_author = "yourname"
+        else
+            let g:snips_author = s:author
+        endif
     else
         let g:snips_author = "yourname"
     endif
@@ -16,7 +21,12 @@ endif
 
 if !exists("g:snips_email")
     if s:has_git
-        let g:snips_email = trim(system('git config --global user.email'))
+        let s:email = substitute(system('git config --global user.email'), '\n', '', 'g')
+        if s:email == ''
+            let g:snips_email = "yourname@email.com"
+        else
+            let g:snips_email = s:email
+        endif
     else
         let g:snips_email = "yourname@email.com"
     endif

From 10cd51ba6c2af5ec8954d55898e917f2c7eddc85 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 27 Sep 2020 15:36:49 +0100
Subject: [PATCH 1365/1587] Additional js snippets

---
 snippets/javascript/javascript.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index f84736d00..c4ec0766a 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -311,6 +311,10 @@ snippet foro "for (const prop of object}) { ... }"
 	for (const ${1:prop} of ${2:object}) {
 		${0:$1}
 	}
+snippet forl "for (let prop of object}) { ... }"
+	for (let ${1:prop} of ${2:object}) {
+		${0:$1}
+	}
 snippet fun*
 	function* ${1:function_name}(${2}) {
 		${0:${VISUAL}}
@@ -347,5 +351,7 @@ snippet ed
 	export default ${0}
 snippet ${
 	${${1}}${0}
+snippet as "async"
+	async ${0}
 snippet aw "await"
 	await ${0:${VISUAL}}

From 37e26c3d1cc84f90560502dc7f32487715991ab6 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 27 Sep 2020 15:51:26 +0100
Subject: [PATCH 1366/1587] Fix const arrow functions for js

---
 snippets/javascript/javascript.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index c4ec0766a..265620683 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -327,7 +327,7 @@ snippet ca=>
 	const ${1:function_name} = async (${2}) => {
 		${0:${VISUAL}}
 	}
-snippet canf
+snippet caf
 	const ${1:function_name} = (${2}) => {
 		${0:${VISUAL}}
 	}

From ad1a5e609c17024a91c0dae6f535044d03536241 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sun, 27 Sep 2020 15:52:52 +0100
Subject: [PATCH 1367/1587] Move jasmine from default snippets

If you wish to use these library snippets please enable them in your
config as directed in the README
---
 snippets/{javascript => }/javascript-jasmine.snippets | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename snippets/{javascript => }/javascript-jasmine.snippets (100%)

diff --git a/snippets/javascript/javascript-jasmine.snippets b/snippets/javascript-jasmine.snippets
similarity index 100%
rename from snippets/javascript/javascript-jasmine.snippets
rename to snippets/javascript-jasmine.snippets

From 8120188e93791716c6ecc346dedc38f6d27ab8f4 Mon Sep 17 00:00:00 2001
From: Metehan Gulac <metehanglc@protonmail.com>
Date: Wed, 30 Sep 2020 00:32:41 +0300
Subject: [PATCH 1368/1587] method snippet added to typescript with public,
 private and protected modifiter options.

---
 snippets/typescript.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snippets/typescript.snippets b/snippets/typescript.snippets
index fddbeb1c6..b3a446e2f 100644
--- a/snippets/typescript.snippets
+++ b/snippets/typescript.snippets
@@ -25,6 +25,18 @@ snippet tfun "ts function"
 	function ${1}(${2}): ${3:any} {
 		${0}
 	}
+snippet tpmet "ts public method"
+	public ${1}(${2}): ${3:any} {
+		${0}
+	}
+snippet tprmet "ts private method"
+	private ${1}(${2}): ${3:any} {
+		${0}
+	}
+snippet tpromet "ts protected method"
+	protected ${1}(${2}): ${3:any} {
+		${0}
+	}
 snippet tcla "ts class"
 	class ${1} {
 		${2}

From 854e25e6f58e8af1ab5cdc067c901aded478dde3 Mon Sep 17 00:00:00 2001
From: Metehan Gulac <metehanglc@protonmail.com>
Date: Wed, 30 Sep 2020 01:41:17 +0300
Subject: [PATCH 1369/1587] added snippet for create ECMAScript Private Field

---
 snippets/typescript.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/typescript.snippets b/snippets/typescript.snippets
index b3a446e2f..8853001c7 100644
--- a/snippets/typescript.snippets
+++ b/snippets/typescript.snippets
@@ -11,6 +11,8 @@ snippet tvar "ts var"
 	${0}
 snippet + "var: type"
 	${1}: ${0:any}
+snippet #+ "var: type"
+	#${1}: ${0:any}
 snippet int "interface"
 	interface ${1} {
 		${2}: ${3:any};

From ff0e7f6807a4e78491f04d8fae45f90c24301b91 Mon Sep 17 00:00:00 2001
From: Metehan Gulac <metehanglc@protonmail.com>
Date: Wed, 30 Sep 2020 01:53:58 +0300
Subject: [PATCH 1370/1587] ts fields descriptions updated

---
 snippets/typescript.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/typescript.snippets b/snippets/typescript.snippets
index 8853001c7..f82daa9ae 100644
--- a/snippets/typescript.snippets
+++ b/snippets/typescript.snippets
@@ -9,9 +9,9 @@ snippet tlet "ts let"
 snippet tvar "ts var"
 	var ${1}: ${2:any} = ${3};
 	${0}
-snippet + "var: type"
+snippet + "ts create field"
 	${1}: ${0:any}
-snippet #+ "var: type"
+snippet #+ "ts create private field using #"
 	#${1}: ${0:any}
 snippet int "interface"
 	interface ${1} {

From db1157c8183f6d09b2dd786eaa6a0e7a7ebf998d Mon Sep 17 00:00:00 2001
From: yatoogamii <bracaval.elias.pro@gmail.com>
Date: Thu, 1 Oct 2020 11:03:37 +0200
Subject: [PATCH 1371/1587] add React hooks snippets

---
 snippets/javascript/javascript-react.snippets | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index 0e8d3602e..a7193e4ba 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -2,6 +2,8 @@ snippet ir
 	import React from 'react';
 snippet irc
 	import React, { Component } from 'react';
+snippet irh import react hooks
+	import { use$1 } from 'react';
 snippet ird
 	import ReactDOM from 'react-dom';
 snippet cdm
@@ -92,7 +94,32 @@ snippet scu
 	shouldComponentUpdate(nextProps, nextState) {
 		${1}
 	}
-snippet prp i
+snippet prp
 	this.props.${1}
-snippet ste i
+snippet ste 
 	this.state.${1}
+snippet uses useState
+	const [${1:state}, set${2}] = useState(${3:initialState});
+snippet usee useEffect
+	useEffect(() => {
+    ${1}
+	});
+snippet userd useReducer
+	const [${1:state}, ${2:dispatch}] = useReducer(${3:reducer});
+snippet userf useRef
+	const ${1:refContainer} = useRef(${2:initialValue});
+snippet usect useContext
+	const ${1:value} = useContext(${2:MyContext});
+snippet usecb useCallback
+	const ${1:memoizedCallback} = useCallback(
+    () => {
+      ${2}(${3})
+    },
+    [$3]
+	);
+snippet usem useMemo
+	const ${1:memoizedCallback} = useMemo(() => ${2}(${3}), [$3]);
+snippet usei useImperativeHandle
+	useImperativeHandle(${1:ref}, ${2:createHandle});
+snippet used useDebugValue
+	useDebugValue(${1:value});

From dadcbce7a71c2e9d1121e9c382f4483ffd5cd34b Mon Sep 17 00:00:00 2001
From: Bracaval Elias <45099340+yatoogamii@users.noreply.github.com>
Date: Thu, 1 Oct 2020 09:14:51 +0200
Subject: [PATCH 1372/1587] fix tabulation into useCallback

---
 snippets/javascript/javascript-react.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index a7193e4ba..b0f42576a 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -112,10 +112,10 @@ snippet usect useContext
 	const ${1:value} = useContext(${2:MyContext});
 snippet usecb useCallback
 	const ${1:memoizedCallback} = useCallback(
-    () => {
-      ${2}(${3})
-    },
-    [$3]
+	() => {
+		${2}(${3})
+	},
+	[$3]
 	);
 snippet usem useMemo
 	const ${1:memoizedCallback} = useMemo(() => ${2}(${3}), [$3]);

From 78a9ca0fa3e4d16b73f5f642ec56298b7fec7803 Mon Sep 17 00:00:00 2001
From: Bracaval Elias <45099340+yatoogamii@users.noreply.github.com>
Date: Thu, 1 Oct 2020 09:20:12 +0200
Subject: [PATCH 1373/1587]  fix tabulation into useEffect

---
 snippets/javascript/javascript-react.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index b0f42576a..c00a3bc0f 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -102,7 +102,7 @@ snippet uses useState
 	const [${1:state}, set${2}] = useState(${3:initialState});
 snippet usee useEffect
 	useEffect(() => {
-    ${1}
+		${1}
 	});
 snippet userd useReducer
 	const [${1:state}, ${2:dispatch}] = useReducer(${3:reducer});

From da78aa19715acc8fa14c91062c77b2238e9100ab Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Fri, 2 Oct 2020 08:03:59 +0100
Subject: [PATCH 1374/1587] haskell: pre- and post- dot tabstops on import
 directives

---
 UltiSnips/haskell.snippets | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets
index 11d82c81c..ed832715b 100644
--- a/UltiSnips/haskell.snippets
+++ b/UltiSnips/haskell.snippets
@@ -1,5 +1,13 @@
 priority -50
 
+snippet imp "Simple import"
+import ${1:${2:Data}.${0:Text}}
+endsnippet
+
+snippet imp2 "Selective import" b
+import ${1:${2:Data}.${3:Text}} (${4})${0}
+endsnippet
+
 snippet impq "Qualified import"
-import qualified ${1:Data.Text} as ${0:`!p snip.rv = t[1].split(".")[-1]`}
+import qualified ${1:${2:Data}.${3:Text}} as ${0:`!p snip.rv = t[1].split(".")[-1]`}
 endsnippet

From 2745ce4c3ad81b2d46e0b3f93fe3fd82edd5e287 Mon Sep 17 00:00:00 2001
From: yatoogamii <bracaval.elias.pro@gmail.com>
Date: Fri, 2 Oct 2020 09:38:49 +0200
Subject: [PATCH 1375/1587] merged javascript-es6-react to
 javascript/javascript-react, refatoring and cleaning file

---
 snippets/javascript-es6-react.snippets        |  82 --------
 snippets/javascript/javascript-react.snippets | 181 ++++++++++++------
 2 files changed, 123 insertions(+), 140 deletions(-)
 delete mode 100644 snippets/javascript-es6-react.snippets

diff --git a/snippets/javascript-es6-react.snippets b/snippets/javascript-es6-react.snippets
deleted file mode 100644
index c9138752e..000000000
--- a/snippets/javascript-es6-react.snippets
+++ /dev/null
@@ -1,82 +0,0 @@
-# Import only React
-snippet ri1
-	import React from 'react'
-
-# Import both React and Component
-snippet ri2
-	import React, { Component } from 'react'
-	import PropTypes from 'prop-types'
-
-# React class
-snippet rcla
-	class ${1:MyComponent} extends Component {
-		render() {
-			return (
-				${0:<div></div>}
-			)
-		}
-	}
-
-# React constructor
-snippet rcon
-	constructor(props) {
-		super(props)
-
-		this.state = {
-			${1}: ${0},
-		}
-	}
-
-# Proptypes for React Class
-snippet rcpt
-	static propTypes = {
-		${1}: PropTypes.${0},
-	}
-
-# Default props for React Class
-snippet rcdp
-	static defaultProps = {
-		${1}: ${0},
-	}
-
-# Presentational component
-snippet rcom
-	props => {
-		return (
-			${0:<div></div>}
-		)
-	}
-
-# Proptypes for Presentational component
-snippet rpt
-	${1}.propTypes = {
-		${2}: PropTypes.${0},
-	}
-
-# Default props for Presentational component
-snippet rdp
-	${1}.defaultProps = {
-		${2}: ${0},
-	}
-
-# Lifecycle Methods
-snippet rcdm
-	componentDidMount() {
-		${0:${VISUAL}}
-	}
-
-# State
-snippet rsst
-	this.setState({
-		${1}: ${0},
-	})
-
-snippet rtst
-	this.state.${0}
-
-# Props
-snippet rp
-	props.${0}
-
-snippet rtp
-	this.props.${0}
diff --git a/snippets/javascript/javascript-react.snippets b/snippets/javascript/javascript-react.snippets
index c00a3bc0f..65cb4e1da 100644
--- a/snippets/javascript/javascript-react.snippets
+++ b/snippets/javascript/javascript-react.snippets
@@ -1,115 +1,167 @@
-snippet ir
+# Import
+snippet ir import React
 	import React from 'react';
-snippet irc
+
+snippet irc import React and Component
 	import React, { Component } from 'react';
-snippet irh import react hooks
+
+snippet irh import React hooks
 	import { use$1 } from 'react';
-snippet ird
+
+snippet ird import ReactDOM
 	import ReactDOM from 'react-dom';
-snippet cdm
+
+snippet irp import PropTypes
+	import PropTypes from 'prop-types';
+
+# Lifecycle Methods
+snippet cdm componentDidMount
 	componentDidMount() {
 		${1}
-	}
-snippet cdup
+	};
+
+snippet cdup componentDidUpdate
 	componentDidUpdate(prevProps, prevState) {
 		${1}
-	}
-snippet cwm
+	};
+
+snippet cwm componentWillMount
 	componentWillMount() {
 		${1}
-	}
-snippet cwr
+	};
+
+snippet cwr componentWillReceiveProps
 	componentWillReceiveProps(nextProps) {
 		${1}
-	}
-snippet cwun
+	};
+
+snippet cwun componentWillUnmount
 	componentWillUnmount() {
 		${1}
-	}
-snippet cwu
+	};
+
+snippet cwu componentWillUpdate
 	componentWillUpdate(nextProps, nextState) {
 		${1}
+	};
+
+snippet scu shouldComponentUpdate
+	shouldComponentUpdate(nextProps, nextState) {
+		${1}
 	}
-snippet fup
-	forceUpdate(${1:callback});
-snippet dp
+
+# Props
+snippet spt static propTypes
+	static propTypes = {
+		${1}: PropTypes.${2}
+	};
+
+snippet pt propTypes
+	${1}.propTypes = {
+		${2}: PropTypes.${2}
+	};
+
+snippet sdp static defaultProps
 	static defaultProps = {
-		${1}: ${2},
-	}
+		${1}: ${2}	
+	};
+
+snippet dp defaultProps
+	${1}.defaultProps = {
+		${2}: ${3}
+	};
+
+snippet pp props
+	props.${1};
+
+snippet tp this props
+	this.props.${1};
+
+# State
 snippet st
 	state = {
 		${1}: ${2},
-	}
-snippet pt
-	static propTypes = {
-		${1}: React.PropTypes.${2:type},
-	}
-snippet rfc
+	};
+
+snippet sst
+	this.setState({
+		${1}: ${2}
+	});
+
+snippet tst 
+	this.state.${1};
+
+# Component
+snippet raf
 	const ${1:ComponentName} = (${2:props}) => {
+		${3:state}
+
 		return (
-			<div>
-				$1
-			</div>
+			<>
+				${4}
+			</>
 		);
-	}
-snippet rcc
-	class ${1:ClassName} extends React.Component {
-		state = {
+	};
 
-		}
+snippet rcla
+	class ${1:ClassName} extends Component {
 		render() {
 			return (
-				<div>
-					$1
-				</div>
+				<>
+					${2}
+				</>
 			);
 		}
 	}
-snippet rdr
-	ReactDOM.render(${1}, ${2})
-snippet ercc
-	export default class ${1:ClassName} extends React.Component {
+
+snippet ercla
+	export default class ${1:ClassName} extends Component {
 		render() {
 			return (
-				${0:<div />}
+				<>
+					${2}
+				</>
 			);
-		}
-	}
+		};
+	};
+
 snippet ctor
 	constructor() {
 		super();
-		${1}
+
+		${1:state}
 	}
+
 snippet ren
 	render() {
 		return (
-			${1:<div />}
+			<>
+				${2}
+			</>
 		);
 	}
-snippet sst
-	this.setState({
-		${1}: ${2}
-	});
-snippet scu
-	shouldComponentUpdate(nextProps, nextState) {
-		${1}
-	}
-snippet prp
-	this.props.${1}
-snippet ste 
-	this.state.${1}
+
+snippet fup
+	forceUpdate(${1:callback});
+
+# Hooks
 snippet uses useState
 	const [${1:state}, set${2}] = useState(${3:initialState});
+
 snippet usee useEffect
 	useEffect(() => {
 		${1}
 	});
+
 snippet userd useReducer
 	const [${1:state}, ${2:dispatch}] = useReducer(${3:reducer});
+
 snippet userf useRef
 	const ${1:refContainer} = useRef(${2:initialValue});
+
 snippet usect useContext
 	const ${1:value} = useContext(${2:MyContext});
+
 snippet usecb useCallback
 	const ${1:memoizedCallback} = useCallback(
 	() => {
@@ -117,9 +169,22 @@ snippet usecb useCallback
 	},
 	[$3]
 	);
+
 snippet usem useMemo
 	const ${1:memoizedCallback} = useMemo(() => ${2}(${3}), [$3]);
+
 snippet usei useImperativeHandle
 	useImperativeHandle(${1:ref}, ${2:createHandle});
+
 snippet used useDebugValue
 	useDebugValue(${1:value});
+
+# ReactDOM methods
+snippet rdr ReactDOM.render
+	ReactDOM.render(${1}, ${2});
+
+snippet rdh ReactDOM.hydrate
+	ReactDOM.hydrate(${1:element}, ${2:container}[, ${3:callback}]);
+
+snippet rdcp ReactDOM.createPortal
+	ReactDOM.createPortal(${1:child}, ${2:container});

From 11833da5cc31d675ab024085687f85597b3276a2 Mon Sep 17 00:00:00 2001
From: Vincent Coyette <vincent.coyette@gmail.com>
Date: Sat, 3 Oct 2020 12:54:38 +0200
Subject: [PATCH 1376/1587] fix duplicated sum snippet in tex

---
 snippets/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index cbf64680f..e13508a49 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -380,7 +380,7 @@ snippet dv derivative
 	\\frac{d {$1}}{d {$2}} {$0}
 
 # Summation
-snippet sum summation
+snippet summ summation
 	\\sum_{{$1}} {$0}
 
 # Shorthand for time derivative

From 87dbbc69a4e540e65f2f653aa3617cc3b7562663 Mon Sep 17 00:00:00 2001
From: Melko <melko@frugalware.org>
Date: Sat, 3 Oct 2020 20:40:03 +0200
Subject: [PATCH 1377/1587] Fix VHDL lib snippet

Replace the second occurrence of ${1} with $1
---
 snippets/vhdl.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/vhdl.snippets b/snippets/vhdl.snippets
index 7a991344d..0683a2185 100644
--- a/snippets/vhdl.snippets
+++ b/snippets/vhdl.snippets
@@ -3,7 +3,7 @@
 
 snippet lib
 	library ${1}
-	use ${1}.${2}
+	use $1.${2}
 
 # Standard Libraries
 snippet libs

From a2559e14ac4aaeadcc953e892e51ceed01619814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= <smancill@smancill.dev>
Date: Mon, 5 Oct 2020 12:45:55 -0300
Subject: [PATCH 1378/1587] Do not call external processes during plugin
 initialization

Having the plugin initialization calling Git commands increases the
startup time by orders of magnitude.

The plugin was very fast before (output of --startuptime):

    000.047  000.047: sourcing .../vim-snippets/plugin/vimsnippets.vim

And this is the result of adding those external Git command calls:

    039.083  039.083: sourcing .../vim-snippets/plugin/vimsnippets.vim

It could be argued that it is still fast, but a lot of users care about
Vim startup time and those 40 ms in this case are too much, and others
have reported worst. In my case, it is taking a fifth of the total
startup time now with almost 50 plugins, and it takes more than 2.5x
longer than any other. Specially when the plugin initialization was
barely noticed originally. Having `system()` calls on a
`<rtp>/plugin/*.vim` file is just bad for the users, when a plugin
should try to load as fast as possible, lazy-loading as much as
possible.

This commit reverts `plugin/vimsnippets.vim` to the state it was before
PR #1252, effectively reverting the PR and all the subsequent commits
trying to fix it:

- 730443a (trim() not exist in old version of Vim., 2020-09-26)
- a044188 (Remove command, 2020-09-25)
- db91ad4 (Update logic using https://github.com/honza/vim-snippets/issues/1257, 2020-09-25)
- 06fbadd (Speed up the startup time, 2020-09-24)
- 5b5cc36 (Correct syntax, 2020-09-23)
- d4c285e (Set author, email and GitHub address automatically from git config., 2020-09-19)

The variables `g:snips_author` and `g:snips_author_email` are not really
widely used to justify having them set automatically from Git at the
cost of increasing the startup time (the workaround for this was having
to op-out of it by defining them in the .vimrc, but that's still not
ideal compared to the opt-in behaviour restored by this commit). Also,
they have been in use with empty/dummy default values since the initial
commit almost 10 years ago, without being an inconvenience to users.

Fixes #1267.
---
 plugin/vimsnippets.vim | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/plugin/vimsnippets.vim b/plugin/vimsnippets.vim
index df5540ac2..f58374cd8 100644
--- a/plugin/vimsnippets.vim
+++ b/plugin/vimsnippets.vim
@@ -4,39 +4,18 @@ endif
 let b:done_vimsnippets = 1
 
 " Some variables need default value
-let s:has_git = executable('git')
-
 if !exists("g:snips_author")
-    if s:has_git
-        let s:author = substitute(system('git config --global user.name'), '\n', '', 'g')
-        if s:author == ''
-            let g:snips_author = "yourname"
-        else
-            let g:snips_author = s:author
-        endif
-    else
-        let g:snips_author = "yourname"
-    endif
+    let g:snips_author = "yourname"
 endif
 
 if !exists("g:snips_email")
-    if s:has_git
-        let s:email = substitute(system('git config --global user.email'), '\n', '', 'g')
-        if s:email == ''
-            let g:snips_email = "yourname@email.com"
-        else
-            let g:snips_email = s:email
-        endif
-    else
-        let g:snips_email = "yourname@email.com"
-    endif
+    let g:snips_email = "yourname@email.com"
 endif
 
 if !exists("g:snips_github")
-    let g:snips_github = "https://github.com/" . g:snips_author
+    let g:snips_github = "https://github.com/yourname"
 endif
 
-
 " Expanding the path is not needed on Vim 7.4
 if &cp || version >= 704
     finish

From afb30df89e9d4b35c91c4ba91a27138096cbc994 Mon Sep 17 00:00:00 2001
From: Nandu Raj P <nndurj@gmail.com>
Date: Wed, 7 Oct 2020 08:27:19 +0530
Subject: [PATCH 1379/1587] Update verilog.snippets

---
 snippets/verilog.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/verilog.snippets b/snippets/verilog.snippets
index df5eeb815..e4a6b0529 100644
--- a/snippets/verilog.snippets
+++ b/snippets/verilog.snippets
@@ -9,7 +9,7 @@ snippet ife
 		${2}
 	end
 	else begin
-		${1}
+		${3}
 	end
 # Else if statement
 snippet eif

From d6efd6f4193e065d6e10ac634f6231c9885dc18f Mon Sep 17 00:00:00 2001
From: Ulisse mini <ulisse.mini@gmail.com>
Date: Sat, 10 Oct 2020 18:09:46 -0400
Subject: [PATCH 1380/1587] Update html.snippets

---
 UltiSnips/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index a81b1d883..75eff9027 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -276,7 +276,7 @@ snippet htmll "HTML basic structure with the lang attribute" b
 <html lang="${1:es}">
 	<head>
 		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<title>${2:`!p snip.rv = snip.basename.replace('-', ' ').capitalize()`}</title>
 	</head>
 	<body>

From 9139051f61db46b006d5b0097a62a0dfbd6607fc Mon Sep 17 00:00:00 2001
From: Metehan Gulac <metehanglc@protonmail.com>
Date: Thu, 8 Oct 2020 22:06:35 +0300
Subject: [PATCH 1381/1587] created "public static method" snippet for
 typescript

---
 snippets/typescript.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/typescript.snippets b/snippets/typescript.snippets
index f82daa9ae..4ac9619a1 100644
--- a/snippets/typescript.snippets
+++ b/snippets/typescript.snippets
@@ -31,6 +31,10 @@ snippet tpmet "ts public method"
 	public ${1}(${2}): ${3:any} {
 		${0}
 	}
+snippet tpsmet "ts public static method"
+	public static ${1}(${2}): ${3:any} {
+		${0}
+	}
 snippet tprmet "ts private method"
 	private ${1}(${2}): ${3:any} {
 		${0}

From 65f083f628b4004e1acd517d582f1ce02e65cbe8 Mon Sep 17 00:00:00 2001
From: blurrcat <blurrcat@users.noreply.github.com>
Date: Mon, 12 Oct 2020 18:19:23 -0700
Subject: [PATCH 1382/1587] Update Ocaml documentation and comment snippets

According to the official Ocaml documentation guideline, documentations should be wrapped in `(**` and `*)` whereas comments should be wrapped in `(*` and `*)`: https://ocamlverse.github.io/content/documentation_guidelines.html
---
 snippets/ocaml.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/ocaml.snippets b/snippets/ocaml.snippets
index eb5a799cf..aec43bed5 100644
--- a/snippets/ocaml.snippets
+++ b/snippets/ocaml.snippets
@@ -1,7 +1,7 @@
 snippet doc
-	(*
-		${0}
-	 *)
+	(** ${0} *)
+snippet comment
+	(* ${0} *)
 snippet let
 	let ${1} = ${2} in
 	${0}

From 5b2c97d9502ff7833b175816be1bd881f51206b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Metehan=20G=C3=BCla=C3=A7?= <metehanglc@protonmail.com>
Date: Tue, 13 Oct 2020 14:50:32 +0300
Subject: [PATCH 1383/1587] created public/private/protected field snippet for
 typescript (#1277)

---
 snippets/typescript.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/typescript.snippets b/snippets/typescript.snippets
index 4ac9619a1..a784c5efd 100644
--- a/snippets/typescript.snippets
+++ b/snippets/typescript.snippets
@@ -13,6 +13,12 @@ snippet + "ts create field"
 	${1}: ${0:any}
 snippet #+ "ts create private field using #"
 	#${1}: ${0:any}
+snippet tpfi "ts create public field"
+	public ${1}: ${0:any}
+snippet tprfi "ts create private field"
+	private ${1}: ${0:any}
+snippet tprofi "ts create protected field"
+	protected ${1}: ${0:any}
 snippet int "interface"
 	interface ${1} {
 		${2}: ${3:any};

From 79d6f53bf12e3f2de3f17b0ba66717642575066e Mon Sep 17 00:00:00 2001
From: whonore <wolfhonore@gmail.com>
Date: Tue, 13 Oct 2020 09:37:49 -0400
Subject: [PATCH 1384/1587] Fix error when using box snippet in HTML

---
 pythonx/vimsnippets.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index 0dcf30e98..eceb83c5b 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -84,12 +84,13 @@ def get_comment_format():
 
 def make_box(twidth, bwidth=None):
     b, m, e, i = (s.strip() for s in get_comment_format())
+    m0 = m[0] if m else ''
     bwidth_inner = bwidth - 3 - max(len(b), len(i + e)) if bwidth else twidth + 2
-    sline = b + m + bwidth_inner * m[0] + 2 * m[0]
+    sline = b + m + bwidth_inner * m0 + 2 * m0
     nspaces = (bwidth_inner - twidth) // 2
     mlines = i + m + " " + " " * nspaces
     mlinee = " " + " "*(bwidth_inner - twidth - nspaces) + m
-    eline = i + m + bwidth_inner * m[0] + 2 * m[0] + e
+    eline = i + m + bwidth_inner * m0 + 2 * m0 + e
     return sline, mlines, mlinee, eline
 
 def foldmarker():

From 14892affe43fefd5059a8163ebc09675d418ae61 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Fri, 9 Oct 2020 18:09:19 +0100
Subject: [PATCH 1385/1587] C++: a modern for loop

In modern C++, the non-range `for` loop is usually used to loop on containers or sub-ranges, given the beginning end end iterators.

My choice of the order of the tabstops and their defaults relies on my feeling that we usually want to

  1. declare a local variable,
  2. that goes from one value, often the beginning of a container,
  3. to another value, often the end of the same container.

and on the fact that

  4. for reusability across different containers, we should most often rely on `!=` for the end condition of the loop;
  5. most often pre-increment is the way to go;
  6. almost always `auto` is the way to go.
---
 UltiSnips/cpp.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index 9fb4331a2..634192d9f 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -30,6 +30,12 @@ endglobal
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
+snippet forc "general for loop (for)"
+for (${6:auto} ${1:i} = ${2:v.begin()}; `!p snip.rv = t[1].split(" ")[-1]` ${4:!=} ${3:`!p snip.rv = t[2].split(".")[0]`.end()}; ${5:++`!p snip.rv = t[1].split(" ")[-1]`}) {
+	${VISUAL}$0
+}
+endsnippet
+
 snippet beginend "$1.begin(), $1.end() (beginend)"
 ${1:v}${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}begin(), $1${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}end()
 endsnippet

From 02cebe2ebe0c221d72d5848a554d315c0b613ca5 Mon Sep 17 00:00:00 2001
From: Collin Styles <collingstyles@gmail.com>
Date: Sat, 17 Oct 2020 15:56:35 -0700
Subject: [PATCH 1386/1587] Rust: Remove "thread::scoped" snippet

`thread::scoped` no longer exists.
---
 snippets/rust.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 99fd38783..42c1ace74 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -209,10 +209,6 @@ snippet ss "static string declaration"
 snippet stat "static item declaration"
 	static ${1}: ${2:usize} = ${0};
 # Concurrency
-snippet scoped "spawn a scoped thread"
-	thread::scoped(${1:move }|| {
-		${0}
-	});
 snippet spawn "spawn a thread"
 	thread::spawn(${1:move }|| {
 		${0}

From 82b5c90c1a9f14bcbea97c31c737ed67d760ed29 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Sun, 18 Oct 2020 18:04:24 +0100
Subject: [PATCH 1387/1587] Vim: remove useless comment from `au` snippet

---
 snippets/vim.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index ad35df737..f19b3a469 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -43,7 +43,6 @@ snippet ife if ... else statement
 	endif
 snippet au augroup ... autocmd block
 	augroup ${1:AU_NAME}
-		" this one is which you're most likely to use?
 		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${0}
 	augroup end
 snippet bun Vundle.vim Plugin definition

From 4552876fb40c3a0b0c3f563ed97419b03d3c61b8 Mon Sep 17 00:00:00 2001
From: Alexandru Gherghescu <gherghescu_alex1@yahoo.ro>
Date: Tue, 20 Oct 2020 16:17:29 +0300
Subject: [PATCH 1388/1587] Fix snipmate/java-snippets snippet

Fix an issue where some snippets would not work as intended due to erroneous braces, i.e.: ${1} instead of $1.
---
 snippets/java.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/java.snippets b/snippets/java.snippets
index 66821c16b..739f20b70 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -175,9 +175,9 @@ snippet tryf
 ##
 ## Find Methods
 snippet findall
-	List<${1:listName}> ${2:items} = ${1}.findAll();
+	List<${1:listName}> ${2:items} = $1.findAll();
 snippet findbyid
-	${1:var} ${2:item} = ${1}.findById(${3});
+	${1:var} ${2:item} = $1.findById(${3});
 ##
 ## Javadocs
 snippet /**

From a796be3888b60e7b442d84f027867b4a32f6cc9a Mon Sep 17 00:00:00 2001
From: Eirik Igland <eirabben@gmail.com>
Date: Thu, 22 Oct 2020 09:23:06 +0200
Subject: [PATCH 1389/1587] Update twig snippets

---
 snippets/twig.snippets | 189 +++++++++++++++++++++++++++++++++++------
 1 file changed, 163 insertions(+), 26 deletions(-)

diff --git a/snippets/twig.snippets b/snippets/twig.snippets
index d0d7e1c9c..0c30ac38c 100644
--- a/snippets/twig.snippets
+++ b/snippets/twig.snippets
@@ -1,34 +1,171 @@
-snippet bl "{% block xyz %} .. {% endblock xyz %}"
+# Tags
+snippet apply "twig apply"
+	{% apply ${1} %}
+		${0}
+	{% endapply %}
+snippet autoescape "twig autoescape"
+	{% autoescape %}
+		${0}
+	{% endautoescape %}
+snippet endautoescape "twig endautoescape"
+	{% endautoescape %}${0}
+snippet block "twig block"
 	{% block ${1} %}
-	${2:${VISUAL}}
-	{% endblock $1 %}
-snippet js "{% javascripts 'xyz' %} .. {% endjavascripts %}"
-	{% javascripts '${1}' %}
-		<script src="{{ asset_url }}"></script>
-	{% endjavascripts %}
-snippet css "{% stylesheets 'xyz' %} .. {% endstylesheets %}"
-	{% stylesheets '${1}' %}
-		<link rel="stylesheet" href="{{ asset_url }}">
-	{% endstylesheets %}
-snippet if "{% if %} .. {% endif %}"
+		${0}
+	{% endblock %}
+snippet endblock "twig endblock"
+	{% endblock %}${0}
+snippet cache "twig cache"
+	{% cache %}
+		${0}
+	{% endcache %}
+snippet endcache "twig endcache"
+	{% endcache %}${0}
+snippet css "twig css"
+	{% css %}
+		${0}
+	{% endcss %}
+snippet endcss "twig endcss"
+	{% endcss %}${0}
+snippet dd "twig dd"
+	{% dd ${1} %}${0}
+snippet do "twig do"
+	{% do ${1} %}${0}
+snippet embed "twig embed"
+	{% embed "${1}" %}
+		${0}
+	{% endembed %}
+snippet endembed "twig endembed"
+	{% endembed %}${0}
+snippet exit "twig exit"
+	{% exit ${1} %}
+snippet extends "twig extends"
+	{% extends "${1}" %}${0}
+snippet for "twig for"
+	{% for ${1} in ${2} %}
+		${0}
+	{% endfor %}
+snippet fore "twig for else"
+	{% for ${1} in ${2} %}
+		${3}
+	{% else %}
+		${0}
+	{% endfor %}
+snippet endfor "twig endfor"
+	{% endfor %}${0}
+snippet from "twig from"
+	{% from "${1}" import ${2} %}${0}
+snippet header "twig header"
+	{% header "${1}" %}${0}
+snippet hook "twig hook"
+	{% hook "${1}" %}${0}
+snippet html "twig html"
+	{% html %}
+		${0}
+	{% endhtml %}
+snippet endhtml "twig endhtml"
+	{% endhtml %}${0}
+snippet if "twig if"
 	{% if ${1} %}
-	${2:${VISUAL}}
+		${0}
 	{% endif %}
-snippet ife "{% if %} .. {% else %} .. {% endif %}"
+snippet ife "twig if else"
 	{% if ${1} %}
-	${2:${VISUAL}}
+		${2}
 	{% else %}
-	${0}
+		${0}
 	{% endif %}
-snippet el "{% else %}"
+snippet el "twig else"
 	{% else %}
-	${0:${VISUAL}}
-snippet eif "{% elseif %}"
+snippet eif "twig elseif"
 	{% elseif ${1} %}
-	${0}
-snippet for "{% for x in y %} .. {% endfor %}"
-	{% for ${1} in ${2} %}
-	${3}
-	{% endfor %}
-snippet ext "{% extends xyz %}"
-	{% extends ${1} %}
+		${0}
+snippet endif "twig endif"
+	{% endif %}${0}
+snippet import "twig import"
+	{% import "${1}" as ${2} %}${0}
+snippet include "twig include"
+	{% include "${1}" %}${0}
+snippet includewith "twig include with parameters"
+	{% include "${1}" with ${2} %}${0}
+snippet js "twig js"
+	{% js %}
+		${0}
+	{% endjs %}
+snippet endjs "twig endjs"
+	{% endjs %}${0}
+snippet macro "twig macro"
+	{% macro ${1}(${2}) %}
+		${0}
+	{% endmacro %}
+snippet endmacro "twig endmacro"
+	{% endmacro %}${0}
+snippet namespace "twig namespace"
+	{% namespace "${1}" %}
+		${0}
+	{% endnamespace %}
+snippet endnamespace "twig endnamespace"
+	{% endnamespace %}${0}
+snippet nav "twig nav"
+	{% nav ${1} in ${2} %}
+		${0}
+	{% endnav %}
+snippet endnav "twig endnav"
+	{% endnav %}${0}
+snippet paginate "twig paginate"
+	{% paginate ${1} as ${2} %}${0}
+snippet redirect "twig redirect"
+	{% redirect "${1}" %}${0}
+snippet requireguest "twig requireguest"
+	{% requireGuest %}${0}
+snippet requirelogin "twig requirelogin"
+	{% requireLogin %}${0}
+snippet requirepermission "twig requirepermission"
+	{% requirePermission "${1}" %}${0}
+snippet set "twig set"
+	{% set ${1} = ${2} %}${0}
+snippet setb "twig set block"
+	{% set ${1} %}
+		${0}
+	{% endset %}
+snippet endset "twig endset"
+	{% endset %}${0}
+snippet switch "twig switch"
+	{% switch ${1} %}
+		{% case "${2}" %}
+			${0}
+		{% default %}
+			
+	{% endswitch %}
+snippet case "twig switch case"
+	{% case "${1}" %}
+		${0}
+snippet default "twig switch default"
+	{% default %}
+		${0}
+snippet endswitch "twig endswitch"
+	{% endswitch %}${0}
+snippet use "twig use"
+	{% use "${1}" %}${0}
+snippet verbatim "twig verbatim"
+	{% verbatim %}
+		${0}
+	{% endverbatim %}
+snippet endverbatim "twig endverbatim"
+	{% endverbatim %}${0}
+snippet with "twig with"
+	{% with %}
+		${0}
+	{% endwith %}
+snippet endwith "twig endwith"
+	{% endwith %}${0}
+
+# Functions
+snippet dump "twig dump"
+	<pre>
+		{{ dump(${1}) }}
+	</pre>
+
+# Filters
+snippet translate "twig translate"
+	{{ "${1}"|t }}${0}

From 9876c5c82d1572f374b23868d086f439e703e775 Mon Sep 17 00:00:00 2001
From: Eirik Igland <eirabben@gmail.com>
Date: Thu, 22 Oct 2020 11:45:10 +0200
Subject: [PATCH 1390/1587] Add shorter versions of block and extends

---
 snippets/twig.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/twig.snippets b/snippets/twig.snippets
index 0c30ac38c..8102984df 100644
--- a/snippets/twig.snippets
+++ b/snippets/twig.snippets
@@ -9,6 +9,10 @@ snippet autoescape "twig autoescape"
 	{% endautoescape %}
 snippet endautoescape "twig endautoescape"
 	{% endautoescape %}${0}
+snippet bl "twig block"
+	{% block ${1} %}
+		${0}
+	{% endblock %}
 snippet block "twig block"
 	{% block ${1} %}
 		${0}
@@ -41,6 +45,8 @@ snippet exit "twig exit"
 	{% exit ${1} %}
 snippet extends "twig extends"
 	{% extends "${1}" %}${0}
+snippet ext "twig extends"
+	{% extends "${1}" %}${0}
 snippet for "twig for"
 	{% for ${1} in ${2} %}
 		${0}

From 4097e7b2789d7d2bcb570a2d6af28caa0ab98a97 Mon Sep 17 00:00:00 2001
From: Max Rodrigo <contact@maxrodrigo.com>
Date: Mon, 26 Oct 2020 19:34:24 +0100
Subject: [PATCH 1391/1587] Update markdown.snippets

Make `HTTPS` the default protocol.
Update `http://` to `https://`.
---
 snippets/markdown.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index b1aa3e148..364066cfa 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -5,19 +5,19 @@
 # The suffix `c` stands for "Clipboard".
 
 snippet [
-	[${1:text}](http://${2:address})
+	[${1:text}](https://${2:address})
 snippet [*
 	[${1:link}](${2:`@*`})
 snippet [c
 	[${1:link}](${2:`@+`})
 snippet ["
-	[${1:text}](http://${2:address} "${3:title}")
+	[${1:text}](https://${2:address} "${3:title}")
 snippet ["*
 	[${1:link}](${2:`@*`} "${3:title}")
 snippet ["c
 	[${1:link}](${2:`@+`} "${3:title}")
 snippet [:
-	[${1:id}]: http://${2:url}
+	[${1:id}]: https://${2:url}
 
 snippet [:*
 	[${1:id}]: ${2:`@*`}
@@ -26,7 +26,7 @@ snippet [:c
 	[${1:id}]: ${2:`@+`}
 
 snippet [:"
-	[${1:id}]: http://${2:url} "${3:title}"
+	[${1:id}]: https://${2:url} "${3:title}"
 
 snippet [:"*
 	[${1:id}]: ${2:`@*`} "${3:title}"

From d48c1e2dae8f40391b2bd4b4daf97527c4d75130 Mon Sep 17 00:00:00 2001
From: Max Rodrigo <contact@maxrodrigo.com>
Date: Tue, 27 Oct 2020 12:45:52 +0100
Subject: [PATCH 1392/1587] Update UltiSnips markdown.snippets

Make `HTTPS` the default protocol.
Update `http://` to `https://`.
---
 UltiSnips/markdown.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index 72b9f8f73..1017c8013 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -104,7 +104,7 @@ endsnippet
 # Common stuff #
 ################
 snippet link "Link to something"
-[${1:${VISUAL:Text}}](${3:http://${2:www.url.com}})$0
+[${1:${VISUAL:Text}}](${3:https://${2:www.url.com}})$0
 endsnippet
 
 snippet img "Image"
@@ -125,7 +125,7 @@ endsnippet
 snippet refl "Reference Link"
 [${1:${VISUAL:Text}}][${2:id}]$0
 
-[$2]:${4:http://${3:www.url.com}} "${5:$4}"
+[$2]:${4:https://${3:www.url.com}} "${5:$4}"
 endsnippet
 
 snippet fnt "Footnote"

From 0161732b61a60a8dc8dd80db7ff678197fc2c2aa Mon Sep 17 00:00:00 2001
From: sedrubal <dev@sedrubal.de>
Date: Thu, 29 Oct 2020 14:53:07 +0100
Subject: [PATCH 1393/1587] Remove the charset="utf-8" attribute of <script>

According to
<https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script#attr-charset>
using `charset` is deprecated and useless.
---
 snippets/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index bc42f9440..640a26fa5 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -709,7 +709,7 @@ snippet samp
 		${0}
 	</samp>
 snippet script
-	<script charset="utf-8">
+	<script>
 		${0}
 	</script>
 snippet scripts

From 0f3d4d187c842419fe6e131fe20f5f3336418a62 Mon Sep 17 00:00:00 2001
From: Edward Zhou <Edward_mjz@hotmail.com>
Date: Mon, 2 Nov 2020 15:40:06 +1100
Subject: [PATCH 1394/1587] Add @enforce_keys, @moduletag, @describetag to
 elixir snippets

---
 snippets/elixir.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index c81b8eac0..26f665ed5 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -117,6 +117,8 @@ snippet defmo
 	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		${0}
 	end
+snippet enfk
+	@enforce_keys [:${1:key_name}]
 snippet dfp
 	defp ${1:name}, do: ${2}
 snippet defp
@@ -178,6 +180,10 @@ snippet des
 	describe "${1:test group subject}" do
 		${0}
 	end
+snippet destag
+	@describetag :${1:describe tag}
+snippet mtag
+	@moduletag :${1:module tag}
 snippet exunit
 	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		use ExUnit.Case, async: true

From 3e30104f106a2aaf4dc5f7072aba7d97fdf8bb2d Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Fri, 13 Nov 2020 11:47:18 +0000
Subject: [PATCH 1395/1587] Update Rust res snippet for current reference
 syntax

---
 snippets/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 42c1ace74..71fe5909b 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -110,7 +110,7 @@ snippet crate "Define create meta attributes"
 snippet opt "Option<T>"
 	Option<${1:i32}>
 snippet res "Result<T, E>"
-	Result<${1:~str}, ${2:()}>
+	Result<${1:&str}, ${2:()}>
 # Control structures
 snippet if
 	if ${1} {

From e438b06d59115d4b491f7aa73d3140af44f86175 Mon Sep 17 00:00:00 2001
From: Edward Zhou <Edward_mjz@hotmail.com>
Date: Sun, 15 Nov 2020 17:29:35 +1100
Subject: [PATCH 1396/1587] Elixir snippets

---
 snippets/elixir.snippets | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index 26f665ed5..ee093eb9c 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -81,6 +81,8 @@ snippet cb
 	@callback ${1:name}(${2:args}) :: ${3:returns}
 snippet df
 	def ${1:name}, do: ${2}
+snippet dfw
+	def ${1:name}(${2:args}) when ${3:guard}, do:
 snippet def
 	def ${1:name} do
 		${0}
@@ -105,6 +107,10 @@ snippet defsd
 	def $2(${5:args}) do
 		${0}
 	end
+snippet defw
+	def ${1:name}(${2:args}) when ${3:guard} do
+		${0}
+	end
 snippet defim
 	defimpl ${1:protocol_name}, for: ${2:data_type} do
 		${0}
@@ -117,14 +123,24 @@ snippet defmo
 	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		${0}
 	end
+snippet %M
+	%__MODULE__{
+		${1:key_name}: ${2:value}
+	}
 snippet enfk
 	@enforce_keys [:${1:key_name}]
 snippet dfp
 	defp ${1:name}, do: ${2}
+snippet dfpw
+	defp ${1:name}(${2:args}) when ${3:guard}, do: ${4}
 snippet defp
 	defp ${1:name} do
 		${0}
 	end
+snippet defpw
+	defp ${1:name}(${2:args}) when ${3:guard} do
+		${0}
+	end
 snippet defpr
 	defprotocol ${1:name}, [${0:function}]
 snippet defr
@@ -184,12 +200,24 @@ snippet destag
 	@describetag :${1:describe tag}
 snippet mtag
 	@moduletag :${1:module tag}
+snippet dt
+	doctest ${1:filename}
+snippet tp
+	@tag :pending
 snippet exunit
 	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
 		use ExUnit.Case, async: true
 
 		${0}
 	end
+snippet setup
+	setup do
+		${1}
+	end
+snippet setupa
+	setup_all do
+		${1}
+	end
 snippet try try .. rescue .. end
 	try do
 		${1:${VISUAL}}

From 1289fa6a85ddee186dce7951fbbfebc8c89b666f Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Wed, 25 Nov 2020 21:10:49 +0100
Subject: [PATCH 1397/1587] C++: improved modern for loop

---
 UltiSnips/cpp.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index 634192d9f..80120daeb 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -31,7 +31,7 @@ endglobal
 #                            TextMate Snippets                            #
 ###########################################################################
 snippet forc "general for loop (for)"
-for (${6:auto} ${1:i} = ${2:v.begin()}; `!p snip.rv = t[1].split(" ")[-1]` ${4:!=} ${3:`!p snip.rv = t[2].split(".")[0]`.end()}; ${5:++`!p snip.rv = t[1].split(" ")[-1]`}) {
+for (${6:auto} ${1:i} = ${2:v.begin()}; `!p import re; snip.rv = re.split("[^\w]",t[1])[-1]` ${4:!=} ${3:`!p m = re.search(r'^(?:(.*)(\.|->)begin\(\)|((?:std|boost)::)?begin\((.*)\))$', t[2]); snip.rv = (((m.group(3) if m.group(3) else "") + "end(" + m.group(4) + ")") if m.group(4) else (m.group(1) + m.group(2) + "end()")) if m else ""`}; ${5:++`!p snip.rv = t[1].split(" ")[-1]`}) {
 	${VISUAL}$0
 }
 endsnippet

From 6fe515ee5778c4a704b581b2b9ad0f13dd803c25 Mon Sep 17 00:00:00 2001
From: TornaxO7 <tornax07@gmail.com>
Date: Thu, 26 Nov 2020 18:20:49 +0100
Subject: [PATCH 1398/1587] - added modern for-loop - added modern printf which
 adds automatically the needed amount of args

---
 UltiSnips/c.snippets | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets
index e1eb81c2c..c191d7603 100644
--- a/UltiSnips/c.snippets
+++ b/UltiSnips/c.snippets
@@ -1,7 +1,33 @@
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
+# --------------
+# Functions
+# --------------
+global !p
+def printf_expand_args(snip):
+	"""
+	This will look how many placeholders printf has and adds the separated commas
+	at the end.
+	"""
+	
+	# now add so many "," as much as the amount of placeholders
+	amount_placeholders = snip.tabstops[1].current_text.count("%")
+
+	output = ""
+
+	# Add the amount of tabstops
+	for placeholder_index in range(3, amount_placeholders + 3):
+		output += f", ${placeholder_index}"
+	
+	# convert them into tabstops
+	snip.expand_anon(output)
+
+endglobal
 
+# ==============
+# Snippets 
+# ==============
 priority -50
 
 snippet def "#define ..."
@@ -49,6 +75,16 @@ for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
 }
 endsnippet
 
+snippet fora "for-loop" b
+for (${1:var}; ${2:condition}; `!p
+if len(t[1]) > 0:
+	snip.rv = t[1].split('=')[0].split()[-1]
+`++) {
+	
+	$0
+} /* for ($1; $2; `!p if len(t[1]) > 0: snip.rv = t[1].split('=')[0].split()[-1]`++) */
+endsnippet
+
 snippet once "Include header once only guard"
 #ifndef ${1:`!p
 if not snip.c:
@@ -75,8 +111,9 @@ else if (${1:/* condition */}) {
 }
 endsnippet
 
-snippet printf "printf .. (printf)"
-printf("${1:%s}\n"${1/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$2${1/([^%]|%%)*(%.)?.*/(?2:\);)/}
+post_jump "printf_expand_args(snip)"
+snippet "printf" "printf with auto-expand args" wr
+printf("$1\n"$2);
 endsnippet
 
 snippet st "struct"

From e7a8a3fb439e22a9d55b050f3cab5c962b8d5aa7 Mon Sep 17 00:00:00 2001
From: yarra <zhaojunchao@loongson.cn>
Date: Mon, 14 Dec 2020 15:12:12 +0800
Subject: [PATCH 1399/1587] add inline assembly

---
 snippets/c.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index 5c084154e..e70d057c2 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -344,3 +344,10 @@ snippet todo
 # This is kind of convenient
 snippet .
 	[${1}]
+
+snippet asm
+	__asm__ __volatile__(
+	"${0}\n\t"
+	:
+	:
+	);

From f33b8cb6fa95a1237a43b534a9d85e8fda675940 Mon Sep 17 00:00:00 2001
From: Miguel Montalvo <miguel.montalvo@barrelny.com>
Date: Fri, 25 Dec 2020 23:09:46 -0800
Subject: [PATCH 1400/1587] Include schema fields

---
 snippets/liquid.snippets | 189 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)

diff --git a/snippets/liquid.snippets b/snippets/liquid.snippets
index a39a0876d..c8079ed81 100644
--- a/snippets/liquid.snippets
+++ b/snippets/liquid.snippets
@@ -265,3 +265,192 @@ snippet asset_img_url
 	| asset_img_url: '${1:medium}'
 snippet img_url
 	| img_url: '${1:medium}'
+snippet _schema
+	{% schema %}
+		{
+			"name": "${1}",
+			"class": "${2}",
+			"settings": [
+				${0}
+			]
+		}
+	{% endschema %}
+snippet _blocks
+	"blocks": [
+		{
+			"type": "${1}",
+			"name": "${2}",
+			"settings": [
+				${0}
+			]
+		}
+	]
+snippet _text
+	{
+		"type": "text",
+		"id": "${1}",
+		"label": "${2}",
+		"default": "${3}",
+		"info": "${4}",
+		"placeholder": "${0}"
+	}
+snippet _textarea
+	{
+		"type": "textarea",
+		"id": "${1}",
+		"label": "${2}",
+		"default": "${3}",
+		"info": "${4}",
+		"placeholder": "${0}"
+	}
+snippet _image_picker
+	{
+		"type": "image_picker",
+		"id": "${1}",
+		"label": "${0}"
+	}
+snippet _radio
+	{
+		"type": "radio",
+		"id": "${1}",
+		"label": "${2}",
+		"options": [
+			{ "value": "${5}", "label": "${0}" }
+		],
+		"default": "${3}",
+		"info": "${4}"
+	}
+snippet _select
+	{
+		"type": "select",
+		"id": "${1}",
+		"label": "${2}",
+		"options": [
+			{
+				"group": "${5}",
+				"value": "${6}",
+				"label": "${0}"
+			}
+		],
+		"default": "${3}",
+		"info": "${4}"
+	}
+snippet _checkbox
+	{
+		"type": "checkbox",
+		"id": "${1}",
+		"label": "${2}",
+		"default": ${3:true},
+		"info": "${0}"
+	}
+snippet _range
+	{
+		"type": "range",
+		"id": "${1}",
+		"min": ${2},
+		"max": ${3},
+		"step": ${4},
+		"unit": "${5}",
+		"label": "${6}",
+		"default": ${0}
+	}
+snippet _color
+	{
+		"type": "color",
+		"id": "${1}",
+		"label": "${2}",
+		"default": "${3}",
+		"info": "${0}"
+	}
+snippet _font
+	{
+		"type": "font_picker",
+		"id": "${1}",
+		"label": "${2}",
+		"info": "${3}",
+		"default": "${0:helvetica_n4}"
+	}
+snippet _collection
+	{
+		"type": "collection",
+		"id": "${1}",
+		"label": "${2}",
+		"info": "${0}"
+	}
+snippet _product
+	{
+		"type": "product",
+		"id": "${1}",
+		"label": "${2}",
+		"info": "${0}"
+	}
+snippet _blog
+	{
+		"type": "blog",
+		"id": "${1}",
+		"label": "${2}",
+		"info": "${0}"
+	}
+snippet _page
+	{
+		"type": "page",
+		"id": "${1}",
+		"label": "${2}",
+		"info": "${0}"
+	}
+snippet _link_list
+	{
+		"type": "link_list",
+		"id": "${1}",
+		"label": "${2}",
+		"info": "${0}"
+	}
+snippet _url
+	{
+		"type": "url",
+		"id": "${1}",
+		"label": "${2}",
+		"info": "${0}"
+	}
+snippet _video
+	{
+		"type": "video_url",
+		"id": "${1}",
+		"label": "${2}",
+		"accept": ["youtube", "vimeo"${0}],
+		"default": "${3}",
+		"info": "${4}",
+		"placeholder": "${5}"
+	}
+snippet _richtext
+	{
+		"type": "richtext",
+		"id": "${1}",
+		"label": "${2}",
+		"default": "<p>${0}</p>"
+	}
+snippet _html
+	{
+		"type": "html",
+		"id": "${1}",
+		"label": "${2}",
+		"default": "<div>${0}</div>"
+	}
+snippet _article
+	{
+		"type": "article",
+		"id": "${1}",
+		"label": "${2}",
+		"info": "${0}"
+	}
+snippet _header
+	{
+		"type": "header",
+		"content": "${1}",
+		"info": "${0}"
+	}
+snippet _paragraph
+	{
+		"type": "paragraph",
+		"content": "${0}"
+	}

From db2baa3a2bae3cad5b18b43a9eb42cbd86f69b1a Mon Sep 17 00:00:00 2001
From: Miguel Montalvo <miguel.montalvo@barrelny.com>
Date: Fri, 25 Dec 2020 23:45:09 -0800
Subject: [PATCH 1401/1587] Add visual stops

---
 snippets/liquid.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/liquid.snippets b/snippets/liquid.snippets
index c8079ed81..38d4aacbf 100644
--- a/snippets/liquid.snippets
+++ b/snippets/liquid.snippets
@@ -28,7 +28,7 @@ snippet case
 	{% endcase %}
 snippet when
 	{% when ${1:condition} %}
-		${0}
+		${0:${VISUAL}}
 snippet cycle
 	{% cycle '${1:odd}', '${2:even}' %}
 snippet cyclegroup
@@ -100,7 +100,7 @@ snippet javascript
 		${0}
 	{% endjavascript %}
 snippet comment-
-	{%- comment -%}${0}{%- endcomment -%}
+	{%- comment -%}${0:${VISUAL}}{%- endcomment -%}
 snippet if-
 	{%- if ${1:condition} -%}
 		${0:${VISUAL}}
@@ -128,7 +128,7 @@ snippet case-
 	{%- endcase -%}
 snippet when-
 	{%- when ${1:condition} -%}
-		${0}
+		${0:${VISUAL}}
 snippet cycle-
 	{%- cycle '${1:odd}', '${2:even}' -%}
 snippet cyclegroup-

From 4391628e31a00074a17dd420415752e742d8d0d2 Mon Sep 17 00:00:00 2001
From: Miguel Montalvo <miguel.montalvo@barrelny.com>
Date: Fri, 25 Dec 2020 23:59:44 -0800
Subject: [PATCH 1402/1587] Add whitespaced snippets

---
 snippets/liquid.snippets | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/snippets/liquid.snippets b/snippets/liquid.snippets
index 38d4aacbf..72a78d0e4 100644
--- a/snippets/liquid.snippets
+++ b/snippets/liquid.snippets
@@ -151,6 +151,22 @@ snippet include-
 	{%- include '${0:snippet}' -%}
 snippet includewith-
 	{%- include '${1:snippet}', ${2:variable}: ${0:value} -%}
+snippet render-
+	{%- render '${0:snippet}' -%}
+snippet renderwith-
+	{%- render '${1:snippet}', ${2:variable}: ${0:value} -%}
+snippet section-
+	{%- section '${1:snippet}' -%}
+snippet layout-
+	{%- layout '${1:layout}' -%}
+snippet layoutnone-
+	{%- layout none -%}
+snippet paginate-
+	{%- paginate ${1:collection.products} by ${2:12} -%}
+		{%- for ${3:product} in $1 -%}
+			${0}
+		{%- endfor -%}
+	{%- endpaginate -%}
 snippet join
 	| join: '${1:, }'
 snippet first

From d4bd55512c698715b7579da5a42f9373731c6e48 Mon Sep 17 00:00:00 2001
From: Michael Padilla <51935560+Mikadifo@users.noreply.github.com>
Date: Sat, 26 Dec 2020 09:39:00 -0500
Subject: [PATCH 1403/1587] Add maketitle command snippet using mkt

I was missing basic and simple commands snippets like maketitle
---
 snippets/tex.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index e13508a49..37ce62082 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -19,6 +19,11 @@ snippet begin \begin{} ... \end{} block
 	\\begin{${1:env}}
 		${0:${VISUAL}}
 	\\end{$1}
+
+# Maketitle
+snippet mkt maketitle
+	\\maketitle
+	
 # Tabular
 snippet tab tabular (or arbitrary) environment
 	\\begin{${1:tabular}}{${2:c}}

From 275bfd8d6aebabd1140b18656d1bda32ca076dbb Mon Sep 17 00:00:00 2001
From: Michael Padilla <51935560+Mikadifo@users.noreply.github.com>
Date: Sat, 26 Dec 2020 10:18:35 -0500
Subject: [PATCH 1404/1587] Add documentclass snippet with and without options

Whit options: dclo -> \documentclass[options]{class}
Whitout options: dcl -> \documentclass{class}
---
 snippets/tex.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 37ce62082..c1aca3413 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -1,5 +1,11 @@
 #version 1
 #PREAMBLE
+#documentclass without options
+snippet dcl \documentclass{}
+	\\documentclass{${1:class}} ${0}
+#documentclass with options
+snippet dclo \documentclass[]{}
+	\\documentclass[${1:options}]{${2:class}} ${0}
 #newcommand
 snippet nc \newcommand
 	\\newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}

From 78d6ec6ad3179ed4f0670cf6fc60f5d62b3c486a Mon Sep 17 00:00:00 2001
From: Patrik Wenger <paddor@gmail.com>
Date: Mon, 4 Jan 2021 18:10:59 +0100
Subject: [PATCH 1405/1587] avoid duplicate snippet name

---
 snippets/ruby.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index ff5fede10..19cf30782 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -500,7 +500,7 @@ snippet asrt
 	assert_respond_to ${1:object}, :${2:method}
 snippet ass assert_same(..)
 	assert_same ${1:expected}, ${2:actual}
-snippet ass assert_send(..)
+snippet asss assert_send(..)
 	assert_send [${1:object}, :${2:message}, ${3:args}]
 snippet asns
 	assert_not_same ${1:unexpected}, ${2:actual}

From e2559687406b54f0315b5d47b0323c52d66b3ded Mon Sep 17 00:00:00 2001
From: Patrik Wenger <paddor@gmail.com>
Date: Mon, 4 Jan 2021 18:14:12 +0100
Subject: [PATCH 1406/1587] fix semantic errors

---
 snippets/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 19cf30782..35e5f09d5 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -485,13 +485,13 @@ snippet asnm
 snippet aso
 	assert_operator ${1:left}, :${2:operator}, ${3:right}
 snippet asr
-	assert_raise ${1:Exception} { ${0} }
+	assert_raise(${1:Exception}) { ${0} }
 snippet asrd
 	assert_raise ${1:Exception} do
 		${0}
 	end
 snippet asnr
-	assert_nothing_raised ${1:Exception} { ${0} }
+	assert_nothing_raised(${1:Exception}) { ${0} }
 snippet asnrd
 	assert_nothing_raised ${1:Exception} do
 		${0}

From 6159e8e820656e4370d54ddbf11278bf92794139 Mon Sep 17 00:00:00 2001
From: Patrik Wenger <paddor@gmail.com>
Date: Mon, 4 Jan 2021 18:15:44 +0100
Subject: [PATCH 1407/1587] don't default to bad practices

---
 snippets/ruby.snippets | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 35e5f09d5..31da85116 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -24,7 +24,7 @@ snippet rb
 snippet beg
 	begin
 		${0}
-	rescue ${1:Exception} => ${2:e}
+	rescue ${1:StandardError} => ${2:e}
 	end
 snippet req require
 	require '${1}'
@@ -485,15 +485,15 @@ snippet asnm
 snippet aso
 	assert_operator ${1:left}, :${2:operator}, ${3:right}
 snippet asr
-	assert_raise(${1:Exception}) { ${0} }
+	assert_raise(${1:StandardError}) { ${0} }
 snippet asrd
-	assert_raise ${1:Exception} do
+	assert_raise ${1:StandardError} do
 		${0}
 	end
 snippet asnr
-	assert_nothing_raised(${1:Exception}) { ${0} }
+	assert_nothing_raised(${1:StandardError}) { ${0} }
 snippet asnrd
-	assert_nothing_raised ${1:Exception} do
+	assert_nothing_raised ${1:StandardError} do
 		${0}
 	end
 snippet asrt
@@ -568,7 +568,7 @@ snippet b
 snippet begin
 	begin
 		fail 'A test exception.'
-	rescue Exception => e
+	rescue StandardError => e
 		puts e.message
 		puts e.backtrace.inspect
 	else
@@ -640,7 +640,7 @@ snippet wm
 snippet mout
 	-> { ${1} }.must_output '${0}'
 snippet mra
-	-> { ${1} }.must_raise ${0:Exception}
+	-> { ${1} }.must_raise ${0:StandardError}
 snippet mrt
 	must_respond_to :${0:method}
 snippet wrt

From d43498c949a3acf297fd74397a3bc165033f2028 Mon Sep 17 00:00:00 2001
From: Patrik Wenger <paddor@gmail.com>
Date: Thu, 7 Jan 2021 13:47:51 +0100
Subject: [PATCH 1408/1587] s/assert_raise/assert_raises/

Minitest is now the standard and Test::Unit also provides #assert_raises
---
 snippets/ruby.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 31da85116..4b46c5715 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -485,9 +485,9 @@ snippet asnm
 snippet aso
 	assert_operator ${1:left}, :${2:operator}, ${3:right}
 snippet asr
-	assert_raise(${1:StandardError}) { ${0} }
+	assert_raises(${1:StandardError}) { ${0} }
 snippet asrd
-	assert_raise ${1:StandardError} do
+	assert_raises ${1:StandardError} do
 		${0}
 	end
 snippet asnr

From a7ad28f8fef2753eac20f3f19961f32661e4dc04 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Mon, 11 Jan 2021 01:43:26 -0500
Subject: [PATCH 1409/1587] puppet: new type alias snippet

For this new snippet, we need the get_module_namespace_and_basename
function to have just a tiny change in behaviour so that we can identify
the type alias name in a similar fashion than for classes and defined
types.
---
 UltiSnips/puppet.snippets | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/puppet.snippets b/UltiSnips/puppet.snippets
index eacc8fc88..31f98c72b 100644
--- a/UltiSnips/puppet.snippets
+++ b/UltiSnips/puppet.snippets
@@ -8,11 +8,13 @@ global !p
 import vim
 import os.path
 def get_module_namespace_and_basename():
-	"""This function will try to guess the current class or define name you are
-	trying to create. Note that for this to work you should be using the module
-	structure as per the style guide. Examples inputs and it's output
+	"""This function will try to guess the current class, define or type
+	name you are trying to create. Note that for this to work you should be
+	using the module structure as per the style guide. Examples inputs and
+	it's output
 	* /home/nikolavp/puppet/modules/collectd/manifests/init.pp -> collectd
-	* /home/nikolavp/puppet/modules/collectd/manfistes/mysql.pp -> collectd::mysql
+	* /home/nikolavp/puppet/modules/collectd/manifests/mysql.pp -> collectd::mysql
+	* /home/nikolavp/puppet/modules/collectd/types/dbname.pp -> Collectd::Dbname
 	"""
 	first_time = True
 	current_file_path_without_ext = vim.eval('expand("%:p:r")') or ""
@@ -25,8 +27,12 @@ def get_module_namespace_and_basename():
 			first_time = False
 			parts = os.path.split(parts[0])
 			continue
-		if parts[1] == 'manifests':
-			return os.path.split(parts[0])[1] + ('::' + namespace).rstrip(':')
+		if parts[1] in ['manifests', 'types']:
+			parsed_name = os.path.split(
+				parts[0])[1] + ('::' + namespace).rstrip(':')
+			if parts[1] == 'types':
+				parsed_name = parsed_name.title()
+			return parsed_name
 		else:
 			namespace = parts[1] + '::' + namespace
 		parts = os.path.split(parts[0])
@@ -51,6 +57,10 @@ define ${1:`!p snip.rv = get_module_namespace_and_basename()`} {
 }
 endsnippet
 
+snippet type "Data type alias" b
+type ${1:`!p snip.rv = get_module_namespace_and_basename()`} = ${2:Type}
+endsnippet
+
 #################################################################
 #  Puppet Types                                                 #
 #    See http://docs.puppetlabs.com/references/latest/type.html #

From 29d37483c4a8dad8baf0684f73541f6364dd3734 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Mon, 11 Jan 2021 02:52:02 -0500
Subject: [PATCH 1410/1587] puppet: new snippets for lamda, lookup and trocla
 functions

Note: the trocla() function is not native to puppet. It is implemented
by a third party module that adds a method for automatically generating
random data for certain types of sensitive information.
---
 UltiSnips/puppet.snippets | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/UltiSnips/puppet.snippets b/UltiSnips/puppet.snippets
index 31f98c72b..6d23c92cc 100644
--- a/UltiSnips/puppet.snippets
+++ b/UltiSnips/puppet.snippets
@@ -61,6 +61,12 @@ snippet type "Data type alias" b
 type ${1:`!p snip.rv = get_module_namespace_and_basename()`} = ${2:Type}
 endsnippet
 
+snippet lambda "Lambda function chain-called on a variable"
+$${1:varname}.${2:each} |${3:Type} $${4:param}| {
+	$0
+}
+endsnippet
+
 #################################################################
 #  Puppet Types                                                 #
 #    See http://docs.puppetlabs.com/references/latest/type.html #
@@ -207,6 +213,14 @@ snippet hiera_include "Hiera Include Function" b
 hiera_include("${1:Lookup}")$0
 endsnippet
 
+snippet lookup "Lookup data from hiera"
+$${1:varname} = lookup('${2:hiera::key}')$0
+endsnippet
+
+snippet trocla "Lookup or generate sensitive information"
+trocla('${1:lookup_key}', '${2:plain}', ${3:'length: 32'})$0
+endsnippet
+
 snippet include "Include Function" b
 include ${1:classname}$0
 endsnippet

From 0c5114e90837eac9af2150406f7821041e7e720b Mon Sep 17 00:00:00 2001
From: lasorda <7352092+lasorda@users.noreply.github.com>
Date: Fri, 15 Jan 2021 23:34:44 +0800
Subject: [PATCH 1411/1587] add lpc support (#1311)

---
 snippets/lpc.snippets | 190 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 190 insertions(+)
 create mode 100644 snippets/lpc.snippets

diff --git a/snippets/lpc.snippets b/snippets/lpc.snippets
new file mode 100644
index 000000000..2a849efaf
--- /dev/null
+++ b/snippets/lpc.snippets
@@ -0,0 +1,190 @@
+##
+## Preprocessor
+# #include <...>
+snippet inc
+	#include <${1:stdio}.h>
+# #include "..."
+snippet Inc
+	#include "${1:`vim_snippets#Filename("$1.h")`}"
+# ifndef...define...endif
+snippet ndef
+	#ifndef $1
+	#define ${1:SYMBOL} ${2:value}
+	#endif /* ifndef $1 */
+# define
+snippet def
+	#define
+# ifdef...endif
+snippet ifdef
+	#ifdef ${1:FOO}
+		${2:#define }
+	#endif
+# if
+snippet #if
+	#if ${1:FOO}
+		${0:${VISUAL}}
+	#endif
+# header include guard
+snippet once
+	#ifndef ${1:`toupper(vim_snippets#Filename('$1_H', 'UNTITLED_H'))`}
+
+	#define $1
+
+	${0}
+
+	#endif /* end of include guard: $1 */
+##
+## Control Statements
+# if
+snippet if
+	if(${1:true})
+	{
+		${0:${VISUAL}}
+	}
+snippet ife
+	if(${1:true})
+	{
+		${2:${VISUAL}}
+	}
+	else
+	{
+		${0}
+	}
+# else
+snippet el
+	else
+	{
+		${0:${VISUAL}}
+	}
+# else if
+snippet elif
+	else if(${1:true})
+	{
+		${0:${VISUAL}}
+	}
+# ifi
+snippet ifi
+	if(${1:true}) ${0};
+# ternary
+snippet t
+	${1:/* condition */} ? ${2:a} : ${3:b}
+# switch
+snippet switch
+	switch(${1:/* variable */})
+	{
+		case ${2:/* variable case */}:
+			${3}
+			${4:break;}${5}
+		default:
+			${6}
+	}
+# switch without default
+snippet switchndef
+	switch(${1:/* variable */})
+	{
+		case ${2:/* variable case */}:
+			${3}
+			${4:break;}${5}
+	}
+# case
+snippet case
+	case ${1:/* variable case */}:
+		${2}
+		${3:break;}
+snippet ret
+	return ${0};
+##
+## Loops
+#foreach
+snippet fore
+	foreach(${1:mixed} ${2:ele} in ${3:arr})
+	{
+		${4}
+	}
+# for
+snippet for
+	for(int ${2:i} = 0; $2 < ${1:count}; $2${3:++})
+	{
+		${4}
+	}
+# for (custom)
+snippet forr
+	for(int ${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++})
+	{
+		${5}
+	}
+# while
+snippet wh
+	while(${1:/* condition */})
+	{
+		${0:${VISUAL}}
+	}
+# do... while
+snippet do
+	do{
+		${0:${VISUAL}}
+	}while (${1:/* condition */});
+##
+## Functions
+# function definition
+snippet fnc
+	${1:void} ${2:function_name}(${3})
+	{
+		${4}
+	}
+# function definition with zero parameters
+snippet defun0
+	${1:void} ${2:function_name}()
+	{
+		${3}
+	}
+# function definition with one parameter
+snippet defun1
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter})
+	{
+		${5}
+	}
+# function definition with two parameters
+snippet defun2
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter}, ${5:Type} ${6:Parameter})
+	{
+		${7}
+	}
+# function definition with three parameters
+snippet defun3
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter}, ${5:Type} ${6:Parameter}, ${7:Type} ${8:Parameter})
+	{
+		${9}
+	}
+# function declaration
+snippet fund
+	${1:void} ${2:function_name}(${3});
+##
+## Input/Output
+# printf
+snippet pr
+	printf("${1:%s}\n"${2});
+# fprintf (again, this isn't as nice as TextMate's version, but it works)
+snippet fpr
+	fprintf(${1:stderr}, "${2:%s}\n"${3});
+snippet prd
+	printf("${1:} = %d\n", $1);
+snippet prf
+	printf("${1:} = %f\n", $1);
+snippet prx
+	printf("${1:} = %${2}\n", $1);
+##
+# TODO section
+snippet todo
+	/*! TODO: ${1:Todo description here} */
+
+## Miscellaneous
+# This is kind of convenient
+snippet .
+	[${1}]
+
+
+##
+## MHXY
+snippet head
+	// code for ${1} by `$USER` create at `strftime("%Y-%m-%d %H:%M:%S")`

From 673390c68328d8d067439127f15923a8ebc9efd8 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Sun, 17 Jan 2021 08:59:16 +0000
Subject: [PATCH 1412/1587] C++: not a plain C main

---
 UltiSnips/cpp.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index 80120daeb..d152aa768 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -30,6 +30,13 @@ endglobal
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
+snippet main
+int main()
+{
+	${0}
+}
+endsnippet
+
 snippet forc "general for loop (for)"
 for (${6:auto} ${1:i} = ${2:v.begin()}; `!p import re; snip.rv = re.split("[^\w]",t[1])[-1]` ${4:!=} ${3:`!p m = re.search(r'^(?:(.*)(\.|->)begin\(\)|((?:std|boost)::)?begin\((.*)\))$', t[2]); snip.rv = (((m.group(3) if m.group(3) else "") + "end(" + m.group(4) + ")") if m.group(4) else (m.group(1) + m.group(2) + "end()")) if m else ""`}; ${5:++`!p snip.rv = t[1].split(" ")[-1]`}) {
 	${VISUAL}$0

From d6f2d5728002456fac0075c2442695d25167f8d9 Mon Sep 17 00:00:00 2001
From: Patrik Wenger <paddor@gmail.com>
Date: Tue, 19 Jan 2021 17:55:59 +0100
Subject: [PATCH 1413/1587] add #refute and friends

---
 snippets/ruby.snippets | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 4b46c5715..3c9eec527 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -518,6 +518,24 @@ snippet asntd
 	end
 snippet fl
 	flunk '${1:Failure message.}'
+snippet rf
+	refute ${1:test}, '${2:Failure message.}'
+snippet rfe
+	refute_equal ${1:unexpected}, ${2:actual}
+snippet rfko
+	refute_kind_of ${1:UnexpectedKind}, ${2:actual_instance}
+snippet rfn
+	refute_nil ${1:instance}
+snippet rfo
+	refute_operator ${1:left}, :${2:operator}, ${3:right}
+snippet rfi
+	refute_includes ${1:collection}, ${2:object}
+snippet rfid
+	refute_in_delta ${1:unexpected_float}, ${2:actual_float}, ${3:2**-20}
+snippet rfio
+	refute_instance_of ${1:UnexpectedClass}, ${2:actual_instance}
+snippet rfs
+	refute_same ${1:unexpected}, ${2:actual}
 # Benchmark.bmbm do .. end
 snippet bm-
 	TESTS = ${1:10_000}

From adff0bf675e17d5b94ec7d10b5cd8a0dd74a61b0 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Sat, 30 Jan 2021 09:13:00 +0000
Subject: [PATCH 1414/1587] `END` to close an `augroup` should be capitalized

---
 snippets/vim.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index f19b3a469..b37150368 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -44,7 +44,7 @@ snippet ife if ... else statement
 snippet au augroup ... autocmd block
 	augroup ${1:AU_NAME}
 		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${0}
-	augroup end
+	augroup END
 snippet bun Vundle.vim Plugin definition
 	Plugin '${0}'
 snippet plug vim-plug Plugin definition

From 1b687b29ecf97125becae8f3fcce0c77c48951d6 Mon Sep 17 00:00:00 2001
From: hulin <hulin2021@gmail.com>
Date: Sun, 7 Feb 2021 17:51:53 +0800
Subject: [PATCH 1415/1587] feat(eelixir.snippets): add some new snippets

---
 snippets/eelixir.snippets | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/snippets/eelixir.snippets b/snippets/eelixir.snippets
index 456bed515..c15d86ec6 100644
--- a/snippets/eelixir.snippets
+++ b/snippets/eelixir.snippets
@@ -38,6 +38,17 @@ snippet ft form_tag
 	<%= form_tag(${1:"/users"}, method: ${2::post}) %>
 		${0}
 	</form>
+
+snippet sl select
+	<%= select ${1:f}, :${2:field}, ${3:[{"key", "value"}]}, prompt: ${4:"Prompt"} %>
+
+snippet sb submit
+	<%= submit ${1:"Submit"} %>
+
+snippet rb radio_button
+	<%= radio_button ${1:f}, :${2:field},  ${3:"value"} %>
+
+
 snippet et error_tag
 	<%= error_tag ${1:f}, :${2:field} %>
 snippet ti text_input

From 8426857c1b8d1c00bbe0faa6dfff99acb1521042 Mon Sep 17 00:00:00 2001
From: Kelly Joseph Price <kelly@readme.com>
Date: Tue, 9 Feb 2021 12:12:39 -0800
Subject: [PATCH 1416/1587] add clstr

---
 snippets/javascript/javascript.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 265620683..dcf37a4e8 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -275,6 +275,8 @@ snippet cprof "console.profile"
 	console.profileEnd();
 snippet ctable "console.table"
 	console.table(${1:"${2:value}"});
+snippet clstr "console.log stringified"
+	console.log(JSON.stringify(${0}, null, 2));
 # Misc
 snippet us
 	'use strict';

From 117b1df735c44148822ba8f37e9e105f402ed3ae Mon Sep 17 00:00:00 2001
From: Baker Rayyan <59668240+bakerray@users.noreply.github.com>
Date: Mon, 22 Feb 2021 20:05:25 +0200
Subject: [PATCH 1417/1587] Add Initial

---
 snippets/verilog.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/verilog.snippets b/snippets/verilog.snippets
index e4a6b0529..870e52d57 100644
--- a/snippets/verilog.snippets
+++ b/snippets/verilog.snippets
@@ -81,3 +81,8 @@ snippet task
 	task ${1:name}(${2});
 		${0}
 	endtask: $1
+# Initial 
+snippet ini
+	initial begin
+		${0}
+	end

From b1c7ea8abf789277b0bb921040ce4972b63346c0 Mon Sep 17 00:00:00 2001
From: Baker Rayyan <59668240+bakerray@users.noreply.github.com>
Date: Mon, 22 Feb 2021 20:32:37 +0200
Subject: [PATCH 1418/1587] update verilog.snippets

1. update module snippet so module name is the filename by default
2. add tdsp (typedef struct packed) snippet
3. add tdf (typedef eum) snippet
---
 snippets/verilog.snippets | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/snippets/verilog.snippets b/snippets/verilog.snippets
index 870e52d57..16bacc2a3 100644
--- a/snippets/verilog.snippets
+++ b/snippets/verilog.snippets
@@ -58,7 +58,7 @@ snippet al
 	end
 # Module block
 snippet mod
-	module ${1:module_name} (${2});
+	module ${1:`vim_snippets#Filename('$1', 'name')`} (${2});
 		${0}
 	endmodule
 # For
@@ -86,3 +86,14 @@ snippet ini
 	initial begin
 		${0}
 	end
+# typedef struct packed
+snippet tdsp
+	typedef struct packed {
+		int ${2:data};
+	} ${1:`vim_snippets#Filename('$1_t', 'name')`};
+# typedef eum
+snippet tde
+	typedef enum ${2:logic[15:0]}
+	{
+		${3:REG = 16'h0000}
+	} ${1:my_dest_t};

From 24a9bf959211bb0ba9ada17d6425ff167adf7bd9 Mon Sep 17 00:00:00 2001
From: luisbaldissera <luis.baldissera26@gmail.com>
Date: Wed, 24 Feb 2021 15:59:02 -0300
Subject: [PATCH 1419/1587] Added cuda snippets

---
 snippets/cuda.snippets | 58 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/snippets/cuda.snippets b/snippets/cuda.snippets
index 425ca67f1..2fc192184 100644
--- a/snippets/cuda.snippets
+++ b/snippets/cuda.snippets
@@ -1 +1,59 @@
 extends cpp
+
+snippet kern "Kernel definition"
+	__global__ void ${1:kernel}(${2:void}) {
+		${0:// TODO: Implement}
+	}
+
+snippet dev "Device function definition"
+	__device__ ${1:int} ${2:foo}(${3:void}) {
+		${0:// TODO: Implement}
+		return 0;
+	}
+	
+snippet call "Kernel call"
+	${1:kernel}<<<${2:args}>>>(${3});${0}
+
+snippet sync "Synchonize threads"
+	__syncthreads();
+
+snippet tid "Thread Index"
+	threadIdx.${0}
+
+snippet bid "Block Index"
+	blockIdx.${0}
+
+snippet bdim "Block Dimension"
+	blockDim.${0}
+
+snippet ii "Get current index (1D)"
+	int ${1:index} = threadIdx.${2:x} + blockIdx.$2 * blockDim.$2;
+
+snippet ix "Get current X index (1D)"
+	int ${1:x} = threadIdx.x + blockIdx.x * blockDim.x;
+
+snippet iy "Get current Y index (1D)"
+	int ${1:y} = threadIdx.y + blockIdx.y * blockDim.y;
+
+snippet iz "Get current Z index (1D)"
+	int ${1:z} = threadIdx.z + blockIdx.z * blockDim.z;
+
+snippet ixy "Get current X,Y index (2D)"
+	int ${1:x} = threadIdx.x + blockIdx.x * blockDim.x;
+	int ${2:y} = threadIdx.y + blockIdx.y * blockDim.y;
+
+snippet ixz "Get current X,Z index (2D)"
+	int ${1:x} = threadIdx.x + blockIdx.x * blockDim.x;
+	int ${3:z} = threadIdx.z + blockIdx.z * blockDim.z;
+
+snippet iyz "Get current Y,Z index (2D)"
+	int ${2:y} = threadIdx.y + blockIdx.y * blockDim.y;
+	int ${3:z} = threadIdx.z + blockIdx.z * blockDim.z;
+
+snippet ixyz "Get current X,Y,Z index (3D)"
+	int ${1:x} = threadIdx.x + blockIdx.x * blockDim.x;
+	int ${2:y} = threadIdx.y + blockIdx.y * blockDim.y;
+	int ${3:z} = threadIdx.z + blockIdx.z * blockDim.z;
+
+snippet share "Shared memory declaration"
+	__shared__ ${1:int} ${2:memo}[${3:SIZE}];${0}

From d30f65105e1f73c63c92c22c4afbad51539f5744 Mon Sep 17 00:00:00 2001
From: David Briscoe <idbrii@gmail.com>
Date: Tue, 9 Mar 2021 08:07:11 -0800
Subject: [PATCH 1420/1587] lua: Add assert

Standard lua assert message.

msg is optional, so hide the ", " if it's omitted.
---
 UltiSnips/lua.snippets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/UltiSnips/lua.snippets b/UltiSnips/lua.snippets
index 0fd5eefc8..ac604a09a 100644
--- a/UltiSnips/lua.snippets
+++ b/UltiSnips/lua.snippets
@@ -8,6 +8,15 @@ snippet #! "#!/usr/bin/env lua" b
 $0
 endsnippet
 
+snippet assert "Assertion" b
+assert(${1:condition}`!p
+if t[2]:
+	snip.rv = ", "
+else:
+	snip.rv = ""
+`${2:msg})
+endsnippet
+
 snippet !fun(ction)?! "New function" br
 function ${1:new_function}(${2:args})
 	$0

From fba34b31a8fd83b8712d668fe89c4f42815a1cd7 Mon Sep 17 00:00:00 2001
From: Andrew Stewart <andrewianstewart@gmail.com>
Date: Thu, 11 Mar 2021 19:20:37 -0500
Subject: [PATCH 1421/1587] Update html snippet lang from es to en

Most of the other lang examples use en (english) but this one uses es (spanish). Probably a mistake?
---
 snippets/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 640a26fa5..bc4599e3b 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -449,7 +449,7 @@ snippet html5
 	</html>
 snippet html5l
 	<!DOCTYPE html>
-	<html lang="${1:es}">
+	<html lang="${1:en}">
 		<head>
 			<meta charset="utf-8">
 			<meta name="viewport" content="width=device-width">

From 722754cdcd62b3c392162ed6e6eb8c98089da586 Mon Sep 17 00:00:00 2001
From: Marco De Donno <mdedonno1337@gmail.com>
Date: Wed, 10 Mar 2021 15:44:40 +0100
Subject: [PATCH 1422/1587] Add the augroup with visual placeholder snippet

---
 snippets/vim.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index b37150368..21145af97 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -45,6 +45,11 @@ snippet au augroup ... autocmd block
 	augroup ${1:AU_NAME}
 		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${0}
 	augroup END
+snippet auv augroupvisual ... autocmd block with visual placeholder
+	augroup ${1:AU_NAME}
+		autocmd!
+		${0:${VISUAL}}
+	augroup END
 snippet bun Vundle.vim Plugin definition
 	Plugin '${0}'
 snippet plug vim-plug Plugin definition

From a8ac81b8922ac621e7043813d98e69ad0ac265a4 Mon Sep 17 00:00:00 2001
From: Marco De Donno <mdedonno1337@gmail.com>
Date: Wed, 10 Mar 2021 15:33:22 +0100
Subject: [PATCH 1423/1587] Add the 'autocmd!' command to clean the autocmd in
 the group

This will prevent to add the already loaded autocmd when reloading the
vim configuration. The 'autocmd!' command remove the content of the
augroup at load.
---
 snippets/vim.snippets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/snippets/vim.snippets b/snippets/vim.snippets
index 21145af97..85cf29221 100644
--- a/snippets/vim.snippets
+++ b/snippets/vim.snippets
@@ -43,6 +43,7 @@ snippet ife if ... else statement
 	endif
 snippet au augroup ... autocmd block
 	augroup ${1:AU_NAME}
+		autocmd!
 		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${0}
 	augroup END
 snippet auv augroupvisual ... autocmd block with visual placeholder

From 164bc3aa42feaa3c1deec84f7a10840418aec300 Mon Sep 17 00:00:00 2001
From: Peter Benjamin <petermbenjamin@gmail.com>
Date: Sun, 21 Mar 2021 23:28:04 -0700
Subject: [PATCH 1424/1587] feat(ultisnips): add conventional commit snippets

Following [conventional commits](https://www.conventionalcommits.org/en/v1.0.0-beta.2/) pattern,
this commit adds initial support for conventional commits snippets.
---
 UltiSnips/gitcommit.snippets | 51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 UltiSnips/gitcommit.snippets

diff --git a/UltiSnips/gitcommit.snippets b/UltiSnips/gitcommit.snippets
new file mode 100644
index 000000000..065562104
--- /dev/null
+++ b/UltiSnips/gitcommit.snippets
@@ -0,0 +1,51 @@
+# https://www.conventionalcommits.org/en/v1.0.0-beta.2/#specification
+
+snippet fix "fix conventional commit"
+fix(${1:scope}): ${2:title}
+
+${0:body}
+
+endsnippet
+
+snippet feat "feat conventional commit"
+feat(${1:scope}): ${2:title}
+
+${0:body}
+
+endsnippet
+
+snippet chore "chore conventional commit"
+chore(${1:scope}): ${2:title}
+
+${0:body}
+
+endsnippet
+
+snippet docs "docs conventional commit"
+docs(${1:scope}): ${2:title}
+
+${0:body}
+
+endsnippet
+
+snippet refactor "refactor conventional commit"
+refactor(${1:scope}): ${2:title}
+
+${0:body}
+
+endsnippet
+
+snippet test "test conventional commit"
+test(${1:scope}): ${2:title}
+
+${0:body}
+
+endsnippet
+
+snippet ci "ci conventional commit"
+ci(${1:scope}): ${2:title}
+
+${0:body}
+
+endsnippet
+

From 7139f123fd3958a006fb1156712f8c9924cae20d Mon Sep 17 00:00:00 2001
From: Fabian Untermoser <f.untermoser@gmx.at>
Date: Wed, 24 Mar 2021 17:40:52 +0100
Subject: [PATCH 1425/1587] refactor(gitcommits): remove default body value in
 conventional commits

---
 UltiSnips/gitcommit.snippets | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/UltiSnips/gitcommit.snippets b/UltiSnips/gitcommit.snippets
index 065562104..e0253afbd 100644
--- a/UltiSnips/gitcommit.snippets
+++ b/UltiSnips/gitcommit.snippets
@@ -3,49 +3,48 @@
 snippet fix "fix conventional commit"
 fix(${1:scope}): ${2:title}
 
-${0:body}
+${0:${VISUAL}}
 
 endsnippet
 
 snippet feat "feat conventional commit"
 feat(${1:scope}): ${2:title}
 
-${0:body}
+${0:${VISUAL}}
 
 endsnippet
 
 snippet chore "chore conventional commit"
 chore(${1:scope}): ${2:title}
 
-${0:body}
+${0:${VISUAL}}
 
 endsnippet
 
 snippet docs "docs conventional commit"
 docs(${1:scope}): ${2:title}
 
-${0:body}
+${0:${VISUAL}}
 
 endsnippet
 
 snippet refactor "refactor conventional commit"
 refactor(${1:scope}): ${2:title}
 
-${0:body}
+${0:${VISUAL}}
 
 endsnippet
 
 snippet test "test conventional commit"
 test(${1:scope}): ${2:title}
 
-${0:body}
+${0:${VISUAL}}
 
 endsnippet
 
 snippet ci "ci conventional commit"
 ci(${1:scope}): ${2:title}
 
-${0:body}
+${0:${VISUAL}}
 
 endsnippet
-

From 44b467fbeb24b71f9bbf7eeb2faf8df402745940 Mon Sep 17 00:00:00 2001
From: Fabian Untermoser <f.untermoser@gmx.at>
Date: Wed, 24 Mar 2021 19:13:53 +0100
Subject: [PATCH 1426/1587] refactor(gitcommits): remove whitespace

---
 UltiSnips/gitcommit.snippets | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/UltiSnips/gitcommit.snippets b/UltiSnips/gitcommit.snippets
index e0253afbd..be18a8ba4 100644
--- a/UltiSnips/gitcommit.snippets
+++ b/UltiSnips/gitcommit.snippets
@@ -4,47 +4,40 @@ snippet fix "fix conventional commit"
 fix(${1:scope}): ${2:title}
 
 ${0:${VISUAL}}
-
 endsnippet
 
 snippet feat "feat conventional commit"
 feat(${1:scope}): ${2:title}
 
 ${0:${VISUAL}}
-
 endsnippet
 
 snippet chore "chore conventional commit"
 chore(${1:scope}): ${2:title}
 
 ${0:${VISUAL}}
-
 endsnippet
 
 snippet docs "docs conventional commit"
 docs(${1:scope}): ${2:title}
 
 ${0:${VISUAL}}
-
 endsnippet
 
 snippet refactor "refactor conventional commit"
 refactor(${1:scope}): ${2:title}
 
 ${0:${VISUAL}}
-
 endsnippet
 
 snippet test "test conventional commit"
 test(${1:scope}): ${2:title}
 
 ${0:${VISUAL}}
-
 endsnippet
 
 snippet ci "ci conventional commit"
 ci(${1:scope}): ${2:title}
 
 ${0:${VISUAL}}
-
 endsnippet

From 67e506c5598c19de4fcdf8780377a92aaddfdbad Mon Sep 17 00:00:00 2001
From: Abdul Rahman Farzat <A.Farzat@protonmail.com>
Date: Thu, 25 Mar 2021 09:19:29 +0900
Subject: [PATCH 1427/1587] Fix useS snippet in UltiSnips/javascript_react

Previously, the .title() function was used to capitalize the first item.
However, this function doesn't maintain the capitalization of letters in
the middle. Therefore, a custom function was created to effectively
convert camelCase to PascalCase.
---
 UltiSnips/javascript_react.snippets | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/javascript_react.snippets b/UltiSnips/javascript_react.snippets
index 666c80e34..ee70ff0f7 100644
--- a/UltiSnips/javascript_react.snippets
+++ b/UltiSnips/javascript_react.snippets
@@ -1,3 +1,11 @@
+global !p
+# Capitalize the first letter without affecting the rest of the letters
+def capitalize_first(word):
+	if(word):
+		word = word[0].upper() + word[1:]
+	return word
+endglobal
+
 # Functional components
 snippet rfc "react functional component" b
 import React, {useState} from "react"
@@ -14,7 +22,7 @@ export default $4`!p snip.rv = snip.basename`
 endsnippet
 # React Hooks
 snippet useS "useState Hook" b
-const [${1}, set`!p snip.rv=t[1].title()`] = useState(${3:"${4}"})
+const [${1}, set`!p snip.rv=capitalize_first(t[1])`] = useState(${3:"${4}"})
 endsnippet
 snippet useE "useEffect Hook" b
 useEffect(() => {

From 20149cfa232c3bc5a6bdf16aaaf67347ba6ecadf Mon Sep 17 00:00:00 2001
From: Nathan Alderson <nathan@nathanalderson.com>
Date: Thu, 1 Apr 2021 18:19:44 -0500
Subject: [PATCH 1428/1587] Include arg type in google-style docstrings

---
 UltiSnips/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 6e7750413..4923af5cb 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -138,7 +138,7 @@ def format_arg(arg, style):
 	elif style == NORMAL:
 		return ":%s: TODO" % arg
 	elif style == GOOGLE:
-		return "%s (TODO): TODO" % arg
+		return "%s (%s): TODO" % (arg, arg.type or "TODO")
 	elif style == JEDI:
 		return ":type %s: TODO" % arg
 	elif style == NUMPY:

From 4600da87a064bf63b37c7135be154b34c40dec20 Mon Sep 17 00:00:00 2001
From: 0x6a62 <jeff@codesuji.com>
Date: Mon, 5 Apr 2021 22:13:57 -0400
Subject: [PATCH 1429/1587] Add F# snippets

---
 snippets/fsharp.snippets | 80 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 snippets/fsharp.snippets

diff --git a/snippets/fsharp.snippets b/snippets/fsharp.snippets
new file mode 100644
index 000000000..81587d65a
--- /dev/null
+++ b/snippets/fsharp.snippets
@@ -0,0 +1,80 @@
+snippet doc
+	/// ${0}
+snippet comment
+	// ${0}
+snippet let
+	let ${1} = ${0}
+snippet lit
+	[<Literal>]
+	let ${1} = ${0}
+snippet rec
+	type ${1} = { ${0} }
+snippet arec
+	{| ${0} |}
+snippet fn
+	let ${1} =
+		${0}
+snippet fnr
+	let rec ${1} =
+		${0}
+snippet lam
+	(fun ${1} -> ${0})
+snippet mod
+	module ${1} =
+		${0}
+snippet for
+	for ${1} in ${2} do
+		${0}
+snippet if
+	if ${1} then
+		${2}
+snippet ife
+	if ${1} then
+		${2}
+	else
+		${0}
+snippet ifee
+	if ${1} then
+		${2}
+	elif ${3} then
+		${4}
+	else
+		${0}
+snippet eif
+	elif ${1} then
+		${0}
+snippet el
+	else
+		${0}
+snippet try
+	try
+		${1}
+	with ${0}
+snippet match
+	match ${1} with
+	| ${2} -> ${0}
+snippet |
+	| ${1} -> ${0}
+snippet p
+	|> ${0}
+snippet pr
+	printfn "${1}" ${0}
+snippet pri
+	printfn \$"${0}"
+snippet amap
+	|> Array.map (fun ${1} -> ${0})
+snippet lmap
+	|> List.map (fun ${1} -> ${0})
+snippet smap
+	|> Seq.map (fun ${1} -> ${0})
+snippet atap
+	|> Array.map (fun x -> printfn "%A" x; x) // tap
+snippet ltap
+	|> List.map (fun x -> printfn "%A" x; x) // tap
+snippet stap
+	|> Seq.map (fun x -> printfn "%A" x; x) // tap
+snippet main
+	[<EntryPoint>]
+	let main argv =
+		${0}
+		0

From a35c801d62acecde3616947ad2b95c9b61424a0a Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Sat, 10 Apr 2021 11:56:09 +0100
Subject: [PATCH 1430/1587] feat(gitcommit): add improvement conventional
 commit

---
 UltiSnips/gitcommit.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/gitcommit.snippets b/UltiSnips/gitcommit.snippets
index be18a8ba4..388130e0a 100644
--- a/UltiSnips/gitcommit.snippets
+++ b/UltiSnips/gitcommit.snippets
@@ -24,6 +24,12 @@ docs(${1:scope}): ${2:title}
 ${0:${VISUAL}}
 endsnippet
 
+snippet improvement "improvement conventional commit"
+improvement(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
 snippet refactor "refactor conventional commit"
 refactor(${1:scope}): ${2:title}
 

From 2b36741d99322a7d07871cefd8cb06d1cd0f6fa8 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Sat, 10 Apr 2021 11:58:52 +0100
Subject: [PATCH 1431/1587] feat(gitcommit): add perf conventional commit

---
 UltiSnips/gitcommit.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/gitcommit.snippets b/UltiSnips/gitcommit.snippets
index 388130e0a..fa77855ee 100644
--- a/UltiSnips/gitcommit.snippets
+++ b/UltiSnips/gitcommit.snippets
@@ -30,6 +30,12 @@ improvement(${1:scope}): ${2:title}
 ${0:${VISUAL}}
 endsnippet
 
+snippet perf "perf conventional commit"
+perf(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
 snippet refactor "refactor conventional commit"
 refactor(${1:scope}): ${2:title}
 

From 03f7e3395b1d2a0eaf8fc8bdb83fc95368a8b467 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Sat, 10 Apr 2021 11:59:46 +0100
Subject: [PATCH 1432/1587] feat(gitcommit): add build conventional commit

---
 UltiSnips/gitcommit.snippets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/UltiSnips/gitcommit.snippets b/UltiSnips/gitcommit.snippets
index fa77855ee..938071c23 100644
--- a/UltiSnips/gitcommit.snippets
+++ b/UltiSnips/gitcommit.snippets
@@ -53,3 +53,9 @@ ci(${1:scope}): ${2:title}
 
 ${0:${VISUAL}}
 endsnippet
+
+snippet build "build conventional commit"
+build(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet

From 2a28fc35f6848ad38681d4b509ae3f5962276b5d Mon Sep 17 00:00:00 2001
From: Hachemi Harizi <hachemi@protonmail.com>
Date: Mon, 19 Apr 2021 05:23:20 +0200
Subject: [PATCH 1433/1587] Update Javascript "for" loops to ES6+ (let instead
 var)

---
 snippets/javascript/javascript.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index dcf37a4e8..9649bdce5 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -99,11 +99,11 @@ snippet terr
 snippet ret
 	return ${0:result};
 snippet for "for (...) {...}"
-	for (var ${1:i} = 0, ${2:len} = ${3:Things.length}; $1 < $2; $1++) {
+	for (let ${1:i} = 0, ${2:len} = ${3:Things.length}; $1 < $2; $1++) {
 		${0:${VISUAL}}
 	}
 snippet forr "reversed for (...) {...}"
-	for (var ${2:i} = ${1:Things.length} - 1; $2 >= 0; $2--) {
+	for (let ${2:i} = ${1:Things.length} - 1; $2 >= 0; $2--) {
 		${0:${VISUAL}}
 	}
 snippet wh "(condition) { ... }"
@@ -116,7 +116,7 @@ snippet do "do { ... } while (condition)"
 	} while (${1:/* condition */});
 # For in loop
 snippet fori
-	for (var ${1:prop} in ${2:object}) {
+	for (let ${1:prop} in ${2:object}) {
 		${0:$2[$1]}
 	}
 # Objects

From a4b28d4e5cdf461905aa3f8f30ec771b58cb8280 Mon Sep 17 00:00:00 2001
From: Bangcheng Yang <bangchengyang@hotmail.com>
Date: Fri, 11 Jun 2021 11:35:05 +0800
Subject: [PATCH 1434/1587] Fix: correct addnarg in snippets/python.snippets

---
 snippets/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index cd1224dfc..891f905f1 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -241,7 +241,7 @@ snippet addsp
 snippet addarg
 	parser.add_argument("${0:short_arg}", "${1:long_arg}", default=${2:None}, help="${3:Help text}")
 snippet addnarg
-	parser.add_argument("${0:arg}", nargs="${1:*}", default"${2:None}, help="${3:Help text}")
+	parser.add_argument("${0:arg}", nargs="${1:*}", default=${2:None}, help="${3:Help text}")
 snippet addaarg
 	parser.add_argument("${0:arg}", "${1:long_arg}", action="${2:store_true}", default=${3:False}, help="${4:Help text}")
 snippet pargs

From 3cee4da7ef73b1c22551d00ac1fdf7f61b71d7cc Mon Sep 17 00:00:00 2001
From: yama-dev <tatsuya.yamamoto69@gmail.com>
Date: Tue, 15 Jun 2021 19:47:40 +0900
Subject: [PATCH 1435/1587] Fix vue.snippets "vfor" snippets

---
 snippets/vue.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/vue.snippets b/snippets/vue.snippets
index 61c06af68..1385ecb7c 100644
--- a/snippets/vue.snippets
+++ b/snippets/vue.snippets
@@ -118,7 +118,7 @@ snippet vfilter
 snippet vfor
 	<div v-for="${1:item} in ${2:items}" :key="$1.id">
 		{{ $1 }}
-	</div
+	</div>
 
 snippet vgetters
 	getters: {

From 35ee2f422068a545f44af3d46f45013ae1144aea Mon Sep 17 00:00:00 2001
From: dindybutts <vermontscenario@gmail.com>
Date: Fri, 18 Jun 2021 06:09:41 +0100
Subject: [PATCH 1436/1587] Fixed spelling error

Signed-off-by: dindybutts <vermontscenario@gmail.com>
---
 snippets/rust.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 71fe5909b..5e9eb2b18 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -101,7 +101,7 @@ snippet crate "Define create meta attributes"
 	// Crate name
 	#![crate_name = "${1:crate_name}"]
 	// Additional metadata attributes
-	#![desc = "${2:Descrption.}"]
+	#![desc = "${2:Description.}"]
 	#![license = "${3:BSD}"]
 	#![comment = "${4:Comment.}"]
 	// Specify the output type

From 8cf32d45fc0f6d1037788b6c0e93399ce9509d27 Mon Sep 17 00:00:00 2001
From: Federico Simonetta <federicosimonetta@zoho.com>
Date: Sun, 20 Jun 2021 21:08:24 +0200
Subject: [PATCH 1437/1587] Added Debugger and Infiltrator breakpoints

---
 UltiSnips/julia.snippets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/UltiSnips/julia.snippets b/UltiSnips/julia.snippets
index 259c5f4cf..837b9e236 100644
--- a/UltiSnips/julia.snippets
+++ b/UltiSnips/julia.snippets
@@ -32,3 +32,12 @@ endsnippet
 snippet fld "type field documentation" b
 #' @field ${1:name}::${2:Type} ${0:Description}
 endsnippet
+
+# Debugging
+snippet deb "Debugger breakpoint" b
+Main.@bp
+endsnippet
+
+snippet inf "Infiltrator breakpoint" b
+Main.@infriltrate
+endsnippet

From 1f94158c8be14945c0c575288f88f55d0c1a6d1c Mon Sep 17 00:00:00 2001
From: Federico Simonetta <federicosimonetta@zoho.com>
Date: Sun, 20 Jun 2021 21:11:55 +0200
Subject: [PATCH 1438/1587] Update julia.snippets

---
 UltiSnips/julia.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/julia.snippets b/UltiSnips/julia.snippets
index 837b9e236..e0b4a9a83 100644
--- a/UltiSnips/julia.snippets
+++ b/UltiSnips/julia.snippets
@@ -39,5 +39,5 @@ Main.@bp
 endsnippet
 
 snippet inf "Infiltrator breakpoint" b
-Main.@infriltrate
+Main.@infiltrate
 endsnippet

From 7bb2385aca2288845999c05d9eca83e2e8eaed90 Mon Sep 17 00:00:00 2001
From: VladPetryshyn <kisonika228@gmail.com>
Date: Wed, 23 Jun 2021 20:45:46 +0300
Subject: [PATCH 1439/1587] typescript, javascript, react snippets update

---
 UltiSnips/javascript.snippets       |  3 +++
 UltiSnips/javascript_react.snippets |  6 ++++++
 UltiSnips/typescript.snippets       | 15 +++++++++++++++
 UltiSnips/typescript_react.snippets | 12 ++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 UltiSnips/typescript_react.snippets

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index bae39ae89..292a8ce90 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -154,4 +154,7 @@ snippet us
 'use strict'`!p snip.rv = semi(snip)`
 endsnippet
 
+snippet imp "import"
+import ${2} from ${1}
+endsnippet
 # vim:ft=snippets:
diff --git a/UltiSnips/javascript_react.snippets b/UltiSnips/javascript_react.snippets
index ee70ff0f7..fd4431569 100644
--- a/UltiSnips/javascript_react.snippets
+++ b/UltiSnips/javascript_react.snippets
@@ -48,3 +48,9 @@ endsnippet
 snippet useR "useRef(defaultValue)" b
 const ${1:ref} = useRef(${2:null})
 endsnippet
+snippet ir "import React"
+import React from "react"
+endsnippet
+snippet irc "import React and Component"
+import React, { Component } from "react"
+endsnippet
diff --git a/UltiSnips/typescript.snippets b/UltiSnips/typescript.snippets
index 11072ddd8..aa4efb628 100644
--- a/UltiSnips/typescript.snippets
+++ b/UltiSnips/typescript.snippets
@@ -1,3 +1,18 @@
 priority -50
 
 extends javascript
+
+snippet int "interface"
+interface ${1} {
+}
+endsnippet
+snippet nspc "namespace"
+namespace ${1} {
+}
+endsnippet
+priority -49
+snippet fun "function (named)" b
+function ${1:function_name} (${2:argument}: ${3:argument_type}) {
+	${VISUAL}$0
+}
+endsnippet
diff --git a/UltiSnips/typescript_react.snippets b/UltiSnips/typescript_react.snippets
new file mode 100644
index 000000000..566a20b06
--- /dev/null
+++ b/UltiSnips/typescript_react.snippets
@@ -0,0 +1,12 @@
+priority -50
+extends javascript_react
+extends typescript
+
+priority -49
+snippet rfc "react functional component"
+import React, { FC } from "react"
+
+interface ${1:function_name}Props {${4:props_types}}
+
+export const ${1:function_name}: FC<${1:function_name}Props> = (${2:props}) => ${3:function_body}
+endsnippet

From 749460bc5b05b1f4015a041508031d99b1b24982 Mon Sep 17 00:00:00 2001
From: Oliver Dvorski <oliver.dvorski@gmail.com>
Date: Mon, 28 Jun 2021 14:21:25 +0200
Subject: [PATCH 1440/1587] Escape $ in $this->

---
 snippets/php.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/php.snippets b/snippets/php.snippets
index 2828f2fbf..c769baabb 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -38,7 +38,7 @@ snippet i
 		${0:${VISUAL}}
 	}
 snippet t.
-	$this->
+	\$this->
 snippet f
 	function ${1}(${3})
 	{

From e77399e64d6f54a623c52797973a23ecfe28b813 Mon Sep 17 00:00:00 2001
From: nemo <iiey@users.noreply.github.com>
Date: Mon, 28 Jun 2021 22:00:00 +0200
Subject: [PATCH 1441/1587] sh: Add snippets for 'if' and 'func'

- add portable if test expr
- add snippets to create function
---
 UltiSnips/sh.snippets | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 37bf0c4f1..794f88e15 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -74,8 +74,14 @@ snippet here "here document (here)"
 ${1/['"`](.+)['"`]/$1/}
 endsnippet
 
+snippet /ift(est)?/ "if ... then (if)" rb
+if ${2:[ ${1:condition} ]}; then
+	${0:${VISUAL}}
+fi
+endsnippet
+
 snippet if "if ... then (if)" b
-if ${2:[[ ${1:condition} ]]}; then
+if [[ ${1:condition} ]]; then
 	${0:${VISUAL}}
 fi
 endsnippet
@@ -92,4 +98,10 @@ while ${2:[[ ${1:condition} ]]}; do
 done
 endsnippet
 
+snippet func "function() {...}" b
+${1:function} () {
+	${0:${VISUAL}}
+}
+endsnippet
+
 # vim:ft=snippets:

From f1b72d866d6564075a8b0da1f179c0b7de723131 Mon Sep 17 00:00:00 2001
From: sharils <3063067+sharils@users.noreply.github.com>
Date: Fri, 16 Jul 2021 20:46:52 +0800
Subject: [PATCH 1442/1587] Fix syntax error: unexpected end of file

By placing the closing TOKEN at the begin of line, this fixes `syntax error: unexpected end of file`.

`echo \\n` creates a mere newline without indentation of the current line unlike a new line in a snippet.

See https://github.com/koalaman/shellcheck/wiki/SC1039
---
 UltiSnips/sh.snippets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 794f88e15..dab8bd71c 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -70,8 +70,7 @@ endsnippet
 
 snippet here "here document (here)"
 <<-${2:'${1:TOKEN}'}
-	$0
-${1/['"`](.+)['"`]/$1/}
+	$0`echo \\n`${1/['"`](.+)['"`]/$1/}
 endsnippet
 
 snippet /ift(est)?/ "if ... then (if)" rb

From 95c6f94bd5849e533542c2e375e3347c7faa1c58 Mon Sep 17 00:00:00 2001
From: ygeyzel <ygeyzel@gmail.com>
Date: Tue, 3 Aug 2021 20:34:45 +0300
Subject: [PATCH 1443/1587] c: add assertions and dynamic allocation snippets

---
 snippets/c.snippets | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index e70d057c2..2af81e860 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -334,6 +334,33 @@ snippet getopt
 			${0}
 		}
 	}
+
+## Assertions
+snippet asr
+	assert(${1:condition});
+
+snippet anl
+	assert(${1:ptr} != NULL);
+
+## Dynamic Allocation
+snippet mlc
+	${1:ptr} = (${2:type}*) malloc(sizeof($2));
+
+snippet clc
+	${1:ptr} = (${2:type}*) calloc(${3:size}, sizeof($2));
+
+snippet rlc
+	${1:ptr} = realloc($1, ${2:size} * sizeof(${3:type}));
+
+snippet mlcd
+	${1:type} ${2:ptr} = ($1*) malloc(sizeof($1));
+
+snippet clcd
+	${1:type} ${2:ptr} = ($1*) calloc(${3:size}, sizeof($1));
+
+snippet fre
+	free(${1:ptr});
+
 ##
 # TODO section
 snippet todo

From 75309fc96c49725cf9bbd7bc881b7b342a60aa9a Mon Sep 17 00:00:00 2001
From: ujkuo <s9501667@gmail.com>
Date: Sun, 8 Aug 2021 01:56:11 +0800
Subject: [PATCH 1444/1587] Fix wrong snippet commands

I modify snippets for Integral and Partial derivative for some typo.
E.g., lack of \ and the argument number.
---
 snippets/tex.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index c1aca3413..ff94f187b 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -380,11 +380,11 @@ snippet lim limit
 
 # Partial derivative
 snippet pdv partial derivation
-	\\frac{\\partial {$1}}{\partial {$2}} {$0}
+	\\frac{\\partial {$1}}{\\partial {$2}} {$0}
 
 # Second order partial derivative
 snippet ppdv second partial derivation
-	\\frac{\partial^2 {$1}}{\partial {$2} \partial {$3}} {$0}
+	\\frac{\\partial^2 {$1}}{\\partial {$2} \\partial {$3}} {$0}
 
 # Ordinary derivative
 snippet dv derivative
@@ -416,7 +416,7 @@ snippet . dot product
 
 # Integral
 snippet int integral
-	\\int_{{$1}}^{{$2}} {$3} \: d{$4} {$5}
+	\\int_{{$1}}^{{$2}} {$3} \\: d{$4} {$0}
 
 # Right arrow
 snippet ra rightarrow

From 9e5219ae92f9b1b2ee23aff067618a6008a74fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Reegn?= <zoltan.reegn@gmail.com>
Date: Wed, 18 Aug 2021 22:27:34 +0200
Subject: [PATCH 1445/1587] Allow VISUAL selection in Code snippets

---
 UltiSnips/markdown.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/markdown.snippets b/UltiSnips/markdown.snippets
index 1017c8013..a97135a6f 100644
--- a/UltiSnips/markdown.snippets
+++ b/UltiSnips/markdown.snippets
@@ -112,12 +112,12 @@ snippet img "Image"
 endsnippet
 
 snippet ilc "Inline Code" i
-\`$1\`$0
+\`${1:${VISUAL}}\`$0
 endsnippet
 
 snippet cbl "Codeblock" b
-\`\`\`
-$1
+\`\`\`$1
+${2:${VISUAL}}
 \`\`\`
 $0
 endsnippet

From e081212205f767fc5b050977c0a2b0f1536a3bdf Mon Sep 17 00:00:00 2001
From: mirsella <mirsella@protonmail.com>
Date: Thu, 26 Aug 2021 19:36:24 +0200
Subject: [PATCH 1446/1587] modify re in javascript.node.snippets

I think when using the require snippets we practically never touch the const anyway, so I think the first placeholder should already be in the variable name instead of the const which we practically never modify
---
 snippets/javascript/javascript.node.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript/javascript.node.snippets b/snippets/javascript/javascript.node.snippets
index 489e0abba..52a2ba4ca 100644
--- a/snippets/javascript/javascript.node.snippets
+++ b/snippets/javascript/javascript.node.snippets
@@ -5,7 +5,7 @@ snippet ex
 	module.exports = ${1};
 # require
 snippet re
-	${1:const} ${2} = require('${3:module_name}');
+	const ${1} = require('${2:module_name}');
 # EventEmitter
 snippet on
 	on('${1:event_name}', function(${2:stream}) {

From ef4f418e5326b2069ab767e4139b7bd3dfa5e0f0 Mon Sep 17 00:00:00 2001
From: fwp <srnwml@gmail.com>
Date: Mon, 6 Sep 2021 01:13:45 +0800
Subject: [PATCH 1447/1587] [Python] Handle type hints having ","

Enhance argument parsing for type hints having ","
, such as "arg: Tuple[int, int]".
---
 UltiSnips/python.snippets | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index 4923af5cb..ce6d919f4 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -73,7 +73,23 @@ class Arg(object):
 
 
 def get_args(arglist):
-	args = [Arg(arg) for arg in arglist.split(',') if arg]
+	args = []
+	n = len(arglist)
+	i = 0
+	while i < n:
+		l_bracket = 0
+		start = i
+		while i < n and (l_bracket > 0 or arglist[i] != ','):
+			if arglist[i] == '[':
+				l_bracket += 1
+			elif arglist[i] == ']' and l_bracket > 0:
+				l_bracket -= 1
+			i += 1
+		arg = arglist[start:i]
+		if arg:
+			args.append(Arg(arg))
+		i += 1
+
 	args = [arg for arg in args if arg.name != 'self']
 
 	return args

From 89ff074400256ce7a58bb88ff0c5cc27e6fbe222 Mon Sep 17 00:00:00 2001
From: Sergey Berezhnoy <veged@yandex-team.ru>
Date: Sat, 11 Sep 2021 17:52:40 +0300
Subject: [PATCH 1448/1587] add debugging snippets in UltiSnips format

---
 UltiSnips/javascript.snippets | 65 +++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/UltiSnips/javascript.snippets b/UltiSnips/javascript.snippets
index 292a8ce90..0a956a6f1 100644
--- a/UltiSnips/javascript.snippets
+++ b/UltiSnips/javascript.snippets
@@ -157,4 +157,69 @@ endsnippet
 snippet imp "import"
 import ${2} from ${1}
 endsnippet
+
+# Debugging
+snippet de
+debugger`!p snip.rv = semi(snip)`
+endsnippet
+snippet cl "console.log"
+console.log(${0})`!p snip.rv = semi(snip)`
+endsnippet
+snippet cd "console.debug"
+console.debug(${0})`!p snip.rv = semi(snip)`
+endsnippet
+snippet ce "console.error"
+console.error(${0})`!p snip.rv = semi(snip)`
+endsnippet
+snippet cw "console.warn"
+console.warn(${0})`!p snip.rv = semi(snip)`
+endsnippet
+snippet ci "console.info"
+console.info(${0})`!p snip.rv = semi(snip)`
+endsnippet
+snippet ct "console.trace"
+console.trace(${0:label})`!p snip.rv = semi(snip)`
+endsnippet
+snippet ctime "console.time ... console.timeEnd"
+console.time("${1:label}")`!p snip.rv = semi(snip)`
+${0:${VISUAL}}
+console.timeEnd("$1")`!p snip.rv = semi(snip)`
+endsnippet
+snippet ctimestamp "console.timeStamp"
+console.timeStamp("${1:label}")`!p snip.rv = semi(snip)`
+endsnippet
+snippet ca "console.assert"
+console.assert(${1:expression}, ${0:obj})`!p snip.rv = semi(snip)`
+endsnippet
+snippet cclear "console.clear"
+console.clear()`!p snip.rv = semi(snip)`
+endsnippet
+snippet cdir "console.dir"
+console.dir(${0:obj})`!p snip.rv = semi(snip)`
+endsnippet
+snippet cdirx "console.dirxml"
+console.dirxml(${1:object})`!p snip.rv = semi(snip)`
+endsnippet
+snippet cgroup "console.group"
+console.group("${1:label}")`!p snip.rv = semi(snip)`
+${0:${VISUAL}}
+console.groupEnd()`!p snip.rv = semi(snip)`
+endsnippet
+snippet cgroupc "console.groupCollapsed"
+console.groupCollapsed("${1:label}")`!p snip.rv = semi(snip)`
+${0:${VISUAL}}
+console.groupEnd()`!p snip.rv = semi(snip)`
+endsnippet
+snippet cprof "console.profile"
+console.profile("${1:label}")`!p snip.rv = semi(snip)`
+${0:${VISUAL}}
+console.profileEnd()`!p snip.rv = semi(snip)`
+endsnippet
+snippet ctable "console.table"
+console.table(${1:"${2:value}"})`!p snip.rv = semi(snip)`
+endsnippet
+snippet clstr "console.log stringified"
+console.log(JSON.stringify(${0}, null, 2))`!p snip.rv = semi(snip)`
+endsnippet
+
 # vim:ft=snippets:

From 1648b3acf193682668f1ee8e566b03cfed2ac797 Mon Sep 17 00:00:00 2001
From: sedrubal <dev@sedrubal.de>
Date: Fri, 17 Sep 2021 11:48:29 +0200
Subject: [PATCH 1449/1587] Replace ancient form of python props

---
 snippets/python.snippets | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 891f905f1..179ce64f9 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -85,16 +85,15 @@ snippet adefm
 
 # New Property
 snippet property
-	def ${1:foo}():
-		doc = "${2:The $1 property.}"
-		def fget(self):
-			${3:return self._$1}
-		def fset(self, value):
-			${4:self._$1 = value}
-		def fdel(self):
-			${0:del self._$1}
-		return locals()
-	$1 = property(**$1())
+	@property
+	def ${1:foo}(self) -> ${2:type}:
+		"""${3:doc}"""
+		return self._${1:foo}
+
+	@${1:foo}.setter
+	def ${1:foo}(self, value: ${2:type}):
+		self._${1:foo} = value
+
 # Ifs
 snippet if
 	if ${1:condition}:

From a44ed4717a3fd8331c5b78b5cb1c4ca8026196d9 Mon Sep 17 00:00:00 2001
From: jetz <jet.zheung@gmail.com>
Date: Mon, 6 Sep 2021 14:40:57 +0800
Subject: [PATCH 1450/1587] Adjust: use python3 default, same as
 snippets/python.snippets

---
 UltiSnips/python.snippets | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index ce6d919f4..eb524f2a7 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -5,8 +5,19 @@ priority -50
 ###########################################################################
 
 #! header
-snippet #! "#!/usr/bin/env python" b
-#!/usr/bin/env python
+snippet #! "#!/usr/bin/env python3" b
+#!/usr/bin/env python3
+$0
+endsnippet
+
+snippet #!2 "#!/usr/bin/env python2" b
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+$0
+endsnippet
+
+snippet #!3 "#!/usr/bin/env python3" b
+#!/usr/bin/env python3
 $0
 endsnippet
 

From 0a2c7355e2986fb032aa84442f6fab45c70fc106 Mon Sep 17 00:00:00 2001
From: jetz <jet.zheung@gmail.com>
Date: Wed, 29 Sep 2021 09:09:37 +0800
Subject: [PATCH 1451/1587] Change <#!> for </usr/bin/env python> for python
 snippet

---
 UltiSnips/python.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index eb524f2a7..c4afcdc90 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -5,8 +5,8 @@ priority -50
 ###########################################################################
 
 #! header
-snippet #! "#!/usr/bin/env python3" b
-#!/usr/bin/env python3
+snippet #! "#!/usr/bin/env python" b
+#!/usr/bin/env python
 $0
 endsnippet
 

From be519f70ab806c290a7b3d2e38fc22da07834052 Mon Sep 17 00:00:00 2001
From: Banst <bastyen.a@gmail.com>
Date: Thu, 7 Oct 2021 22:32:54 +0200
Subject: [PATCH 1452/1587] feat(go): update error wrap snippet

---
 snippets/go.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 202b7e800..722e82fd4 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -274,7 +274,7 @@ snippet ja "Marshalable json alias"
 	}
 
 
-snippet errwr "Error handling with errors.Wrap"
+snippet errwr "Error handling with fmt.Errorf"
 	if ${1}err != nil {
-		return errors.Wrap(err, "${2}")
+		return fmt.Errorf("${2} %w", err)
 	}

From c28bef69fdb26825a93ac1e90ca6f5ba19116d88 Mon Sep 17 00:00:00 2001
From: Matteo Gaetzner <m.gaetzner@gmx.de>
Date: Wed, 13 Oct 2021 13:44:49 +0200
Subject: [PATCH 1453/1587] added a missing 'auto function' comment to the
 cpp.snippet file

---
 snippets/cpp.snippets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index f39d743e8..5d99f3d65 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -216,6 +216,7 @@ snippet try
 	}catch(${1}) {
 
 	}
+# auto function
 snippet af auto function
 	auto ${1:name}(${2}) -> ${3:void}
 	{

From ba1090d5495123905a322e6fbea84be90aa68a1c Mon Sep 17 00:00:00 2001
From: Johannes Raggam <thetetet@gmail.com>
Date: Sun, 24 Oct 2021 22:52:44 +0200
Subject: [PATCH 1454/1587] bugfix(html): Correct meta:refresh content for a
 seconds and url part.

---
 snippets/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index bc4599e3b..5787defdd 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -609,7 +609,7 @@ snippet meta:d
 snippet meta:compat
 	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}">
 snippet meta:refresh
-	<meta http-equiv="refresh" content="text/html;charset=UTF-8">
+	<meta http-equiv="refresh" content="3;url=${0}">
 snippet meta:utf
 	<meta http-equiv="content-type" content="text/html;charset=UTF-8">
 snippet meter

From 28d78705c1948503db65b89e614f1f06f8dd22e2 Mon Sep 17 00:00:00 2001
From: Johannes Raggam <thetetet@gmail.com>
Date: Sun, 24 Oct 2021 22:53:13 +0200
Subject: [PATCH 1455/1587] feat(html): Use modern html5 meta charset header in
 head snippet.

---
 snippets/html.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 5787defdd..24b1e4985 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -399,7 +399,7 @@ snippet h6#
 	<h6 id="${1}">${0}</h6>
 snippet head
 	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8">
+		<meta charset="utf-8">
 
 		<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
 		${0}

From 48863461962c731cc3f701abd558ccad73a30951 Mon Sep 17 00:00:00 2001
From: Johannes Raggam <thetetet@gmail.com>
Date: Sun, 24 Oct 2021 22:54:15 +0200
Subject: [PATCH 1456/1587] feat(html): Add meta:utf5 snippet for a html5 like
 meta charset definition.

---
 snippets/html.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/html.snippets b/snippets/html.snippets
index 24b1e4985..0ec6cd896 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -610,6 +610,8 @@ snippet meta:compat
 	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}">
 snippet meta:refresh
 	<meta http-equiv="refresh" content="3;url=${0}">
+snippet meta:utf5
+	<meta charset="utf-8">
 snippet meta:utf
 	<meta http-equiv="content-type" content="text/html;charset=UTF-8">
 snippet meter

From 7e9c19101367c67e9b71abf00a3c8f83f8eb1a2f Mon Sep 17 00:00:00 2001
From: dcampos <dcampos@users.noreply.github.com>
Date: Wed, 27 Oct 2021 10:16:08 -0300
Subject: [PATCH 1457/1587] Fix pi:st css snippet

Snippet had no body.
---
 snippets/css.snippets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/snippets/css.snippets b/snippets/css.snippets
index 879cb3c72..41765f293 100644
--- a/snippets/css.snippets
+++ b/snippets/css.snippets
@@ -974,6 +974,7 @@ snippet pi:e
 snippet pi:c
 	place-items: center;
 snippet pi:st
+        place-items: stretch;
 snippet pos
 	position: ${1};${0}
 snippet pos:a

From 09593dba7abfd01eabebad3a38d929961d425ff9 Mon Sep 17 00:00:00 2001
From: dcampos <dcampos@users.noreply.github.com>
Date: Wed, 27 Oct 2021 10:17:36 -0300
Subject: [PATCH 1458/1587] Fix indent

---
 snippets/css.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/css.snippets b/snippets/css.snippets
index 41765f293..8e728b31d 100644
--- a/snippets/css.snippets
+++ b/snippets/css.snippets
@@ -974,7 +974,7 @@ snippet pi:e
 snippet pi:c
 	place-items: center;
 snippet pi:st
-        place-items: stretch;
+	place-items: stretch;
 snippet pos
 	position: ${1};${0}
 snippet pos:a

From 43ed873ba09ac2d71992e773c68c75c6b85686c7 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Mon, 1 Nov 2021 07:57:50 +0000
Subject: [PATCH 1459/1587] CSS: reorder arguments to `text-shadow` and add
 `inset` argument to `box-shadow`

---
 UltiSnips/css.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/css.snippets b/UltiSnips/css.snippets
index f5ccd2ffa..316b06455 100644
--- a/UltiSnips/css.snippets
+++ b/UltiSnips/css.snippets
@@ -45,11 +45,11 @@ snippet ! "!important CSS (!)"
 endsnippet
 
 snippet tsh "text-shadow: color-hex x y blur (text)"
-text-shadow: ${1:${2:color} ${3:offset-x} ${4:offset-y} ${5:blur}};$0
+text-shadow: ${1:${2:offset-x} ${3:offset-y} ${4:blur} ${5:color}};$0
 endsnippet
 
 snippet bxsh "box-shadow: color-hex x y blur (text)"
-box-shadow: ${1:${2:offset-x} ${3:offset-y} ${4:blur} ${5:spread} ${6:color}};$0
+box-shadow: ${1:${2:offset-x} ${3:offset-y} ${4:blur} ${5:spread} ${6:color} ${7:inset}};$0
 endsnippet
 
 #

From cd6d5f975f729bff209140ea6e6961102e29b079 Mon Sep 17 00:00:00 2001
From: uga-rosa <uga6603@gmail.com>
Date: Fri, 17 Dec 2021 01:36:49 +0900
Subject: [PATCH 1460/1587] Fix: add escape for $

---
 snippets/javascript/javascript.snippets |  2 +-
 snippets/jsp.snippets                   | 12 ++++++------
 snippets/perl6.snippets                 |  2 +-
 snippets/sh.snippets                    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 9649bdce5..78c651ebd 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -352,7 +352,7 @@ snippet sym
 snippet ed
 	export default ${0}
 snippet ${
-	${${1}}${0}
+	\${${1}}${0}
 snippet as "async"
 	async ${0}
 snippet aw "await"
diff --git a/snippets/jsp.snippets b/snippets/jsp.snippets
index db185b2ad..a53c415b4 100644
--- a/snippets/jsp.snippets
+++ b/snippets/jsp.snippets
@@ -18,7 +18,7 @@ snippet cremove
 snippet ccatch
 	<c:catch var="${0}" />
 snippet cif
-	<c:if test="${${1}}">
+	<c:if test="\${${1}}">
 		${0}
 	</c:if>
 snippet cchoose
@@ -26,7 +26,7 @@ snippet cchoose
 		${0}
 	</c:choose>
 snippet cwhen
-	<c:when test="${${1}}">
+	<c:when test="\${${1}}">
 		${0}
 	</c:when>
 snippet cother
@@ -34,12 +34,12 @@ snippet cother
 		${0}
 	</c:otherwise>
 snippet cfore
-	<c:forEach items="${${1}}" var="${2}" varStatus="${3}">
+	<c:forEach items="\${${1}}" var="${2}" varStatus="${3}">
 		${0:<c:out value="$2" />}
 	</c:forEach>
 snippet cfort
 	<c:set var="${1}">${2:item1,item2,item3}</c:set>
-	<c:forTokens var="${3}" items="${$1}" delims="${4:,}">
+	<c:forTokens var="${3}" items="\${$1}" delims="${4:,}">
 		${0:<c:out value="$3" />}
 	</c:forTokens>
 snippet cparam
@@ -56,13 +56,13 @@ snippet cimport+
 	</c:import>
 snippet curl
 	<c:url value="${1}" var="${2}" />
-	<a href="${$2}">${0}</a>
+	<a href="\${$2}">${0}</a>
 snippet curl+
 	<c:url value="${1}" var="${2}">
 		<c:param name="${4}" value="${5}" />
 		cparam+${0}
 	</c:url>
-	<a href="${$2}">${3}</a>
+	<a href="\${$2}">${3}</a>
 snippet credirect
 	<c:redirect url="${0}" />
 snippet contains
diff --git a/snippets/perl6.snippets b/snippets/perl6.snippets
index 21ddf5bd0..aa7406059 100644
--- a/snippets/perl6.snippets
+++ b/snippets/perl6.snippets
@@ -28,7 +28,7 @@ snippet ife
 		${3}
 	}
 snippet eif
-	elsif ${1) {
+	elsif ${1} {
 		${2}
 	}
 # Conditional One-line
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 2ce67ec4f..4f08e8974 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -55,7 +55,7 @@ snippet go
 	done
 # Set SCRIPT_DIR variable to directory script is located.
 snippet sdir
-	SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+	SCRIPT_DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
 # getopt
 snippet getopt
 	__ScriptVersion="${1:version}"

From e2156cda628fe065be64e96347594c1d20812aea Mon Sep 17 00:00:00 2001
From: Rebecca Ysteboe <rysteboe@protonmail.com>
Date: Sat, 18 Dec 2021 18:16:45 +0000
Subject: [PATCH 1461/1587] Improve python property snippet

---
 snippets/python.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 179ce64f9..ebd437696 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -88,11 +88,11 @@ snippet property
 	@property
 	def ${1:foo}(self) -> ${2:type}:
 		"""${3:doc}"""
-		return self._${1:foo}
+		return self._$1
 
-	@${1:foo}.setter
-	def ${1:foo}(self, value: ${2:type}):
-		self._${1:foo} = value
+	@$1.setter
+	def $1(self, value: $2):
+		self._$1 = value
 
 # Ifs
 snippet if

From d253ed3b5d32ce00370ad2c0deffd6e8e482cf2d Mon Sep 17 00:00:00 2001
From: wanghuiyong <wanghuiyong@tuniu.com>
Date: Tue, 28 Dec 2021 14:10:12 +0800
Subject: [PATCH 1462/1587] add ruby3 debug snippet

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 3c9eec527..20c789b5b 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -598,6 +598,8 @@ snippet begin
 #debugging
 snippet debug
 	require 'byebug'; byebug
+snippet dbg
+	require 'debug'; debugger
 snippet debug19
 	require 'debugger'; debugger
 snippet debug18

From ddcda4f5ddbacf5f64637aeadf1b8ac1010ea6ba Mon Sep 17 00:00:00 2001
From: "Hashem A. Damrah" <57925294+SingularisArt@users.noreply.github.com>
Date: Mon, 10 Jan 2022 22:53:08 -0800
Subject: [PATCH 1463/1587] Update tex.snippets

---
 UltiSnips/tex.snippets | 887 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 750 insertions(+), 137 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 5c5721f30..098048974 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -1,73 +1,217 @@
-priority -50
-
-extends texmath
+##########
+# GLOBAL #
+##########
 
 global !p
 
 def create_table(snip):
 	rows = snip.buffer[snip.line].split('x')[0]
 	cols = snip.buffer[snip.line].split('x')[1]
-
 	int_val = lambda string: int(''.join(s for s in string if s.isdigit()))
-
 	rows = int_val(rows)
 	cols = int_val(cols)
-
 	offset = cols + 1
 	old_spacing = snip.buffer[snip.line][:snip.buffer[snip.line].rfind('\t') + 1]
-
 	snip.buffer[snip.line] = ''
-
 	final_str = old_spacing + "\\begin{tabular}{|" + "|".join(['$' + str(i + 1) for i in range(cols)]) + "|}\n"
-
 	for i in range(rows):
 		final_str += old_spacing + '\t'
 		final_str += " & ".join(['$' + str(i * cols + j + offset) for j in range(cols)])
-
 		final_str += " \\\\\\\n"
-
 	final_str += old_spacing + "\\end{tabular}\n$0"
-
 	snip.expand_anon(final_str)
 
 def add_row(snip):
 	row_len = int(''.join(s for s in snip.buffer[snip.line] if s.isdigit()))
 	old_spacing = snip.buffer[snip.line][:snip.buffer[snip.line].rfind('\t') + 1]
-
 	snip.buffer[snip.line] = ''
-
 	final_str = old_spacing
 	final_str += " & ".join(['$' + str(j + 1) for j in range(row_len)])
 	final_str += " \\\\\\"
-
 	snip.expand_anon(final_str)
-
 endglobal
 
-snippet "\\?b(egin)?" "begin{} / end{}" br
-\begin{${1:something}}
-	${0:${VISUAL}}
+
+###############
+# ENVIRONMENT #
+###############
+
+snippet beg "begin{} / end{}" bAi
+\begin{$1}
+	$0${VISUAL}
 \end{$1}
 endsnippet
 
-snippet abs "abstract environment" b
-\begin{abstract}
-	$0
-\end{abstract}
+snippet doc "Document" bAi
+\begin{document}
+	$0${VISUAL}
+\end{document}
 endsnippet
 
-snippet tab "tabular / array environment" b
-\begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
-$0${2/(?<=.)(c|l|r)|./(?1: & )/g}
-\end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
+snippet cnt "Center" bAi
+\begin{center}
+	$0${VISUAL}
+\end{center}
 endsnippet
 
-pre_expand "create_table(snip)"
-snippet "gentbl(\d+)x(\d+)" "Generate table of *width* by *height*" r
+snippet desc "Description" bAi
+\begin{description}
+	$0${VISUAL}
+\end{description}
 endsnippet
 
-pre_expand "add_row(snip)"
-snippet "tr(\d+)" "Add table row of dimension ..." r
+snippet lemma "Lemma" bAi
+\begin{lemma}
+	$0${VISUAL}
+\end{lemma}
+endsnippet
+
+snippet prop "Proposition" bAi
+\begin{prop}[$1]
+	$0${VISUAL}
+\end{prop}
+endsnippet
+
+snippet thrm "Theorem" bAi
+\begin{theorem}[$1]
+	$0${VISUAL}
+\end{theorem}
+endsnippet
+
+snippet post "postulate" bAi
+\begin{postulate}[$1]
+	$0${VISUAL}
+\end{postulate}
+endsnippet
+
+snippet prf "Proof" bAi
+\begin{myproof}[$1]
+	$0${VISUAL}
+\end{myproof}
+endsnippet
+
+snippet def "Definition" bAi
+\begin{definition}[$1]
+	$0${VISUAL}
+\end{definition}
+endsnippet
+
+snippet nte "Note" bAi
+\begin{note}[$1]
+	$0${VISUAL}
+\end{note}
+endsnippet
+
+snippet prob "Problem" bAi
+\begin{problem}[$1]
+	$0${VISUAL}
+\end{problem}
+endsnippet
+
+snippet corl "Corollary" bAi
+\begin{corollary}[$1]
+	$0${VISUAL}
+\end{corollary}
+endsnippet
+
+snippet example "Example" bAi
+\begin{example}[$1]
+	$0${VISUAL}
+\end{example}
+endsnippet
+
+snippet notion "Notation" bAi
+\begin{notation}[$1]
+	$0${VISUAL}
+\end{notation}
+endsnippet
+
+snippet rep "Repetition" bAi
+\begin{repetition}[$1]
+	$0${VISUAL}
+\end{repetition}
+endsnippet
+
+snippet prop "Property" bAi
+\begin{property}[$1]
+	$0${VISUAL}
+\end{property}
+endsnippet
+
+snippet int "Intuition" bAi
+\begin{intuition}[$1]
+	$0${VISUAL}
+\end{intuition}
+endsnippet
+
+snippet obs "Observation" bAi
+\begin{observation}[$1]
+	$0${VISUAL}
+\end{observation}
+endsnippet
+
+snippet conc "Conclusion" bAi
+\begin{conclusion}[$1]
+	$0${VISUAL}
+\end{conclusion}
+endsnippet
+
+snippet fig "Figure environment" bAi
+\begin{figure}[${1:htpb}]
+	\centering:${VISUAL}
+	${2:\includegraphics[width=0.8\textwidth]{$3}}
+	\caption{${4:$3}}
+	\label{fig:${5:${3/\W+/-/g}}}
+\end{figure}
+endsnippet
+
+snippet enum "Enumerate" bAi
+\begin{enumerate}
+	\item $0${VISUAL}
+\end{enumerate}
+endsnippet
+
+snippet item "Itemize" bAi
+\begin{itemize}
+	\item $0${VISUAL}
+\end{itemize}
+endsnippet
+
+snippet case "cases" bAi
+\begin{cases}
+	$0${VISUAL}
+\end{cases}
+endsnippet
+
+snippet ali "Align" bAi
+\begin{align}
+	${1:${VISUAL}}
+.\end{align}
+endsnippet
+
+snippet ali "Align*" bAi
+\begin{align*}
+	${1:${VISUAL}}
+.\end{align*}
+endsnippet
+
+snippet abs "abstract environment" b
+\begin{abstract}
+	$0${VISUAL}
+.\end{abstract}
+endsnippet
+
+snippet box "Box"
+`!p snip.rv = '┌' + '─' * (len(t[1]) + 2) + '┐'`
+│ $1 │
+`!p snip.rv = '└' + '─' * (len(t[1]) + 2) + '┘'`
+$0
+endsnippet
+
+snippet tab "tabular / array environment" b
+	\begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
+	$0${2/(?<=.)(c|l|r)|./(?1: & )/g}
+	\end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 endsnippet
 
 snippet table "Table environment" b
@@ -75,184 +219,653 @@ snippet table "Table environment" b
 	\centering
 	\caption{${2:caption}}
 	\label{tab:${3:label}}
+
 	\begin{${4:t}${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${5:c}}
-	$0${5/(?<=.)(c|l|r)|./(?1: & )/g}
+		$0${5/(?<=.)(c|l|r)|./(?1: & )/g}
 	\end{$4${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 \end{table}
 endsnippet
 
-snippet fig "Figure environment" b
-\begin{figure}[${2:htpb}]
+########
+# MATH #
+########
+
+snippet "([a-zA-Z])MM"  "^m" wr
+`!p snip.rv = match.group(1)`^{m}
+endsnippet
+
+snippet "([a-zA-Z])NN"  "^n" wr
+`!p snip.rv = match.group(1)`^{n}
+endsnippet
+
+snippet "([a-zA-Z])II"  "^i" wr
+`!p snip.rv = match.group(1)`^{i}
+endsnippet
+
+snippet "([a-zA-Z])KK"  "^k" wr
+`!p snip.rv = match.group(1)`^{k}
+endsnippet
+
+snippet "([a-zA-Z])JJ"  "^j" wr
+`!p snip.rv = match.group(1)`^{j}
+endsnippet
+
+snippet "([a-zA-Z])mm"  "_m" wr
+`!p snip.rv = match.group(1)`_{m}
+endsnippet
+
+snippet "([a-zA-Z])nn"  "_n" wr
+`!p snip.rv = match.group(1)`_{n}
+endsnippet
+
+snippet "([a-zA-Z])ii"  "_i" wr
+`!p snip.rv = match.group(1)`_{i}
+endsnippet
+
+snippet "([a-zA-Z])kk"  "_k" wr
+`!p snip.rv = match.group(1)`_{k}
+endsnippet
+
+snippet "([a-zA-Z])jj"  "_j" wr
+`!p snip.rv = match.group(1)`_{j}
+endsnippet
+
+snippet cc "subset" w
+\subset 
+endsnippet
+
+snippet inn "in " w
+\in 
+endsnippet
+
+snippet NN "n" w
+\N
+endsnippet
+
+snippet Nn "cap" w
+\cap 
+endsnippet
+
+snippet UU "cup" w
+\cup 
+endsnippet
+
+snippet uuu "bigcup" w
+\bigcup_{${1:i \in ${2: I}}} $0
+endsnippet
+
+snippet nnn "bigcap" w
+\bigcap_{${1:i \in ${2: I}}} $0
+endsnippet
+
+snippet OO "emptyset" w
+\O
+endsnippet
+
+snippet RR "real" w
+\R
+endsnippet
+
+snippet QQ "Q" w
+\Q
+endsnippet
+
+snippet ZZ "Z" w
+\Z
+endsnippet
+
+snippet HH "H" w
+\mathbb{H}
+endsnippet
+
+snippet DD "D" w
+\mathbb{D}
+endsnippet
+
+snippet im "Inline Math" Aw
+$${1}$`!p
+if t[2] and t[2][0] not in [',', '.', '?', '-', ' ']:
+	snip.rv = ' '
+else:
+	snip.rv = ''
+`$0
+endsnippet
+
+snippet dm "Display Math" Aw
+\[
+	${1:${VISUAL}}
+.\]$0
+endsnippet
+
+snippet ... "ldots" Aw
+\ldots
+endsnippet
+
+snippet * "times" wi
+\times $0
+endsnippet
+
+snippet // "Fraction" Aw
+\frac{$1}{$2}$0
+endsnippet
+
+snippet / "Fraction" i
+\\frac{${VISUAL}}{$1}$0
+endsnippet
+
+snippet '((\d+)|(\d*)(\\)?([A-Za-z]+)((\^|_)(\{\d+\}|\d))*)/' "Fraction" wrA
+\\frac{`!p snip.rv = match.group(1)`}{$1}$0
+endsnippet
+
+snippet '^.*\)/' "() Fraction" wrA
+`!p
+stripped = match.string[:-1]
+depth = 0
+i = len(stripped) - 1
+while True:
+	if stripped[i] == ')': depth += 1
+	if stripped[i] == '(': depth -= 1
+	if depth == 0: break;
+	i -= 1
+snip.rv = stripped[0:i] + "\\frac{" + stripped[i+1:-1] + "}"
+`{$1}$0
+endsnippet
+
+snippet '([A-Za-z])(\d)' "Auto subscript" wrA
+`!p snip.rv = match.group(1)`_`!p snip.rv = match.group(2)`
+endsnippet
+
+snippet '([A-Za-z])_(\d\d)' "Auto subscript 2" wrA
+`!p snip.rv = match.group(1)`_{`!p snip.rv = match.group(2)`}
+endsnippet
+
+snippet '([A-Za-z])_\{(\d+)\}(\d)' "Auto subscript 3+" wrA
+`!p snip.rv = match.group(1)`_{`!p snip.rv = match.group(2) + match.group(3)`}
+endsnippet
+
+snippet '([A-Za-z])\^(\d)' "Auto superscript" wrA
+`!p snip.rv = match.group(1)`^`!p snip.rv = match.group(2)`
+endsnippet
+
+snippet '([A-Za-z])\^(\d\d)' "Auto superscript 2" wrA
+`!p snip.rv = match.group(1)`^{`!p snip.rv = match.group(2)`}
+endsnippet
+
+snippet '([A-Za-z])\^\{(\d+)\}(\d)' "Auto superscript 3+" wrA
+`!p snip.rv = match.group(1)`^{`!p snip.rv = match.group(2) + match.group(3)`}
+endsnippet
+
+snippet sq "Square" i
+^2
+endsnippet
+
+snippet cb "Square" i
+^3
+endsnippet
+
+snippet compl "Complement" i
+^{c}
+endsnippet
+
+snippet ss "Super Script" i
+^{$1}$0
+endsnippet
+
+snippet rd "to the ... power" Aw
+^{($1)}$0
+endsnippet
+
+snippet __ "subscript" Aw
+_{$1}$0
+endsnippet
+
+snippet srt "Square Root" wi
+\sqrt{${1:${VISUAL}}}$0
+endsnippet
+
+snippet srto "... Root" wi
+\sqrt[$1]{${2:${VISUAL}}}$0
+endsnippet
+
+snippet bf "Bold" wi
+\bf{${1:${VISUAL}}}$0
+endsnippet
+
+snippet it "Italic" wi
+\it{${1:${VISUAL}}}$0
+endsnippet
+
+snippet un "Underline" wi
+\un{${1:${VISUAL}}}$0
+endsnippet
+
+snippet rm "Text" wi
+\rm{${1:${VISUAL}}}$0
+endsnippet
+
+snippet itm "Item" wi
+\item ${0:${VISUAL}}
+endsnippet
+
+snippet ceil "Ceil" w
+\left\lceil $1 \right\rceil $0
+endsnippet
+
+snippet floor "Floor" w
+\left\lfloor $1 \right\rfloor$0
+endsnippet
+
+snippet pmat "Pmat" w
+\begin{pmatrix} $1 \end{pmatrix} $0
+endsnippet
+
+snippet bmat "Bmat" w
+\begin{bmatrix} $1 \end{bmatrix} $0
+endsnippet
+
+snippet () "Left( right)" w
+\left( ${1:${VISUAL}} \right) $0
+endsnippet
+
+snippet lr "left( right)" i
+\left( ${1:${VISUAL}} \right) $0
+endsnippet
+
+snippet lr( "left( right)" i
+\left( ${1:${VISUAL}} \right) $0
+endsnippet
+
+snippet lr| "left| right|" i
+\left| ${1:${VISUAL}} \right| $0
+endsnippet
+
+snippet lr{ "left\{ right\}" i
+\left\\{ ${1:${VISUAL}} \right\\} $0
+endsnippet
+
+snippet lrb "left\{ right\}" i
+\left\\{ ${1:${VISUAL}} \right\\} $0
+endsnippet
+
+snippet lr[ "left[ right]" i
+\left[ ${1:${VISUAL}} \right] $0
+endsnippet
+
+snippet lra "leftangle rightangle" wi
+\left<${1:${VISUAL}} \right>$0
+endsnippet
+
+snippet conj "conjugate" w
+\overline{$1}$0
+endsnippet
+
+snippet sum "sum" w
+\sum_{n=${1:1}}^{${2:\infty}} ${3:a_n z^n}
+endsnippet
+
+snippet taylor "taylor" w
+\sum_{${1:k}=${2:0}}^{${3:\infty}} ${4:c_$1} (x-a)^$1 $0
+endsnippet
+
+snippet lim "limit" w
+\lim_{${1:n} \to ${2:\infty}} 
+endsnippet
+
+snippet limsup "limsup" w
+\limsup_{${1:n} \to ${2:\infty}} 
+endsnippet
+
+snippet prod "product" w
+\prod_{${1:n=${2:1}}}^{${3:\infty}} ${4:${VISUAL}} $0
+endsnippet
+
+snippet part "d/dx" w
+\frac{\partial ${1:V}}{\partial ${2:x}} $0
+endsnippet
+
+snippet ooo "\infty" w
+\infty
+endsnippet
+
+snippet rij "mrij" i
+(${1:x}_${2:n})_{${3:$2}\\in${4:\\N}}$0
+endsnippet
+
+snippet => "Implies" w
+\implies
+endsnippet
+
+snippet =< "Implied by" w
+\impliedby
+endsnippet
+
+snippet iff "iff" w
+\iff
+endsnippet
+
+snippet == "Equals" w
+&= $1 \\\\
+endsnippet
+
+snippet != "Equals" w
+\neq 
+endsnippet
+
+snippet <= "leq" Aw
+\le 
+endsnippet
+
+snippet >= "geq" Aw
+\ge 
+endsnippet
+
+snippet EE "geq" Aw
+\exists 
+endsnippet
+
+snippet -> "to" Aw
+\to 
+endsnippet
+
+snippet AA "forall" Aw
+\forall 
+endsnippet
+
+snippet xp1 "x" Aw
+x_{n+1}
+endsnippet
+
+snippet R0+ "R0+" Aw
+\\R_0^+
+endsnippet
+
+snippet plot "Plot" w
+\begin{figure}[$1]
 	\centering
-	\includegraphics[width=${3:0.8}\linewidth]{${4:name.ext}}
-	\caption{${4/(\w+)\.\w+/\u$1/}$0}%
-	\label{fig:${4/(\w+)\.\w+/$1/}}
+	\begin{tikzpicture}
+		\begin{axis}[
+			xmin= ${2:-10}, xmax= ${3:10},
+			ymin= ${4:-10}, ymax = ${5:10},
+			axis lines = middle,
+		]
+			\addplot[domain=$2:$3, samples=${6:100}]{$7};
+		\end{axis}
+	\end{tikzpicture}
+	\caption{$8}
+	\label{${9:$8}}
 \end{figure}
 endsnippet
 
-snippet enum "Enumerate" b
-\begin{enumerate}
-	\item $0
-\end{enumerate}
+snippet nn "Tikz node" w
+\node[$5] (${1/[^0-9a-zA-Z]//g}${2}) ${3:at (${4:0,0}) }{$${1}$};
+$0
 endsnippet
 
-snippet item "Itemize" b
-\begin{itemize}
-	\item $0
-\end{itemize}
+snippet lll "l" Aw
+\ell
 endsnippet
 
-snippet desc "Description" b
-\begin{description}
-	\item[$1] $0
-\end{description}
+snippet nabl "nabla" Aw
+\nabla 
+endsnippet
+
+snippet xx "cross" Aw
+\times 
 endsnippet
 
-snippet it "Individual item" b
-\item $0
+snippet ** "cdot" Aw
+\cdot 
 endsnippet
 
-snippet part "Part" b
-\part{${1:part name}}%
-\label{prt:${2:${1/(\w+)|\W+/(?1:\L$0\E:_)/ga}}}
+snippet norm "norm" Aw
+\|$1\|$0
+endsnippet
 
-$0
+snippet '(?<!\\)(sin|cos|arccot|cot|csc|ln|log|exp|star|perp)' "ln" rw
+\\`!p snip.rv = match.group(1)`
 endsnippet
 
-snippet cha "Chapter" b
-\chapter{${1:chapter name}}%
-\label{cha:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+snippet notin "not in " Aw
+\not\in 
+endsnippet
 
-$0
+snippet <! "normal" Aw
+\triangleleft 
 endsnippet
 
-snippet sec "Section"
-\section{${1:${VISUAL:section name}}}%
-\label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+snippet <> "hokje" Aw
+\diamond 
+endsnippet
 
-$0
+snippet '(?<!i)sts' "text subscript" irA
+_\text{$1} $0
 endsnippet
 
-snippet sec* "Section"
-\section*{${1:${VISUAL:section name}}}%
-\label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+snippet SI "SI" Aw
+\SI{$1}{$2}
+endsnippet
 
-${0}
+snippet set "set" wA
+\\{$1\\} $0
 endsnippet
 
+snippet ~~ "~" Aw
+\sim 
+endsnippet
 
-snippet sub "Subsection"
-\subsection{${1:${VISUAL:subsection name}}}%
-\label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+snippet \\\ "setminus" Aw
+\setminus
+endsnippet
 
-$0
+snippet >> ">>" Aw
+\gg
 endsnippet
 
-snippet sub* "Subsection"
-\subsection*{${1:${VISUAL:subsection name}}}%
-\label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+snippet << "<<" Aw
+\ll
+endsnippet
 
-${0}
+snippet "(\d|\w)+invs" "inverse" Awr
+`!p snip.rv = match.group(1)`^{-1}
 endsnippet
 
-snippet ssub "Subsubsection"
-\subsubsection{${1:${VISUAL:subsubsection name}}}%
-\label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+snippet <-> "leftrightarrow" Aw
+\leftrightarrow
+endsnippet
 
-$0
+snippet !> "mapsto" Aw
+\mapsto 
 endsnippet
 
-snippet ssub* "Subsubsection"
-\subsubsection*{${1:${VISUAL:subsubsection name}}}%
-\label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+snippet || "mid" Aw
+\mid 
+endsnippet
 
-${0}
+snippet dint "integral" wA
+\int_{${1:-\infty}}^{${2:\infty}} ${3:${VISUAL}} $0
 endsnippet
 
-snippet par "Paragraph"
-\paragraph{${1:${VISUAL:paragraph name}}}%
-\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+snippet '(?<!\\)(arcsin|arccos|arctan|arccot|arccsc|arcsec|pi|zeta|int)' "ln" Awrb
+\\`!p snip.rv = match.group(1)`
+endsnippet
 
-$0
+
+##########
+# TABLES #
+#########
+
+pre_expand "create_table(snip)"
+snippet "gentbl(\d+)x(\d+)" "Generate table of *width* by *height*" r
+endsnippet
+
+pre_expand "add_row(snip)"
+snippet "tr(\d+)" "Add table row of dimension ..." r
+endsnippet
+
+
+###########
+# POSTFIX #
+###########
+
+snippet pac "Package" b
+\usepackage`!p snip.rv='[' if t[1] else ""`${1:options}`!p snip.rv = ']' if t[1] else ""`{${2:package}}$0
+endsnippet
+
+snippet bar "bar" wi
+\bar{${1:${VISUAL}}}$0
+endsnippet
+
+priority 100
+snippet "([a-zA-Z])bar" "bar" Awri
+\overline{`!p snip.rv=match.group(1)`}
+endsnippet
+
+snippet "\{([a-zA-Z]+)\}bar" "bar" Awr
+\overline{`!p snip.rv = match.group(1)`}$0
+endsnippet
+
+snippet "(\\?\w+)(,\.|\.,)" "Vector postfix" Awri
+\vec{`!p snip.rv=match.group(1)`}
+endsnippet 
+
+snippet "\<(.*?)\|" "bra" Awri
+\bra{`!p snip.rv = match.group(1).replace('q', f'\psi').replace('f', f'\phi')`}
+endsnippet
+
+snippet "\|(.*?)\>" "ket" Awri
+\ket{`!p snip.rv = match.group(1).replace('q', f'\psi').replace('f', f'\phi')`}
+endsnippet
+
+snippet "(.*)\\bra{(.*?)}([^\|]*?)\>" "braket" Awri
+`!p snip.rv = match.group(1)`\braket{`!p snip.rv = match.group(2)`}{`!p snip.rv = match.group(3).replace('q', f'\psi').replace('f', f'\phi')`}
+endsnippet
+
+
+#############
+# PRE-AMBLE #
+#############
+
+snippet pac "Package" b
+\usepackage[${1:options}]{${2:package}}$0
+endsnippet
+
+snippet docls "Document Class" bA
+\documentclass{$1}$0
+endsnippet
+
+snippet tmplt "Template"
+\documentclass{article}
+
+\usepackage{import}
+\usepackage{pdfpages}
+\usepackage{transparent}
+\usepackage{xcolor}
+$1
+
+\newcommand{\incfig}[2][1]{%
+		\def\svgwidth{#1\columnwidth}
+		\import{./figures/}{#2.pdf_tex}
+}
+$2
+\pdfsuppresswarningpagegroup=1
+
+\begin{document}
+		$0
+\end{document}
+endsnippet
+	
+
+#########
+# OTHER #
+#########
+
+snippet date-time "Today's date and Current Time"
+`date "+%b %d %Y %a (%H:%M:%S)"`
 endsnippet
 
-snippet subp "Subparagraph"
-\subparagraph{${1:${VISUAL:subparagraph name}}}%
-\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+snippet sign "Signature"
+Yours sincerely,
 
+Hashem A. Damrah
+endsnippet
+
+snippet ref "Reference" wi
+Figure~\ref{${1:Fig}:$2:${VISUAL}}$0
+endsnippet
+
+snippet les "Lesson"
+\lesson{${1:LESSON NUMBER}}{`date "+%b %d %Y %a (%H:%M:%S)"`}{${3:LESSON NAME}}{${4:UNIT NUMBER}}
 $0
 endsnippet
 
-snippet ac "Acroynm normal" b
-\ac{${1:acronym}}
+snippet lec "Lecture"
+\lecture{${1:LECTURE NUMBER}}{`date "+%b %d %Y %a (%H:%M:%S)"`}{${3:LECTURE NAME}}{${4:UNIT NUMBER}}
 $0
 endsnippet
 
-snippet acl "Acroynm expanded" b
+snippet newp "New Page" bAi
+\newpage
+endsnippet
+
+snippet acl "Acroynm expanded" bi
 \acl{${1:acronym}}
-$0
 endsnippet
 
-snippet ni "Non-indented paragraph" b
+snippet ac "Acroynm normal" bi
+\ac{${1:acronym}}
+endsnippet
+
+snippet ni "Non-indented paragraph" bi
 \noindent
-$0
 endsnippet
 
-snippet pac "Package" b
-\usepackage`!p snip.rv='[' if t[1] else ""`${1:options}`!p snip.rv = ']' if t[1] else ""`{${2:package}}$0
+
+############
+# SECTIONS #
+############
+
+snippet chap "Chapter" wi
+\chapter{$1${VISUAL}}
 endsnippet
 
-snippet lp "Long parenthesis"
-\left(${1:${VISUAL:contents}}\right)$0
+snippet sec "Section" wi
+\section{$1${VISUAL}}
 endsnippet
 
-snippet "mint(ed)?( (\S+))?" "Minted code typeset" br
-\begin{listing}
-\begin{minted}[linenos,numbersep=5pt,frame=lines,framesep=2mm]{${1:`!p
-snip.rv = match.group(3) if match.group(2) is not None else "language"`}}
-${2:${VISUAL:code}}
-\end{minted}
-\caption{${3:caption name}}
-\label{lst:${4:${3/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
-\end{listing}
+snippet sec* "Section*" wi
+\section*{$1${VISUAL}}
+endsnippet
 
-$0
+snippet sub "Subsection" wi
+\subsection{$1${VISUAL}}
 endsnippet
 
-snippet gln "New glossary item" b
-\newglossaryentry{${1:identifier}}
-{
-  name={${2:name}},
-  first={${3:first occurrence}},
-  sort={${4:sort value}},
-  description={${0:description}},
-}
+snippet sub* "Subsection*" wi
+\subsection*{$1${VISUAL}}
 endsnippet
-snippet glnl "New long glossary item" b
-\longnewglossaryentry{${1:identifier}}
-{
-  name={${2:name}},
-  first={${3:first occurrence}},
-  sort={${4:sort value}},
-}
-{
-  ${0:description}
-}
+
+snippet subsub "Subsection" wi
+\subsubsection{$1${VISUAL}}
+endsnippet
+
+snippet subsub* "Subsubsection" wi
+\subsubsection*{$1${VISUAL}}
+endsnippet
+
+snippet par "Paragraph" wi
+\paragraph{$1${VISUAL}}
 endsnippet
 
-# Bold text
-snippet bf "Bold"
-\textbf{$1} $0
+snippet par* "Paragraph*" wi
+\paragraph*{$1${VISUAL}}
 endsnippet
 
-# Italic text
-snippet ita "Italics"
-\textit{$1} $0
+snippet subpar "Sub Paragraph" wi
+\subparagraph{$1${VISUAL}}
 endsnippet
 
-# Underlined text
-snippet und "Underline"
-\underline{$1} $0
+snippet subpar* "Sub Paragraph*" wi
+\subparagraph*{$1${VISUAL}}
 endsnippet
 
 # vim:ft=snippets:

From f32527a8d0fa41ef7673a667c25d4a8c36dc2965 Mon Sep 17 00:00:00 2001
From: "Hashem A. Damrah" <57925294+SingularisArt@users.noreply.github.com>
Date: Mon, 10 Jan 2022 22:55:35 -0800
Subject: [PATCH 1464/1587] Update gitcommit.snippets

---
 UltiSnips/gitcommit.snippets | 93 ++++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 41 deletions(-)

diff --git a/UltiSnips/gitcommit.snippets b/UltiSnips/gitcommit.snippets
index 938071c23..040f33c5b 100644
--- a/UltiSnips/gitcommit.snippets
+++ b/UltiSnips/gitcommit.snippets
@@ -1,61 +1,72 @@
-# https://www.conventionalcommits.org/en/v1.0.0-beta.2/#specification
-
-snippet fix "fix conventional commit"
-fix(${1:scope}): ${2:title}
-
-${0:${VISUAL}}
+global !p
+def complete(t, opts):
+	if t:
+		opts = [ m[len(t):] for m in opts if m.startswith(t) ]
+	if len(opts) == 1:
+		return opts[0]
+	return '(' + '|'.join(opts) + ')'
+endglobal
+
+snippet status "Status" bA
+status $1`!p snip.rv = complete(t[1], ['build', 'ci', 'test', 'refactor',
+																			 'perf', 'improvement', 'docs', 'chore',
+																			 'feat', 'fix'])`
 endsnippet
 
-snippet feat "feat conventional commit"
-feat(${1:scope}): ${2:title}
+snippet sign "Signature"
+-------------------------------------------------------------------------------
+${1:Company Name}
 
-${0:${VISUAL}}
-endsnippet
+${2:Author Name}
 
-snippet chore "chore conventional commit"
-chore(${1:scope}): ${2:title}
+${3:Streetname 21}
+${4:City and Area}
 
-${0:${VISUAL}}
+${5:Tel: 						+44 (0)987 / 888 8888}
+${6:Fax: 						+44 (0)987 / 888 8882}
+${7:Mail: 					Email}
+${8:Web: 						https://}
+-------------------------------------------------------------------------------
+$0
 endsnippet
 
-snippet docs "docs conventional commit"
-docs(${1:scope}): ${2:title}
-
-${0:${VISUAL}}
+snippet t "Todo"
+TODO: ${1:What is it} (`date "+%b %d %Y %a (%H:%M:%S)"`, `echo $USER`)
+$0
 endsnippet
 
-snippet improvement "improvement conventional commit"
-improvement(${1:scope}): ${2:title}
-
-${0:${VISUAL}}
-endsnippet
+snippet cmt "Commit Structure" bA
+${1:Summarize changes in around 50 characters or less}
 
-snippet perf "perf conventional commit"
-perf(${1:scope}): ${2:title}
+${2:More detailed explanatory text, if necessary. Wrap it to about 72
+characters or so. In some contexts, the first line is treated as the
+subject of the commit and the rest of the text as the body. The
+blank line separating the summary from the body is critical (unless
+you omit the body entirely); various tools like `log`, `shortlog`
+and `rebase` can get confused if you run the two together.}
 
-${0:${VISUAL}}
-endsnippet
+${3:Explain the problem that this commit is solving. Focus on why you
+are making this change as opposed to how (the code explains that).
+Are there side effects or other unintuitive consequences of this
+change? Here's the place to explain them.}
 
-snippet refactor "refactor conventional commit"
-refactor(${1:scope}): ${2:title}
+${4:Further paragraphs come after blank lines.
 
-${0:${VISUAL}}
-endsnippet
+ - Bullet points are okay, too
 
-snippet test "test conventional commit"
-test(${1:scope}): ${2:title}
+ - Typically a hyphen or asterisk is used for the bullet, preceded
+   by a single space, with blank lines in between, but conventions
+   vary here}
 
-${0:${VISUAL}}
-endsnippet
+${5:Status}
 
-snippet ci "ci conventional commit"
-ci(${1:scope}): ${2:title}
+${6:If you use an issue tracker, put references to them at the bottom,
+like this.}
 
-${0:${VISUAL}}
-endsnippet
+${7:Any todos}
 
-snippet build "build conventional commit"
-build(${1:scope}): ${2:title}
+${8:Resolves: #123
+See also: #456, #789}
 
-${0:${VISUAL}}
+${9:Signature}
 endsnippet

From 3d10a2535b86b76b6050d83a3405626b5f0cbf5c Mon Sep 17 00:00:00 2001
From: "Hashem A. Damrah" <57925294+SingularisArt@users.noreply.github.com>
Date: Mon, 10 Jan 2022 22:56:06 -0800
Subject: [PATCH 1465/1587] Update lua.snippets

---
 UltiSnips/lua.snippets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/UltiSnips/lua.snippets b/UltiSnips/lua.snippets
index ac604a09a..51d8d58d7 100644
--- a/UltiSnips/lua.snippets
+++ b/UltiSnips/lua.snippets
@@ -104,4 +104,13 @@ snippet local "local x = 1"
 local ${1:x} = ${0:1}
 endsnippet
 
+snippet use "Use" Ab
+use { '$1' }
+endsnippet
+
+snippet req "Require"
+require('$1')
+endsnippet
+
+
 # vim:ft=snippets:

From 3007286c01db9ba439c295017d2e0c81d4993950 Mon Sep 17 00:00:00 2001
From: "Hashem A. Damrah" <57925294+SingularisArt@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:44:55 -0800
Subject: [PATCH 1466/1587] Update gitcommit.snippets

---
 UltiSnips/gitcommit.snippets | 64 ++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/gitcommit.snippets b/UltiSnips/gitcommit.snippets
index 040f33c5b..e2f1ba5d0 100644
--- a/UltiSnips/gitcommit.snippets
+++ b/UltiSnips/gitcommit.snippets
@@ -8,9 +8,67 @@ def complete(t, opts):
 endglobal
 
 snippet status "Status" bA
-status $1`!p snip.rv = complete(t[1], ['build', 'ci', 'test', 'refactor',
-																			 'perf', 'improvement', 'docs', 'chore',
-																			 'feat', 'fix'])`
+status $1`!p snip.rv = complete(t[1], ['build', 'ci', 'test', 'refactor', 'perf', 'improvement', 'docs', 'chore', 'feat', 'fix'])`
+endsnippet
+
+snippet fix "fix conventional commit"
+fix(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet feat "feat conventional commit"
+feat(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet chore "chore conventional commit"
+chore(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet docs "docs conventional commit"
+docs(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet improvement "improvement conventional commit"
+improvement(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet perf "perf conventional commit"
+perf(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet refactor "refactor conventional commit"
+refactor(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet test "test conventional commit"
+test(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet ci "ci conventional commit"
+ci(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
+endsnippet
+
+snippet build "build conventional commit"
+build(${1:scope}): ${2:title}
+
+${0:${VISUAL}}
 endsnippet
 
 snippet sign "Signature"

From 526744459f9f8ac56b34a640688fc0ff3062f7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matteo=20G=C3=A4tzner?= <m.gaetzner@gmx.de>
Date: Fri, 14 Jan 2022 20:41:49 +0100
Subject: [PATCH 1467/1587] Inline Math and Display Math Ultisnippet fixed

---
 UltiSnips/tex.snippets | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 098048974..71947f987 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -322,16 +322,11 @@ snippet DD "D" w
 \mathbb{D}
 endsnippet
 
-snippet im "Inline Math" Aw
-$${1}$`!p
-if t[2] and t[2][0] not in [',', '.', '?', '-', ' ']:
-	snip.rv = ' '
-else:
-	snip.rv = ''
-`$0
+snippet im "Inline Math" w
+$${1}$
 endsnippet
 
-snippet dm "Display Math" Aw
+snippet dm "Display Math" w
 \[
 	${1:${VISUAL}}
 .\]$0

From 9f9d36d6317b76eede521777162365b1aec3d31b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Fri, 14 Jan 2022 19:55:24 +0100
Subject: [PATCH 1468/1587] fix: remove snippet that autotriggers \frac with /

This snippet was removed since it autotriggers regardless of whether the
cursor is in a math environment or not.
---
 UltiSnips/tex.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 71947f987..03add2454 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -344,10 +344,6 @@ snippet // "Fraction" Aw
 \frac{$1}{$2}$0
 endsnippet
 
-snippet / "Fraction" i
-\\frac{${VISUAL}}{$1}$0
-endsnippet
-
 snippet '((\d+)|(\d*)(\\)?([A-Za-z]+)((\^|_)(\{\d+\}|\d))*)/' "Fraction" wrA
 \\frac{`!p snip.rv = match.group(1)`}{$1}$0
 endsnippet

From 2a27d8497c68c294a8a3b2312f387b014df86a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Fri, 14 Jan 2022 22:41:43 +0100
Subject: [PATCH 1469/1587] fix(tex): remove problematic snippets added
 recently

General comment:

There are too many snippets that are too specific. I don't think that they should all be here. That is what personal repos are for. Also, too many autotriggers, specially for math operations withouth checking that we are in a math environment.

I would propose to remove the following snippets:

Remove:
- \frac snippet (autotrigger)
- \times with * (we need this for multiplications e.g. in tikz)
- \ldots autotrigger with "..." (this also is to intrussive as is needed in tikz)
- Autosubscripts (It should be possible to write T9 withouth getting a subscript. All this snippets are way too specific for one person's use)
- Superscript (redundant snippets. One suffices as includes all the others... and that also does not convince me, but we can leave it.)
- "to the power" (rd) (another autotrigger that is annoying. In German you write approx. as "rd.")
- Subscript is sensible
- "->" (if this should be mapped to something, then to an arrow. But I would preffer to leave it out.)
- EE ... again an autotrigger we should not have
- AA ... another autotrigger that will annoy people at some point
- xp1 (super specific)
- R0+ (too specific)
- nabla (should not autotrigger)
- norm (another autotrigger that annoys)
- notin (so we can write 'noting' again)
- <> (we don't need a snippet for \diamond)
- text subscript trigger by '(?<!i)sts' (still triggers with 'toasts')
- set (also not a nice autotrigger to have)
- \\\ (don't mess with my escape sequences)
- >> and << might conflict with tikz'a arrows
- <-> also is a problem with tikz
- dint (also an autotrigger that bothers me)
- arcsin|arccos|arctan|arccot|arccsc|arcsec|pi|zeta|int (also not)
- The 'bar' snippets (another autotrigger)
- 'doc' (common, you cannot make this autotrigger... how many times do you even use this?)
- beg should not autotrigger (we can leave it though)
- cnt also should not autotrigger
- desc should not autotrigger
- lemma should not autotrigger
- prop should not autotrigger
- thrm should not autotrigger
- post should not autotrigger
- prf should not autotrigger
- def should not autotrigger (ever!)
- nte should not autotrigger
- prob should not autotrigger
- corl should not autotrigger
- notion should not autotrigger
- rep should not autotrigger
- prop (again!) should not autotrigger
- int should not autotriggero
- obs should not autotrigger
- conc should not autotrigger
- fig should not autotrigger (!!!!!)
- enum should not autotrigger
- item should not autotrigger
- case should not autotrigger
- ali should not autotrigger
- ali* should not autotrigger
- box (why do we need this for a latex document? This should go to general snippets)
- vector postfix is too specific and autotriggers
- date snippet is also a general snippet (and already exists)
- signature (we are not you)
- ref should not be linked to referencing figures as it is used to reference all kinds of things.
- lesson (too specific)
- lecture (too specific)
- newpage (autotrigger that is not really needed)

There are certainly other snippets that I would delete, but this are the
ones that I consider most problematic.
---
 UltiSnips/tex.snippets | 213 ++++++-----------------------------------
 1 file changed, 27 insertions(+), 186 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 03add2454..9e97728b5 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -36,79 +36,73 @@ endglobal
 # ENVIRONMENT #
 ###############
 
-snippet beg "begin{} / end{}" bAi
+snippet beg "begin{} / end{}" bi
 \begin{$1}
 	$0${VISUAL}
 \end{$1}
 endsnippet
 
-snippet doc "Document" bAi
-\begin{document}
-	$0${VISUAL}
-\end{document}
-endsnippet
-
-snippet cnt "Center" bAi
+snippet cnt "Center" bi
 \begin{center}
 	$0${VISUAL}
 \end{center}
 endsnippet
 
-snippet desc "Description" bAi
+snippet desc "Description" bi
 \begin{description}
 	$0${VISUAL}
 \end{description}
 endsnippet
 
-snippet lemma "Lemma" bAi
+snippet lemma "Lemma" bi
 \begin{lemma}
 	$0${VISUAL}
 \end{lemma}
 endsnippet
 
-snippet prop "Proposition" bAi
+snippet prop "Proposition" bi
 \begin{prop}[$1]
 	$0${VISUAL}
 \end{prop}
 endsnippet
 
-snippet thrm "Theorem" bAi
+snippet thrm "Theorem" bi
 \begin{theorem}[$1]
 	$0${VISUAL}
 \end{theorem}
 endsnippet
 
-snippet post "postulate" bAi
+snippet post "postulate" bi
 \begin{postulate}[$1]
 	$0${VISUAL}
 \end{postulate}
 endsnippet
 
-snippet prf "Proof" bAi
+snippet prf "Proof" bi
 \begin{myproof}[$1]
 	$0${VISUAL}
 \end{myproof}
 endsnippet
 
-snippet def "Definition" bAi
+snippet def "Definition" bi
 \begin{definition}[$1]
 	$0${VISUAL}
 \end{definition}
 endsnippet
 
-snippet nte "Note" bAi
+snippet nte "Note" bi
 \begin{note}[$1]
 	$0${VISUAL}
 \end{note}
 endsnippet
 
-snippet prob "Problem" bAi
+snippet prob "Problem" bi
 \begin{problem}[$1]
 	$0${VISUAL}
 \end{problem}
 endsnippet
 
-snippet corl "Corollary" bAi
+snippet corl "Corollary" bi
 \begin{corollary}[$1]
 	$0${VISUAL}
 \end{corollary}
@@ -120,43 +114,43 @@ snippet example "Example" bAi
 \end{example}
 endsnippet
 
-snippet notion "Notation" bAi
+snippet notion "Notation" bi
 \begin{notation}[$1]
 	$0${VISUAL}
 \end{notation}
 endsnippet
 
-snippet rep "Repetition" bAi
+snippet rep "Repetition" bi
 \begin{repetition}[$1]
 	$0${VISUAL}
 \end{repetition}
 endsnippet
 
-snippet prop "Property" bAi
+snippet prop "Property" bi
 \begin{property}[$1]
 	$0${VISUAL}
 \end{property}
 endsnippet
 
-snippet int "Intuition" bAi
+snippet int "Intuition" bi
 \begin{intuition}[$1]
 	$0${VISUAL}
 \end{intuition}
 endsnippet
 
-snippet obs "Observation" bAi
+snippet obs "Observation" bi
 \begin{observation}[$1]
 	$0${VISUAL}
 \end{observation}
 endsnippet
 
-snippet conc "Conclusion" bAi
+snippet conc "Conclusion" bi
 \begin{conclusion}[$1]
 	$0${VISUAL}
 \end{conclusion}
 endsnippet
 
-snippet fig "Figure environment" bAi
+snippet fig "Figure environment" bi
 \begin{figure}[${1:htpb}]
 	\centering:${VISUAL}
 	${2:\includegraphics[width=0.8\textwidth]{$3}}
@@ -165,31 +159,31 @@ snippet fig "Figure environment" bAi
 \end{figure}
 endsnippet
 
-snippet enum "Enumerate" bAi
+snippet enum "Enumerate" bi
 \begin{enumerate}
 	\item $0${VISUAL}
 \end{enumerate}
 endsnippet
 
-snippet item "Itemize" bAi
+snippet item "Itemize" bi
 \begin{itemize}
 	\item $0${VISUAL}
 \end{itemize}
 endsnippet
 
-snippet case "cases" bAi
+snippet case "cases" bi
 \begin{cases}
 	$0${VISUAL}
 \end{cases}
 endsnippet
 
-snippet ali "Align" bAi
+snippet ali "Align" bi
 \begin{align}
 	${1:${VISUAL}}
 .\end{align}
 endsnippet
 
-snippet ali "Align*" bAi
+snippet ali* "Align*" bi
 \begin{align*}
 	${1:${VISUAL}}
 .\end{align*}
@@ -201,13 +195,6 @@ snippet abs "abstract environment" b
 .\end{abstract}
 endsnippet
 
-snippet box "Box"
-`!p snip.rv = '┌' + '─' * (len(t[1]) + 2) + '┐'`
-│ $1 │
-`!p snip.rv = '└' + '─' * (len(t[1]) + 2) + '┘'`
-$0
-endsnippet
-
 snippet tab "tabular / array environment" b
 	\begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
 	$0${2/(?<=.)(c|l|r)|./(?1: & )/g}
@@ -332,14 +319,6 @@ snippet dm "Display Math" w
 .\]$0
 endsnippet
 
-snippet ... "ldots" Aw
-\ldots
-endsnippet
-
-snippet * "times" wi
-\times $0
-endsnippet
-
 snippet // "Fraction" Aw
 \frac{$1}{$2}$0
 endsnippet
@@ -362,38 +341,14 @@ snip.rv = stripped[0:i] + "\\frac{" + stripped[i+1:-1] + "}"
 `{$1}$0
 endsnippet
 
-snippet '([A-Za-z])(\d)' "Auto subscript" wrA
-`!p snip.rv = match.group(1)`_`!p snip.rv = match.group(2)`
-endsnippet
-
-snippet '([A-Za-z])_(\d\d)' "Auto subscript 2" wrA
-`!p snip.rv = match.group(1)`_{`!p snip.rv = match.group(2)`}
-endsnippet
-
 snippet '([A-Za-z])_\{(\d+)\}(\d)' "Auto subscript 3+" wrA
 `!p snip.rv = match.group(1)`_{`!p snip.rv = match.group(2) + match.group(3)`}
 endsnippet
 
-snippet '([A-Za-z])\^(\d)' "Auto superscript" wrA
-`!p snip.rv = match.group(1)`^`!p snip.rv = match.group(2)`
-endsnippet
-
-snippet '([A-Za-z])\^(\d\d)' "Auto superscript 2" wrA
-`!p snip.rv = match.group(1)`^{`!p snip.rv = match.group(2)`}
-endsnippet
-
-snippet '([A-Za-z])\^\{(\d+)\}(\d)' "Auto superscript 3+" wrA
+snippet '([A-Za-z])\^\{(\d+)\}(\d)' "Auto superscript" wrA
 `!p snip.rv = match.group(1)`^{`!p snip.rv = match.group(2) + match.group(3)`}
 endsnippet
 
-snippet sq "Square" i
-^2
-endsnippet
-
-snippet cb "Square" i
-^3
-endsnippet
-
 snippet compl "Complement" i
 ^{c}
 endsnippet
@@ -402,10 +357,6 @@ snippet ss "Super Script" i
 ^{$1}$0
 endsnippet
 
-snippet rd "to the ... power" Aw
-^{($1)}$0
-endsnippet
-
 snippet __ "subscript" Aw
 _{$1}$0
 endsnippet
@@ -538,7 +489,7 @@ snippet == "Equals" w
 &= $1 \\\\
 endsnippet
 
-snippet != "Equals" w
+snippet != "Not Equal" w
 \neq 
 endsnippet
 
@@ -550,26 +501,6 @@ snippet >= "geq" Aw
 \ge 
 endsnippet
 
-snippet EE "geq" Aw
-\exists 
-endsnippet
-
-snippet -> "to" Aw
-\to 
-endsnippet
-
-snippet AA "forall" Aw
-\forall 
-endsnippet
-
-snippet xp1 "x" Aw
-x_{n+1}
-endsnippet
-
-snippet R0+ "R0+" Aw
-\\R_0^+
-endsnippet
-
 snippet plot "Plot" w
 \begin{figure}[$1]
 	\centering
@@ -596,10 +527,6 @@ snippet lll "l" Aw
 \ell
 endsnippet
 
-snippet nabl "nabla" Aw
-\nabla 
-endsnippet
-
 snippet xx "cross" Aw
 \times 
 endsnippet
@@ -608,62 +535,26 @@ snippet ** "cdot" Aw
 \cdot 
 endsnippet
 
-snippet norm "norm" Aw
-\|$1\|$0
-endsnippet
-
 snippet '(?<!\\)(sin|cos|arccot|cot|csc|ln|log|exp|star|perp)' "ln" rw
 \\`!p snip.rv = match.group(1)`
 endsnippet
 
-snippet notin "not in " Aw
-\not\in 
-endsnippet
-
 snippet <! "normal" Aw
 \triangleleft 
 endsnippet
 
-snippet <> "hokje" Aw
-\diamond 
-endsnippet
-
-snippet '(?<!i)sts' "text subscript" irA
-_\text{$1} $0
-endsnippet
-
 snippet SI "SI" Aw
 \SI{$1}{$2}
 endsnippet
 
-snippet set "set" wA
-\\{$1\\} $0
-endsnippet
-
 snippet ~~ "~" Aw
 \sim 
 endsnippet
 
-snippet \\\ "setminus" Aw
-\setminus
-endsnippet
-
-snippet >> ">>" Aw
-\gg
-endsnippet
-
-snippet << "<<" Aw
-\ll
-endsnippet
-
 snippet "(\d|\w)+invs" "inverse" Awr
 `!p snip.rv = match.group(1)`^{-1}
 endsnippet
 
-snippet <-> "leftrightarrow" Aw
-\leftrightarrow
-endsnippet
-
 snippet !> "mapsto" Aw
 \mapsto 
 endsnippet
@@ -672,15 +563,6 @@ snippet || "mid" Aw
 \mid 
 endsnippet
 
-snippet dint "integral" wA
-\int_{${1:-\infty}}^{${2:\infty}} ${3:${VISUAL}} $0
-endsnippet
-
-snippet '(?<!\\)(arcsin|arccos|arctan|arccot|arccsc|arcsec|pi|zeta|int)' "ln" Awrb
-\\`!p snip.rv = match.group(1)`
-endsnippet
-
-
 ##########
 # TABLES #
 #########
@@ -706,19 +588,6 @@ snippet bar "bar" wi
 \bar{${1:${VISUAL}}}$0
 endsnippet
 
-priority 100
-snippet "([a-zA-Z])bar" "bar" Awri
-\overline{`!p snip.rv=match.group(1)`}
-endsnippet
-
-snippet "\{([a-zA-Z]+)\}bar" "bar" Awr
-\overline{`!p snip.rv = match.group(1)`}$0
-endsnippet
-
-snippet "(\\?\w+)(,\.|\.,)" "Vector postfix" Awri
-\vec{`!p snip.rv=match.group(1)`}
-endsnippet 
-
 snippet "\<(.*?)\|" "bra" Awri
 \bra{`!p snip.rv = match.group(1).replace('q', f'\psi').replace('f', f'\phi')`}
 endsnippet
@@ -764,40 +633,12 @@ $2
 		$0
 \end{document}
 endsnippet
-	
+
 
 #########
 # OTHER #
 #########
 
-snippet date-time "Today's date and Current Time"
-`date "+%b %d %Y %a (%H:%M:%S)"`
-endsnippet
-
-snippet sign "Signature"
-Yours sincerely,
-
-Hashem A. Damrah
-endsnippet
-
-snippet ref "Reference" wi
-Figure~\ref{${1:Fig}:$2:${VISUAL}}$0
-endsnippet
-
-snippet les "Lesson"
-\lesson{${1:LESSON NUMBER}}{`date "+%b %d %Y %a (%H:%M:%S)"`}{${3:LESSON NAME}}{${4:UNIT NUMBER}}
-$0
-endsnippet
-
-snippet lec "Lecture"
-\lecture{${1:LECTURE NUMBER}}{`date "+%b %d %Y %a (%H:%M:%S)"`}{${3:LECTURE NAME}}{${4:UNIT NUMBER}}
-$0
-endsnippet
-
-snippet newp "New Page" bAi
-\newpage
-endsnippet
-
 snippet acl "Acroynm expanded" bi
 \acl{${1:acronym}}
 endsnippet

From 0a25b2cd53699fe87ba23882d9532406d75f1b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:21:49 +0100
Subject: [PATCH 1470/1587] fix(tex): SI snippet is already in texmath

---
 UltiSnips/tex.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 9e97728b5..8667231ea 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -543,10 +543,6 @@ snippet <! "normal" Aw
 \triangleleft 
 endsnippet
 
-snippet SI "SI" Aw
-\SI{$1}{$2}
-endsnippet
-
 snippet ~~ "~" Aw
 \sim 
 endsnippet

From 9504f21760e3644ca2a5ad4dfa8f145016255b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:22:45 +0100
Subject: [PATCH 1471/1587] cleanup(tex): plot snippet is too specific.

Maybe other people would prefer other use for that word
---
 UltiSnips/tex.snippets | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 8667231ea..577eb5ba6 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -501,23 +501,6 @@ snippet >= "geq" Aw
 \ge 
 endsnippet
 
-snippet plot "Plot" w
-\begin{figure}[$1]
-	\centering
-	\begin{tikzpicture}
-		\begin{axis}[
-			xmin= ${2:-10}, xmax= ${3:10},
-			ymin= ${4:-10}, ymax = ${5:10},
-			axis lines = middle,
-		]
-			\addplot[domain=$2:$3, samples=${6:100}]{$7};
-		\end{axis}
-	\end{tikzpicture}
-	\caption{$8}
-	\label{${9:$8}}
-\end{figure}
-endsnippet
-
 snippet nn "Tikz node" w
 \node[$5] (${1/[^0-9a-zA-Z]//g}${2}) ${3:at (${4:0,0}) }{$${1}$};
 $0

From 8e187e5cbe3f37754ab39d976f2402759a9f1d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:24:39 +0100
Subject: [PATCH 1472/1587] cleanup(tex): subscript and superscript would
 trigger outside math

These snippets would expand anywhere, not only in math mode
---
 UltiSnips/tex.snippets | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 577eb5ba6..f10dfa4ee 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -341,14 +341,6 @@ snip.rv = stripped[0:i] + "\\frac{" + stripped[i+1:-1] + "}"
 `{$1}$0
 endsnippet
 
-snippet '([A-Za-z])_\{(\d+)\}(\d)' "Auto subscript 3+" wrA
-`!p snip.rv = match.group(1)`_{`!p snip.rv = match.group(2) + match.group(3)`}
-endsnippet
-
-snippet '([A-Za-z])\^\{(\d+)\}(\d)' "Auto superscript" wrA
-`!p snip.rv = match.group(1)`^{`!p snip.rv = match.group(2) + match.group(3)`}
-endsnippet
-
 snippet compl "Complement" i
 ^{c}
 endsnippet

From 526d79d09e41126b5a6f880f0f31940b01de3808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:28:20 +0100
Subject: [PATCH 1473/1587] cleanup(tex): more \frac{}{} that autotrigger when
 not needed

---
 UltiSnips/tex.snippets | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index f10dfa4ee..69ddcbc75 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -323,24 +323,6 @@ snippet // "Fraction" Aw
 \frac{$1}{$2}$0
 endsnippet
 
-snippet '((\d+)|(\d*)(\\)?([A-Za-z]+)((\^|_)(\{\d+\}|\d))*)/' "Fraction" wrA
-\\frac{`!p snip.rv = match.group(1)`}{$1}$0
-endsnippet
-
-snippet '^.*\)/' "() Fraction" wrA
-`!p
-stripped = match.string[:-1]
-depth = 0
-i = len(stripped) - 1
-while True:
-	if stripped[i] == ')': depth += 1
-	if stripped[i] == '(': depth -= 1
-	if depth == 0: break;
-	i -= 1
-snip.rv = stripped[0:i] + "\\frac{" + stripped[i+1:-1] + "}"
-`{$1}$0
-endsnippet
-
 snippet compl "Complement" i
 ^{c}
 endsnippet

From 2502f24f0a8cf912af462f12b8d8de85bd340550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:32:02 +0100
Subject: [PATCH 1474/1587] fix(tex): inline math should use `\(...\)` instead
 of `$...$`.

Also, I changed the snippet to `$$` which is easier to trigger and is
related to the snippet.
---
 UltiSnips/tex.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 69ddcbc75..8d611797b 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -309,8 +309,8 @@ snippet DD "D" w
 \mathbb{D}
 endsnippet
 
-snippet im "Inline Math" w
-$${1}$
+snippet $$ "Inline Math" iA
+\\(${1}\\) $0
 endsnippet
 
 snippet dm "Display Math" w

From ac393d7e076133b70ea58248e529c9bbae980a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:33:29 +0100
Subject: [PATCH 1475/1587] cleanup(tex): these snippets were too specific

They also consisted in one letter, e.g. QQ -> `\Q`, so there is no big
advantage to have them.
---
 UltiSnips/tex.snippets | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 8d611797b..885c45f5c 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -285,22 +285,6 @@ snippet nnn "bigcap" w
 \bigcap_{${1:i \in ${2: I}}} $0
 endsnippet
 
-snippet OO "emptyset" w
-\O
-endsnippet
-
-snippet RR "real" w
-\R
-endsnippet
-
-snippet QQ "Q" w
-\Q
-endsnippet
-
-snippet ZZ "Z" w
-\Z
-endsnippet
-
 snippet HH "H" w
 \mathbb{H}
 endsnippet

From edd760c6384fde68a6968839a4c2c09c9b827010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:34:53 +0100
Subject: [PATCH 1476/1587] cleanup(tex): `\N` is not a standard latex command

We should not put custom commands here.
---
 UltiSnips/tex.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 885c45f5c..b49cd5bab 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -265,10 +265,6 @@ snippet inn "in " w
 \in 
 endsnippet
 
-snippet NN "n" w
-\N
-endsnippet
-
 snippet Nn "cap" w
 \cap 
 endsnippet

From 3c9a4fd6c65c7272be57e21daef4159f7e6261cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:37:25 +0100
Subject: [PATCH 1477/1587] cleanup(tex): these are all also rather specific
 snippets

It should suffice to have a snippet for subscript and one for
superscript. We don't need to have a snippet for each possible
superscript.
---
 UltiSnips/tex.snippets | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index b49cd5bab..9e22da776 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -217,46 +217,6 @@ endsnippet
 # MATH #
 ########
 
-snippet "([a-zA-Z])MM"  "^m" wr
-`!p snip.rv = match.group(1)`^{m}
-endsnippet
-
-snippet "([a-zA-Z])NN"  "^n" wr
-`!p snip.rv = match.group(1)`^{n}
-endsnippet
-
-snippet "([a-zA-Z])II"  "^i" wr
-`!p snip.rv = match.group(1)`^{i}
-endsnippet
-
-snippet "([a-zA-Z])KK"  "^k" wr
-`!p snip.rv = match.group(1)`^{k}
-endsnippet
-
-snippet "([a-zA-Z])JJ"  "^j" wr
-`!p snip.rv = match.group(1)`^{j}
-endsnippet
-
-snippet "([a-zA-Z])mm"  "_m" wr
-`!p snip.rv = match.group(1)`_{m}
-endsnippet
-
-snippet "([a-zA-Z])nn"  "_n" wr
-`!p snip.rv = match.group(1)`_{n}
-endsnippet
-
-snippet "([a-zA-Z])ii"  "_i" wr
-`!p snip.rv = match.group(1)`_{i}
-endsnippet
-
-snippet "([a-zA-Z])kk"  "_k" wr
-`!p snip.rv = match.group(1)`_{k}
-endsnippet
-
-snippet "([a-zA-Z])jj"  "_j" wr
-`!p snip.rv = match.group(1)`_{j}
-endsnippet
-
 snippet cc "subset" w
 \subset 
 endsnippet

From 6280160287b167be489fc72471861db4f6056223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:39:01 +0100
Subject: [PATCH 1478/1587] cleanup(tex): align is already defined in texmath

---
 UltiSnips/tex.snippets | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 9e22da776..d82865ca1 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -177,18 +177,6 @@ snippet case "cases" bi
 \end{cases}
 endsnippet
 
-snippet ali "Align" bi
-\begin{align}
-	${1:${VISUAL}}
-.\end{align}
-endsnippet
-
-snippet ali* "Align*" bi
-\begin{align*}
-	${1:${VISUAL}}
-.\end{align*}
-endsnippet
-
 snippet abs "abstract environment" b
 \begin{abstract}
 	$0${VISUAL}

From a0e6f8d4d21b88ab1cb17cf6d7d0fa1b1c358866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:40:06 +0100
Subject: [PATCH 1479/1587] cleanup(tex): the environment observation is not
 standard

---
 UltiSnips/tex.snippets | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index d82865ca1..663f9bf40 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -138,12 +138,6 @@ snippet int "Intuition" bi
 \end{intuition}
 endsnippet
 
-snippet obs "Observation" bi
-\begin{observation}[$1]
-	$0${VISUAL}
-\end{observation}
-endsnippet
-
 snippet conc "Conclusion" bi
 \begin{conclusion}[$1]
 	$0${VISUAL}

From 5916fa7377d2d3f0cd88f10f3a6d18972f7d7fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:40:58 +0100
Subject: [PATCH 1480/1587] cleanup(tex): the environment `repetition` is not
 standard

---
 UltiSnips/tex.snippets | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 663f9bf40..b36b6ece4 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -120,12 +120,6 @@ snippet notion "Notation" bi
 \end{notation}
 endsnippet
 
-snippet rep "Repetition" bi
-\begin{repetition}[$1]
-	$0${VISUAL}
-\end{repetition}
-endsnippet
-
 snippet prop "Property" bi
 \begin{property}[$1]
 	$0${VISUAL}

From 56fd4dd42d2264f37001e2f885f6db6504a6cfde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:41:41 +0100
Subject: [PATCH 1481/1587] cleanup(tex): the environment `property` is not
 standard

---
 UltiSnips/tex.snippets | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index b36b6ece4..f476959a7 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -120,12 +120,6 @@ snippet notion "Notation" bi
 \end{notation}
 endsnippet
 
-snippet prop "Property" bi
-\begin{property}[$1]
-	$0${VISUAL}
-\end{property}
-endsnippet
-
 snippet int "Intuition" bi
 \begin{intuition}[$1]
 	$0${VISUAL}

From ec649b5b23cef14df42a0f1c38dc6168ca3c978f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:46:12 +0100
Subject: [PATCH 1482/1587] cleanup(tex): the environment `intuition` is not
 standard

---
 UltiSnips/tex.snippets | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index f476959a7..c6df61de5 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -108,7 +108,7 @@ snippet corl "Corollary" bi
 \end{corollary}
 endsnippet
 
-snippet example "Example" bAi
+snippet example "Example" bi
 \begin{example}[$1]
 	$0${VISUAL}
 \end{example}
@@ -120,12 +120,6 @@ snippet notion "Notation" bi
 \end{notation}
 endsnippet
 
-snippet int "Intuition" bi
-\begin{intuition}[$1]
-	$0${VISUAL}
-\end{intuition}
-endsnippet
-
 snippet conc "Conclusion" bi
 \begin{conclusion}[$1]
 	$0${VISUAL}

From b70a36b65c19545101720dcd923e935c02e231f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:50:48 +0100
Subject: [PATCH 1483/1587] cleanup(tex): a more sensible snippet for
 `description`

This snippet creates the initial `\item` and puts the cursor to start
writing the description name or take it from ${VISUAL}
---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index c6df61de5..2d638e6ad 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -50,7 +50,7 @@ endsnippet
 
 snippet desc "Description" bi
 \begin{description}
-	$0${VISUAL}
+	\item[${1:${VISUAL}}] $0
 \end{description}
 endsnippet
 

From d2bec854332d1c92ad1182938e5185ae63f00e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:56:13 +0100
Subject: [PATCH 1484/1587] fix(tex): correct use of `${VISUAL}` placeholder

---
 UltiSnips/tex.snippets | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 2d638e6ad..a6c12ee9e 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -38,13 +38,13 @@ endglobal
 
 snippet beg "begin{} / end{}" bi
 \begin{$1}
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{$1}
 endsnippet
 
 snippet cnt "Center" bi
 \begin{center}
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{center}
 endsnippet
 
@@ -56,61 +56,61 @@ endsnippet
 
 snippet lemma "Lemma" bi
 \begin{lemma}
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{lemma}
 endsnippet
 
 snippet prop "Proposition" bi
 \begin{prop}[$1]
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{prop}
 endsnippet
 
 snippet thrm "Theorem" bi
 \begin{theorem}[$1]
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{theorem}
 endsnippet
 
 snippet post "postulate" bi
 \begin{postulate}[$1]
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{postulate}
 endsnippet
 
 snippet prf "Proof" bi
 \begin{myproof}[$1]
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{myproof}
 endsnippet
 
 snippet def "Definition" bi
 \begin{definition}[$1]
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{definition}
 endsnippet
 
 snippet nte "Note" bi
 \begin{note}[$1]
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{note}
 endsnippet
 
 snippet prob "Problem" bi
 \begin{problem}[$1]
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{problem}
 endsnippet
 
 snippet corl "Corollary" bi
 \begin{corollary}[$1]
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{corollary}
 endsnippet
 
 snippet example "Example" bi
 \begin{example}[$1]
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{example}
 endsnippet
 
@@ -137,25 +137,25 @@ endsnippet
 
 snippet enum "Enumerate" bi
 \begin{enumerate}
-	\item $0${VISUAL}
+	\item ${0:${VISUAL}}
 \end{enumerate}
 endsnippet
 
 snippet item "Itemize" bi
 \begin{itemize}
-	\item $0${VISUAL}
+	\item ${0:${VISUAL}}
 \end{itemize}
 endsnippet
 
 snippet case "cases" bi
 \begin{cases}
-	$0${VISUAL}
+	${0:${VISUAL}}
 \end{cases}
 endsnippet
 
 snippet abs "abstract environment" b
 \begin{abstract}
-	$0${VISUAL}
+	${0:${VISUAL}}
 .\end{abstract}
 endsnippet
 

From 00a1e5e66813ac83d21a2836b00b3493980f8f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Crist=C3=B3bal=20Tapia=20Cam=C3=BA?= <crtapia@gmail.com>
Date: Sat, 15 Jan 2022 13:57:47 +0100
Subject: [PATCH 1485/1587] fix(tex): unclear use of `${VISUAL}` here

---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index a6c12ee9e..0a88a9696 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -128,7 +128,7 @@ endsnippet
 
 snippet fig "Figure environment" bi
 \begin{figure}[${1:htpb}]
-	\centering:${VISUAL}
+	\centering
 	${2:\includegraphics[width=0.8\textwidth]{$3}}
 	\caption{${4:$3}}
 	\label{fig:${5:${3/\W+/-/g}}}

From cbad57e5d0304198503648b5416ea28d2d1d437a Mon Sep 17 00:00:00 2001
From: smjonas <jonas.strittmatter@gmx.de>
Date: Sat, 22 Jan 2022 16:29:52 +0100
Subject: [PATCH 1486/1587] Remove too specific tex snippets

---
 UltiSnips/tex.snippets | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 0a88a9696..665af7a3d 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -213,17 +213,13 @@ snippet DD "D" w
 \mathbb{D}
 endsnippet
 
-snippet $$ "Inline Math" iA
-\\(${1}\\) $0
-endsnippet
-
 snippet dm "Display Math" w
 \[
 	${1:${VISUAL}}
 .\]$0
 endsnippet
 
-snippet // "Fraction" Aw
+snippet frac "Fraction" Aw
 \frac{$1}{$2}$0
 endsnippet
 
@@ -392,10 +388,6 @@ snippet xx "cross" Aw
 \times 
 endsnippet
 
-snippet ** "cdot" Aw
-\cdot 
-endsnippet
-
 snippet '(?<!\\)(sin|cos|arccot|cot|csc|ln|log|exp|star|perp)' "ln" rw
 \\`!p snip.rv = match.group(1)`
 endsnippet
@@ -404,10 +396,6 @@ snippet <! "normal" Aw
 \triangleleft 
 endsnippet
 
-snippet ~~ "~" Aw
-\sim 
-endsnippet
-
 snippet "(\d|\w)+invs" "inverse" Awr
 `!p snip.rv = match.group(1)`^{-1}
 endsnippet
@@ -416,10 +404,6 @@ snippet !> "mapsto" Aw
 \mapsto 
 endsnippet
 
-snippet || "mid" Aw
-\mid 
-endsnippet
-
 ##########
 # TABLES #
 #########

From e8604b0cb4cd1a81792f5a62d4e9e571bfdf5a89 Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Wed, 2 Feb 2022 08:53:11 +0200
Subject: [PATCH 1487/1587] feat(css): add web component APIs

- adds [`:host`](https://developer.mozilla.org/en-US/docs/Web/CSS/:host()) and `:host()`
- adds [CSS Shadow Parts](https://www.w3.org/TR/css-shadow-parts-1/)
- adds [CSS Custom Properties](https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_custom_properties)
---
 snippets/css.snippets | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/snippets/css.snippets b/snippets/css.snippets
index 8e728b31d..841b313a8 100644
--- a/snippets/css.snippets
+++ b/snippets/css.snippets
@@ -1245,3 +1245,19 @@ snippet ::a
 	::after
 snippet ::b
 	::before
+snippet var
+	var(${0:${VISUAL}});
+snippet vard
+	var(${0}, ${1:${VISUAL});
+snippet host 
+	:host {
+		${1:${VISUAL}}
+	}
+snippet host(
+	:host(${1}) {
+		${2:${VISUAL}}
+	}
+snippet part {
+	::part(${1})
+		${2:${VISUAL}}
+	}

From 249523700fe38d595fd8156e18430d1faf38aa40 Mon Sep 17 00:00:00 2001
From: Benny Powers <bennypowers@users.noreply.github.com>
Date: Wed, 2 Feb 2022 08:24:24 +0200
Subject: [PATCH 1488/1587] Update javascript-mocha.snippets

[mocha recommends using the `function` syntax](https://mochajs.org/#arrow-functions) in test files

When mocha tests use the arrow function syntax, they cannot access the mocha context
---
 snippets/javascript-mocha.snippets | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/snippets/javascript-mocha.snippets b/snippets/javascript-mocha.snippets
index eb5c381d1..3695df2c9 100644
--- a/snippets/javascript-mocha.snippets
+++ b/snippets/javascript-mocha.snippets
@@ -1,29 +1,29 @@
-snippet des "describe('thing', () => { ... })" b
-	describe('${1:}', () => {
+be('thing', function() { ... })" b
+	describe('${1:}', function() {
 		${0:${VISUAL}}
 	});
-snippet it "it('should do', () => { ... })" b
-	it('${1:}', () => {
+snippet it "it('should do', function() { ... })" b
+	it('${1:}', function() {
 		${0:${VISUAL}}
 	});
-snippet xit "xit('should do', () => { ... })" b
-	xit('${1:}', () => {
+snippet xit "xit('should do', function() { ... })" b
+	xit('${1:}', function() {
 		${0:${VISUAL}}
 	});
-snippet bef "before(() => { ... })" b
-	before(() => {
+snippet bef "before(function() { ... })" b
+	before(function() {
 		${0:${VISUAL}}
 	});
-snippet befe "beforeEach(() => { ... })" b
-	beforeEach(() => {
+snippet befe "beforeEach(function() { ... })" b
+	beforeEach(function() {
 		${0:${VISUAL}}
 	});
-snippet aft "after(() => { ... })" b
-	after(() => {
+snippet aft "after(function() { ... })" b
+	after(function() {
 		${0:${VISUAL}}
 	});
-snippet afte "afterEach(() => { ... })" b
-	afterEach(() => {
+snippet afte "afterEach(function() { ... })" b
+	afterEach(function() {
 		${0:${VISUAL}}
 	});
 snippet exp "expect(...)" b

From 851c39c38f48c47f9aa937f83cda314ab1c8dd44 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 5 Feb 2022 00:00:36 +0000
Subject: [PATCH 1489/1587] Fix syntax error

---
 snippets/javascript-mocha.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/javascript-mocha.snippets b/snippets/javascript-mocha.snippets
index 3695df2c9..180555fcb 100644
--- a/snippets/javascript-mocha.snippets
+++ b/snippets/javascript-mocha.snippets
@@ -1,4 +1,4 @@
-be('thing', function() { ... })" b
+snippet des "describe('thing', function() { ... })" b
 	describe('${1:}', function() {
 		${0:${VISUAL}}
 	});

From 4e1d1456fd7d1d5d6cff256578a3e3bbeeb24e62 Mon Sep 17 00:00:00 2001
From: dragonxlwang <dragonxlwang@gmail.com>
Date: Tue, 23 Feb 2021 10:44:51 -0800
Subject: [PATCH 1490/1587] make cpp main accepting args/argv

---
 UltiSnips/cpp.snippets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index d152aa768..a997f001e 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -31,9 +31,10 @@ endglobal
 #                            TextMate Snippets                            #
 ###########################################################################
 snippet main
-int main()
+int main(int argc, char *argv[])
 {
 	${0}
+	return 0;
 }
 endsnippet
 

From e9b78a4493d45176f124989dc1cec606d044a807 Mon Sep 17 00:00:00 2001
From: Santos Gallegos <stsewd@protonmail.com>
Date: Sat, 12 Mar 2022 13:11:14 -0500
Subject: [PATCH 1491/1587] Python: add br -> breakpoint()

---
 snippets/python.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index ebd437696..7201c379d 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -159,6 +159,10 @@ snippet ifmain
 # __magic__
 snippet _
 	__${1:init}__
+
+# debugger breakpoint
+snippet br
+    breakpoint()
 # python debugger (pdb)
 snippet pdb
 	__import__('pdb').set_trace()

From b54ec576528194032ca4cc369b4518ed16d11fae Mon Sep 17 00:00:00 2001
From: 0q2 <80297231+0q2@users.noreply.github.com>
Date: Sun, 13 Mar 2022 06:28:52 -0700
Subject: [PATCH 1492/1587] Fix formatting error

Was wondering why I was getting an error from UltiSnips. Once I looked at the most recent merge it was pretty obvious.
---
 snippets/python.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 7201c379d..9b3798b8b 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -162,7 +162,7 @@ snippet _
 
 # debugger breakpoint
 snippet br
-    breakpoint()
+	breakpoint()
 # python debugger (pdb)
 snippet pdb
 	__import__('pdb').set_trace()

From 3c40345e100624e2a8946457839e80f526acbe3b Mon Sep 17 00:00:00 2001
From: Jimmy Z <51149050+jimmy-zx@users.noreply.github.com>
Date: Fri, 18 Mar 2022 04:06:46 +0000
Subject: [PATCH 1493/1587] Remove autotrigger of frac

---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 665af7a3d..0b6f6c211 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -219,7 +219,7 @@ snippet dm "Display Math" w
 .\]$0
 endsnippet
 
-snippet frac "Fraction" Aw
+snippet frac "Fraction" w
 \frac{$1}{$2}$0
 endsnippet
 

From 57d23f6f44203374edcbb7d41903a491ec8cbed7 Mon Sep 17 00:00:00 2001
From: Jimmy Z <51149050+jimmy-zx@users.noreply.github.com>
Date: Sat, 26 Mar 2022 22:19:30 +0000
Subject: [PATCH 1494/1587] Removed autotrigger of bra and ket

---
 UltiSnips/tex.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 0b6f6c211..971ce62c5 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -429,11 +429,11 @@ snippet bar "bar" wi
 \bar{${1:${VISUAL}}}$0
 endsnippet
 
-snippet "\<(.*?)\|" "bra" Awri
+snippet "\<(.*?)\|" "bra" wri
 \bra{`!p snip.rv = match.group(1).replace('q', f'\psi').replace('f', f'\phi')`}
 endsnippet
 
-snippet "\|(.*?)\>" "ket" Awri
+snippet "\|(.*?)\>" "ket" wri
 \ket{`!p snip.rv = match.group(1).replace('q', f'\psi').replace('f', f'\phi')`}
 endsnippet
 

From f87700737a441cfe841003b40166d314bdb99052 Mon Sep 17 00:00:00 2001
From: Andy Waite <andyw8@users.noreply.github.com>
Date: Sun, 27 Mar 2022 19:02:41 -0400
Subject: [PATCH 1495/1587] Remove outdated Rails sweeper snippet

---
 UltiSnips/rails.snippets | 22 ----------------------
 snippets/rails.snippets  | 16 ----------------
 2 files changed, 38 deletions(-)

diff --git a/UltiSnips/rails.snippets b/UltiSnips/rails.snippets
index 22b71901d..0769bc6a8 100644
--- a/UltiSnips/rails.snippets
+++ b/UltiSnips/rails.snippets
@@ -799,28 +799,6 @@ snippet xput "xhr put"
 xhr :put, :${1:update}, id: ${2:1}, ${3:object}: { $4 }$0
 endsnippet
 
-snippet sweeper "Create sweeper class"
-class ${1:Model}Sweeper < ActionController::Caching::Sweeper
-	observe ${1:Model}
-
-	def after_save(${1/./\l$0/})
-		expire_cache(${1/./\l$0/})
-	end
-
-	def after_destroy(${1/./\l$0/})
-		expire_cache(${1/./\l$0/})
-	end
-
-	private
-
-		def expire_cache(${1/./\l$0/})
-			${0:expire_page ${1/./\l$0/}s_path
-			expire_page ${1/./\l$0/}_path(${1/./\l$0/})}
-		end
-
-end
-endsnippet
-
 snippet col "collection routes"
 collection do
 	${1:get :${2:action}}
diff --git a/snippets/rails.snippets b/snippets/rails.snippets
index 4678de921..624a48c25 100644
--- a/snippets/rails.snippets
+++ b/snippets/rails.snippets
@@ -274,22 +274,6 @@ snippet sl
 	end
 snippet sha1
 	Digest::SHA1.hexdigest(${0:string})
-snippet sweeper
-	class ${1:ModelClassName}Sweeper < ActionController::Caching::Sweeper
-		observe $1
-
-		def after_save(${0:model_class_name})
-			expire_cache($2)
-		end
-
-		def after_destroy($2)
-			expire_cache($2)
-		end
-
-		def expire_cache($2)
-			expire_page
-		end
-	end
 snippet va validates_associated
 	validates_associated :${0:attribute}
 snippet va validates .., acceptance: true

From 02cab64b10acc072e01ffb6aa2cb76d2a956a8bf Mon Sep 17 00:00:00 2001
From: cxr6548 <84841289+cxr6548@users.noreply.github.com>
Date: Mon, 28 Mar 2022 15:03:09 -0500
Subject: [PATCH 1496/1587] Re-add Inline Math snippet

mimics the function of Display Math with a less obtrusive trigger than before
---
 UltiSnips/tex.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 971ce62c5..6a573d98d 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -213,6 +213,10 @@ snippet DD "D" w
 \mathbb{D}
 endsnippet
 
+snippet inmath "Inline Math" w
+\\(${1}\\) $0
+endsnippet
+
 snippet dm "Display Math" w
 \[
 	${1:${VISUAL}}

From be376a98d1a2cbed6b0223fd8bc42135fbf16396 Mon Sep 17 00:00:00 2001
From: cxr6548 <84841289+cxr6548@users.noreply.github.com>
Date: Mon, 28 Mar 2022 14:31:41 -0500
Subject: [PATCH 1497/1587] remove '.' from displaymath

---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 6a573d98d..239dc1da5 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -220,7 +220,7 @@ endsnippet
 snippet dm "Display Math" w
 \[
 	${1:${VISUAL}}
-.\]$0
+\]$0
 endsnippet
 
 snippet frac "Fraction" w

From 014a3758ccddb2b0e267c2fd27523872a3bcd3cf Mon Sep 17 00:00:00 2001
From: Andy Waite <andyw8@users.noreply.github.com>
Date: Sun, 27 Mar 2022 19:10:13 -0400
Subject: [PATCH 1498/1587] Clarify README re. snipmate

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e79d25e8e..ea882da94 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ Until further work is done on `vim-snipmate`, please don't add folding markers
 into snippets. `vim-snipmate` has some comments about how to patch all snippets
 on the fly adding those.
 
-Currently all snippets from UltiSnips have been put into UltiSnips - some work
+Currently all snippets from snipmate have been put into UltiSnips - some work
 on merging should be done (dropping duplicates etc). Also see engines section above.
 
 Related repositories

From 0b0f7bc175694bd4a9ebf77d78e0edcfbf9e7ff7 Mon Sep 17 00:00:00 2001
From: Andy Waite <andyw8@users.noreply.github.com>
Date: Mon, 28 Mar 2022 18:54:39 -0400
Subject: [PATCH 1499/1587] Fix incorrect assumption

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ea882da94..c8a242a30 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ Until further work is done on `vim-snipmate`, please don't add folding markers
 into snippets. `vim-snipmate` has some comments about how to patch all snippets
 on the fly adding those.
 
-Currently all snippets from snipmate have been put into UltiSnips - some work
+Currently all snippets from UltiSnips have been put into `/UltiSnips` - some work
 on merging should be done (dropping duplicates etc). Also see engines section above.
 
 Related repositories

From 0b82ebf1dc8628abe2cfb3c21b5c3816fd3c053d Mon Sep 17 00:00:00 2001
From: Trevor Stone <tstone@google.com>
Date: Thu, 31 Mar 2022 18:18:04 -0600
Subject: [PATCH 1500/1587] main snippet for Kotlin

---
 snippets/kotlin.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/snippets/kotlin.snippets b/snippets/kotlin.snippets
index 98f8dbc4b..54ba5e444 100644
--- a/snippets/kotlin.snippets
+++ b/snippets/kotlin.snippets
@@ -6,6 +6,11 @@ snippet pfun
 	private fun ${1:name}(${2}): ${3:String} {
 		${4}
 	}
+snippet main
+	@JvmStatic
+	fun main(args: Array<String>) {
+		${0}
+	}
 snippet ret
 	return ${0}
 snippet whe

From c6d4b1cfa7a349ca561b86227cb46c4147b9c23c Mon Sep 17 00:00:00 2001
From: cxr6548 <84841289+cxr6548@users.noreply.github.com>
Date: Fri, 1 Apr 2022 23:31:25 -0500
Subject: [PATCH 1501/1587] Remove duplicate usepackage snippet and update
 docstring

Issue #1404 .
---
 UltiSnips/tex.snippets | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 239dc1da5..3e7e3e8d0 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -425,10 +425,6 @@ endsnippet
 # POSTFIX #
 ###########
 
-snippet pac "Package" b
-\usepackage`!p snip.rv='[' if t[1] else ""`${1:options}`!p snip.rv = ']' if t[1] else ""`{${2:package}}$0
-endsnippet
-
 snippet bar "bar" wi
 \bar{${1:${VISUAL}}}$0
 endsnippet
@@ -450,8 +446,8 @@ endsnippet
 # PRE-AMBLE #
 #############
 
-snippet pac "Package" b
-\usepackage[${1:options}]{${2:package}}$0
+snippet pac "usepackage - removes square braces if options removed" b
+\usepackage`!p snip.rv='[' if t[1] else ""`${1:options}`!p snip.rv = ']' if t[1] else ""`{${2:package}}$0
 endsnippet
 
 snippet docls "Document Class" bA

From b7fc71b3c41c2d42f04aaf2770965640b712ca68 Mon Sep 17 00:00:00 2001
From: andromedabushturkey <andro@d33tdev.ca>
Date: Fri, 8 Apr 2022 15:47:48 -0400
Subject: [PATCH 1502/1587] added basic flutter scaffold application snippet

---
 snippets/dart-flutter.snippets | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/snippets/dart-flutter.snippets b/snippets/dart-flutter.snippets
index f3ded26a8..54dfc878f 100644
--- a/snippets/dart-flutter.snippets
+++ b/snippets/dart-flutter.snippets
@@ -57,3 +57,33 @@ snippet stanim
 			);
 		}
 	}
+
+# Flutter scaffold application
+snippet fsa
+	void main() {
+  runApp(
+    MaterialApp(
+      title: 'Flutter Demo',
+      theme: ThemeData(
+        primarySwatch: Colors.blue,
+      ),
+      debugShowCheckedModeBanner: false,
+      home: const HomePage(),
+    ),
+  );
+}
+
+class HomePage extends StatelessWidget {
+  const HomePage({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Home Page'),
+      ),
+    );
+  }
+}
+
+

From b18094041f30db7afe1577ef9369c395759ffd4a Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Tue, 12 Apr 2022 09:01:30 +0100
Subject: [PATCH 1503/1587] Fix indentation

---
 snippets/dart-flutter.snippets | 44 +++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/snippets/dart-flutter.snippets b/snippets/dart-flutter.snippets
index 54dfc878f..f51f11ca4 100644
--- a/snippets/dart-flutter.snippets
+++ b/snippets/dart-flutter.snippets
@@ -61,29 +61,29 @@ snippet stanim
 # Flutter scaffold application
 snippet fsa
 	void main() {
-  runApp(
-    MaterialApp(
-      title: 'Flutter Demo',
-      theme: ThemeData(
-        primarySwatch: Colors.blue,
-      ),
-      debugShowCheckedModeBanner: false,
-      home: const HomePage(),
-    ),
-  );
-}
+		runApp(
+			MaterialApp(
+				title: 'Flutter Demo',
+				theme: ThemeData(
+					primarySwatch: Colors.blue,
+				),
+				debugShowCheckedModeBanner: false,
+				home: const HomePage(),
+			),
+		);
+	}
 
-class HomePage extends StatelessWidget {
-  const HomePage({Key? key}) : super(key: key);
+	class HomePage extends StatelessWidget {
+		const HomePage({Key? key}) : super(key: key);
 
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Home Page'),
-      ),
-    );
-  }
-}
+		@override
+		Widget build(BuildContext context) {
+			return Scaffold(
+				appBar: AppBar(
+					title: const Text('Home Page'),
+				),
+			);
+		}
+	}
 
 

From 8a7534b3bd8dac36619b13fdf6eacb94a319efd5 Mon Sep 17 00:00:00 2001
From: rieg-ec <rieg@uc.cl>
Date: Thu, 14 Apr 2022 18:00:37 -0400
Subject: [PATCH 1504/1587] feat(vue): add computed snippet

---
 snippets/vue.snippets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/snippets/vue.snippets b/snippets/vue.snippets
index 1385ecb7c..b9b8221f0 100644
--- a/snippets/vue.snippets
+++ b/snippets/vue.snippets
@@ -108,6 +108,13 @@ snippet vdata
 		};
 	}
 
+snippet vcomputed
+	computed: {
+		${1:fnName}() {
+			return;
+		}
+	},
+
 snippet vfilter
 	filters: {
 		${1:fnName}: function(${2:value}) {

From e66c5435c5b68d74cd7e8d32d136a34c05c18b9f Mon Sep 17 00:00:00 2001
From: rieg-ec <rieg@uc.cl>
Date: Thu, 14 Apr 2022 18:05:04 -0400
Subject: [PATCH 1505/1587] feat(vue): add trailing commas to script snippets

---
 snippets/vue.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/snippets/vue.snippets b/snippets/vue.snippets
index b9b8221f0..8f150e49c 100644
--- a/snippets/vue.snippets
+++ b/snippets/vue.snippets
@@ -50,7 +50,7 @@ snippet vactions
 		${1:updateValue}({commit}, ${2:payload}) {
 			commit($1, $2);
 		}
-	}
+	},
 
 # Add in js animation hooks
 snippet vanim:js:el
@@ -106,7 +106,7 @@ snippet vdata
 		return {
 			${1:key}: ${2:value}
 		};
-	}
+	},
 
 snippet vcomputed
 	computed: {
@@ -120,7 +120,7 @@ snippet vfilter
 		${1:fnName}: function(${2:value}) {
 			return;
 		}
-	}
+	},
 
 snippet vfor
 	<div v-for="${1:item} in ${2:items}" :key="$1.id">
@@ -132,7 +132,7 @@ snippet vgetters
 		${1:value}: state => {
 			return state.$1;
 		}
-	}
+	},
 
 snippet vimport
 	import ${1:New} from './components/$1.vue';
@@ -159,7 +159,7 @@ snippet vmutations
 		${1:updateValue}(state, ${3:payload}) => {
 			state.${2:value} = $3;
 		}
-	}
+	},
 
 snippet vprops:d
 	${1:propName}: {

From a0f550c77ac4c815ee6ab42a1d88bf2ba905ad67 Mon Sep 17 00:00:00 2001
From: rieg-ec <rieg@uc.cl>
Date: Thu, 14 Apr 2022 18:12:22 -0400
Subject: [PATCH 1506/1587] feat(eruby): add link_to snippet

---
 snippets/eruby.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/eruby.snippets b/snippets/eruby.snippets
index 3d6391603..fbc8942d2 100644
--- a/snippets/eruby.snippets
+++ b/snippets/eruby.snippets
@@ -40,6 +40,9 @@ snippet lica
 	<%= link_to '${1:link text...}', controller: '${2:items}', action: '${0:index}' %>
 snippet licai
 	<%= link_to '${1:link text...}', controller: '${2:items}', action: '${3:edit}', id: ${0:@item} %>
+snippet lib
+	<%= link_to '${1:link text...}' do %>
+	<% end %>
 snippet yield
 	<%= yield ${1::content_symbol} %>
 snippet conf

From 0decc32aad4564452c2f8a5cbfe387195f1a8bba Mon Sep 17 00:00:00 2001
From: javy_liu <javy_liu@163.com>
Date: Wed, 20 Apr 2022 13:31:59 +0800
Subject: [PATCH 1507/1587] update sh.snippets

add $ escape for getopt snippet
---
 snippets/sh.snippets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 4f08e8974..b92ae952c 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -66,7 +66,7 @@ snippet getopt
 	#===============================================================================
 	function usage ()
 	{
-		echo "Usage :  $${0:0} [options] [--]
+		echo "Usage :  \$${0:0} [options] [--]
 
 	    Options:
 	    -h|help       Display this message
@@ -80,18 +80,18 @@ snippet getopt
 
 	while getopts ":hv" opt
 	do
-	  case $opt in
+	  case \$opt in
 
 		h|help     )  usage; exit 0   ;;
 
-		v|version  )  echo "$${0:0} -- Version $__ScriptVersion"; exit 0   ;;
+		v|version  )  echo "\$${0:0} -- Version \$__ScriptVersion"; exit 0   ;;
 
-		* )  echo -e "\n  Option does not exist : $OPTARG\n"
+		* )  echo -e "\\n  Option does not exist : \$OPTARG\\n"
 			  usage; exit 1   ;;
 
 	  esac    # --- end of case ---
 	done
-	shift $(($OPTIND-1))
+	shift \$(($OPTIND-1))
 snippet root
 	if [ \$(id -u) -ne 0 ]; then exec sudo \$0; fi
 

From 7c19d3dbadd9920113cfe2c87b4c22c219bc2ca9 Mon Sep 17 00:00:00 2001
From: rieg-ec <rieg@uc.cl>
Date: Mon, 18 Apr 2022 13:36:02 -0400
Subject: [PATCH 1508/1587] feat(vue): add mounted and method snippets

---
 snippets/vue.snippets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/snippets/vue.snippets b/snippets/vue.snippets
index 8f150e49c..9462635ff 100644
--- a/snippets/vue.snippets
+++ b/snippets/vue.snippets
@@ -108,6 +108,18 @@ snippet vdata
 		};
 	},
 
+snippet vmounted
+	mounted() {
+		console.log('mounted');
+	},
+
+snippet vmethods
+	methods: {
+		${1:method}() {
+			console.log('method');
+		}
+	},
+
 snippet vcomputed
 	computed: {
 		${1:fnName}() {

From 45c8e00d0bae9056713097ea655d76d463b66f10 Mon Sep 17 00:00:00 2001
From: gzqx <jerryzh0524@sjtu.edu.cn>
Date: Wed, 27 Apr 2022 19:56:06 +0200
Subject: [PATCH 1509/1587] remove brackt of scheme-define definition part

---
 snippets/scheme.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/scheme.snippets b/snippets/scheme.snippets
index bdd445f91..4c0c78a09 100644
--- a/snippets/scheme.snippets
+++ b/snippets/scheme.snippets
@@ -17,7 +17,7 @@ snippet *
 # Definition
 snippet def
 	(define (${1:name})
-			(${0:definition}))
+			${0:definition})
 
 # Definition with lambda
 snippet defl

From 4e616e37b947f17b236a257fc9a7d09ba45412f1 Mon Sep 17 00:00:00 2001
From: Mathias Jean Johansen <mathias@mjj.io>
Date: Fri, 6 May 2022 16:29:09 +0200
Subject: [PATCH 1510/1587] Add Gleam snippets.

---
 snippets/gleam.snippets | 98 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 snippets/gleam.snippets

diff --git a/snippets/gleam.snippets b/snippets/gleam.snippets
new file mode 100644
index 000000000..a01e54075
--- /dev/null
+++ b/snippets/gleam.snippets
@@ -0,0 +1,98 @@
+snippet fn "fn"
+  fn ${1:function_name}(${2}) -> ${3:Nil} {
+    ${0:${VISUAL:todo}}
+  }
+
+snippet pfn "pub fn"
+  pub fn ${1:function_name}(${2}) -> ${3:Nil} {
+    ${0:${VISUAL:todo}}
+  }
+
+snippet test "test fn"
+  pub fn ${1:name}_test() {
+    ${0}
+  }
+
+snippet af "anonymous fn"
+  fn(${1}) { ${0:${VISUAL}} }
+
+snippet let "let binding"
+  let ${1} = ${0}
+
+snippet l "let binding"
+  let ${1} = ${0}
+
+snippet as "assert binding"
+  assert ${1} = ${0}
+
+snippet tr "try binding"
+  try ${1} = ${0}
+
+snippet - "->"
+  -> ${0}
+
+snippet case "case expression"
+  case ${1} {
+    ${2} -> ${0}
+  }
+
+snippet ty "type"
+  type ${1:Name} {
+    ${0:$1}
+  }
+
+snippet pty "pub type"
+  pub type ${1:Name} {
+    ${0:$1}
+  }
+
+snippet tya "type alias"
+  type ${1:Name} =
+    ${0:$1}
+
+snippet ptya "pub type alias"
+  pub type ${1:Name} =
+    ${0:$1}
+
+snippet ext "external type"
+  external type ${0}
+
+snippet pext "pub external type"
+  pub external type ${0}
+
+snippet exfn "external fn"
+  external fn ${1:function_name}(${2}) -> ${3}
+    = "${4}" "${0}"
+
+snippet pexfn "pub external fn"
+  pub external fn ${1:function_name}(${2}) -> ${3}
+    = "${4}" "${0}"
+
+snippet im "import"
+  import ${0:gleam/result}
+
+snippet im. "import exposing"
+  import ${1:gleam/result}.{${0}}
+
+snippet p "|>"
+  |> ${0}
+
+snippet tup "tuple()"
+  tuple(${0:${VISUAL}})
+
+snippet bl "block"
+  {
+    ${0:${VISUAL}}
+  }
+
+snippet tf "fn(Type) -> Type"
+  fn(${1}) -> ${0}
+
+snippet seq "should.equal"
+  should.equal(${0:${VISUAL}})
+
+snippet strue "should.be_true"
+  should.be_true(${0:${VISUAL}})
+
+snippet sfalse "should.be_false"
+  should.be_true(${0:${VISUAL}})

From eef3b99adab253e237e24109e4c3688aab375ccf Mon Sep 17 00:00:00 2001
From: Florin Dinu <fredtux@users.noreply.github.com>
Date: Sun, 8 May 2022 16:55:47 +0300
Subject: [PATCH 1511/1587] Added basic snippets for Linux asm x86

---
 UltiSnips/asm.snippets | 293 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 293 insertions(+)
 create mode 100644 UltiSnips/asm.snippets

diff --git a/UltiSnips/asm.snippets b/UltiSnips/asm.snippets
new file mode 100644
index 000000000..fca08a65f
--- /dev/null
+++ b/UltiSnips/asm.snippets
@@ -0,0 +1,293 @@
+snippet scode "Start basic code for assembly" b
+.data
+
+
+.text
+
+
+.global main
+
+
+main:
+
+
+endsnippet
+
+snippet scodes "Start basic code for assembly with _start label" b
+.data
+
+
+.text
+
+
+.globl _start
+
+
+_start:
+
+
+endsnippet
+
+snippet lo "Long" b
+$1: .long $2
+endsnippet
+
+snippet wo "Word" b
+$1: .word $2
+endsnippet
+
+snippet by "Byte" b
+$1: .byte $2
+endsnippet
+
+snippet sp "Space" b
+$1: .space $2
+endsnippet
+
+snippet ai "Ascii" b
+$1: .ascii "$2"
+endsnippet
+
+snippet az "Asciz" b
+$1: .asciz "$2"
+endsnippet
+
+snippet ze "Zero" b
+$1: .zero "$2"
+endsnippet
+
+snippet qu "Quad" b
+$1: .quad "$2"
+endsnippet
+
+snippet si "Single" b
+$1: .single "$2"
+endsnippet
+
+snippet do "Double" b
+$1: .single "$2"
+endsnippet
+snippet fl "Float" b
+$1: .single "$2"
+endsnippet
+
+snippet oc "Octa" b
+$1: .single "$2"
+endsnippet
+
+snippet sh "Short" b
+$1: .single "$2"
+endsnippet
+
+snippet exit0 "Exit without error" b
+# Exit without error
+movl \$1, %eax
+xorl %ebx, %ebx
+int \$0x80
+
+endsnippet
+
+snippet exit "Exit with error" b
+# Exit with error
+mov \$1, %eax
+mov $1, %ebx # Error code
+int \$0x80
+
+endsnippet
+
+snippet readfstdin "Read fixed length text from stdin" b
+# Read fixed length text
+mov \$3, %eax
+mov \$2, %ebx # stdin
+mov $1, %ecx # String
+mov $2, %edx # Lenght
+int \$0x80
+
+endsnippet
+snippet writestdout "Write text to stdout" b
+# Write text
+mov \$4, %eax
+mov \$1, %ebx # stdout
+mov $1, %ecx # String
+mov $2, %edx # Lenght
+int \$0x80
+
+endsnippet
+
+snippet writestderr "Write text to stderr" b
+# Write text
+mov \$4, %eax
+mov \$2, %ebx # stderr
+mov $1, %ecx # String
+mov $2, %edx # Lenght
+int \$0x80
+
+endsnippet
+
+snippet * "Multiplication" b
+# Multiply two number - %eax = %eax * op
+mov $1, %eax
+mul $2
+
+endsnippet
+
+snippet / "Division" b
+# Divide two numbers - %eax(quotinet) + %edx(remainder) = %eax / op
+mov $1, %eax
+div $2
+
+endsnippet
+
+snippet jmpl "Conditional lower jump" b
+cmp $1, $2
+jl $3 # Jump if op2 < op1
+
+endsnippet
+
+snippet jmple "Conditional lower or equal jump" b
+cmp $1, $2
+jle $3 # Jump if op2 <= op1
+
+endsnippet
+
+snippet jmpe "Conditional equal jump" b
+cmp $1, $2
+je $3 # Jump if op2 == op1
+
+endsnippet
+
+snippet jmpn "Conditional not equal jump" b
+cmp $1, $2
+jn $3 # Jump if op2 != op1
+
+endsnippet
+
+snippet jmpg "Conditional greater jump" b
+cmp $1, $2
+jg $3 # Jump if op2 > op1
+
+endsnippet
+
+snippet jmpge "Conditional greater or equal jump" b
+cmp $1, $2
+je $3 # Jump if op2 >= op1
+
+endsnippet
+
+snippet loopn "Loop n times" b
+# Loop for op1 times
+mov $1, %ecx
+
+et_for:
+	# Instructions
+	$2
+
+	# Loop
+	loop et_for
+
+endsnippet
+
+snippet loopnn "Loop n-1 times" b
+# Loop for op1 - 1 times
+mov $1, %ecx
+dec %ecx
+
+et_for:
+	# Instructions
+	$2
+
+	# Loop
+	loop et_for
+
+endsnippet
+
+snippet loopv "Loop through a vector" b
+# Loop through a vector
+lea $1, %edi
+xor %ecx, %ecx
+
+et_for:
+	# Loop until op2
+	cmp %ecx, $2
+	je $3
+
+	# Instructions
+	$4
+
+	inc %ecx
+	jmp et_for
+
+endsnippet
+
+snippet mul "Multiply" b
+xor %edx, %edx
+mov $1, %eax
+mul $2
+endsnippet
+
+snippet mul64 "Multiply numbers greater than 2^32" b
+mov $1, %edx
+mov $2, %eax
+mul $3
+endsnippet
+
+snippet div "Divide" b
+xor %edx, %edx
+mov $1, %eax
+div $2
+endsnippet
+
+snippet div64 "Divide numbers greater than 2^32" b
+mov $1, %edx
+mov $2, %eax
+div $3
+endsnippet
+
+snippet pr "Call printf" b
+pushl $1
+call printf
+popl $2
+endsnippet
+
+snippet sc "Call scanf" b
+pushl $1
+call scanf
+popl $2
+endsnippet
+
+snippet mindex "Current index from a matrix" b
+# Current index from a matrix stored in %eax
+xor %edx, %edx
+movl $1, %eax # line index
+mull $2 # number of columns
+addl $3, %eax # column index
+endsnippet
+
+snippet ffl "Call fflush" b
+pushl \$0
+call fflush
+popl $1
+endsnippet
+
+snippet at "Call atoi" b
+pushl $1
+call atoi
+popl $2
+endsnippet
+
+snippet len "Call strlen" b
+pushl $1
+call strlen
+popl $2
+endsnippet
+
+snippet proc "Basic procedure" b
+$1:
+pushl %ebp
+movl %esp, %ebp
+
+$2
+
+popl %ebp
+ret
+endsnippet

From 6f270bb2d26c38765ff2243e9337c65f8a96a28b Mon Sep 17 00:00:00 2001
From: Florin Dinu <fredtux@users.noreply.github.com>
Date: Thu, 12 May 2022 20:50:43 +0300
Subject: [PATCH 1512/1587] Switched asm snippets to snipmate

---
 UltiSnips/asm.snippets | 293 -----------------------------------------
 snippets/asm.snippets  | 195 +++++++++++++++++++++++++++
 2 files changed, 195 insertions(+), 293 deletions(-)
 delete mode 100644 UltiSnips/asm.snippets
 create mode 100644 snippets/asm.snippets

diff --git a/UltiSnips/asm.snippets b/UltiSnips/asm.snippets
deleted file mode 100644
index fca08a65f..000000000
--- a/UltiSnips/asm.snippets
+++ /dev/null
@@ -1,293 +0,0 @@
-snippet scode "Start basic code for assembly" b
-.data
-
-
-.text
-
-
-.global main
-
-
-main:
-
-
-endsnippet
-
-snippet scodes "Start basic code for assembly with _start label" b
-.data
-
-
-.text
-
-
-.globl _start
-
-
-_start:
-
-
-endsnippet
-
-snippet lo "Long" b
-$1: .long $2
-endsnippet
-
-snippet wo "Word" b
-$1: .word $2
-endsnippet
-
-snippet by "Byte" b
-$1: .byte $2
-endsnippet
-
-snippet sp "Space" b
-$1: .space $2
-endsnippet
-
-snippet ai "Ascii" b
-$1: .ascii "$2"
-endsnippet
-
-snippet az "Asciz" b
-$1: .asciz "$2"
-endsnippet
-
-snippet ze "Zero" b
-$1: .zero "$2"
-endsnippet
-
-snippet qu "Quad" b
-$1: .quad "$2"
-endsnippet
-
-snippet si "Single" b
-$1: .single "$2"
-endsnippet
-
-snippet do "Double" b
-$1: .single "$2"
-endsnippet
-snippet fl "Float" b
-$1: .single "$2"
-endsnippet
-
-snippet oc "Octa" b
-$1: .single "$2"
-endsnippet
-
-snippet sh "Short" b
-$1: .single "$2"
-endsnippet
-
-snippet exit0 "Exit without error" b
-# Exit without error
-movl \$1, %eax
-xorl %ebx, %ebx
-int \$0x80
-
-endsnippet
-
-snippet exit "Exit with error" b
-# Exit with error
-mov \$1, %eax
-mov $1, %ebx # Error code
-int \$0x80
-
-endsnippet
-
-snippet readfstdin "Read fixed length text from stdin" b
-# Read fixed length text
-mov \$3, %eax
-mov \$2, %ebx # stdin
-mov $1, %ecx # String
-mov $2, %edx # Lenght
-int \$0x80
-
-endsnippet
-snippet writestdout "Write text to stdout" b
-# Write text
-mov \$4, %eax
-mov \$1, %ebx # stdout
-mov $1, %ecx # String
-mov $2, %edx # Lenght
-int \$0x80
-
-endsnippet
-
-snippet writestderr "Write text to stderr" b
-# Write text
-mov \$4, %eax
-mov \$2, %ebx # stderr
-mov $1, %ecx # String
-mov $2, %edx # Lenght
-int \$0x80
-
-endsnippet
-
-snippet * "Multiplication" b
-# Multiply two number - %eax = %eax * op
-mov $1, %eax
-mul $2
-
-endsnippet
-
-snippet / "Division" b
-# Divide two numbers - %eax(quotinet) + %edx(remainder) = %eax / op
-mov $1, %eax
-div $2
-
-endsnippet
-
-snippet jmpl "Conditional lower jump" b
-cmp $1, $2
-jl $3 # Jump if op2 < op1
-
-endsnippet
-
-snippet jmple "Conditional lower or equal jump" b
-cmp $1, $2
-jle $3 # Jump if op2 <= op1
-
-endsnippet
-
-snippet jmpe "Conditional equal jump" b
-cmp $1, $2
-je $3 # Jump if op2 == op1
-
-endsnippet
-
-snippet jmpn "Conditional not equal jump" b
-cmp $1, $2
-jn $3 # Jump if op2 != op1
-
-endsnippet
-
-snippet jmpg "Conditional greater jump" b
-cmp $1, $2
-jg $3 # Jump if op2 > op1
-
-endsnippet
-
-snippet jmpge "Conditional greater or equal jump" b
-cmp $1, $2
-je $3 # Jump if op2 >= op1
-
-endsnippet
-
-snippet loopn "Loop n times" b
-# Loop for op1 times
-mov $1, %ecx
-
-et_for:
-	# Instructions
-	$2
-
-	# Loop
-	loop et_for
-
-endsnippet
-
-snippet loopnn "Loop n-1 times" b
-# Loop for op1 - 1 times
-mov $1, %ecx
-dec %ecx
-
-et_for:
-	# Instructions
-	$2
-
-	# Loop
-	loop et_for
-
-endsnippet
-
-snippet loopv "Loop through a vector" b
-# Loop through a vector
-lea $1, %edi
-xor %ecx, %ecx
-
-et_for:
-	# Loop until op2
-	cmp %ecx, $2
-	je $3
-
-	# Instructions
-	$4
-
-	inc %ecx
-	jmp et_for
-
-endsnippet
-
-snippet mul "Multiply" b
-xor %edx, %edx
-mov $1, %eax
-mul $2
-endsnippet
-
-snippet mul64 "Multiply numbers greater than 2^32" b
-mov $1, %edx
-mov $2, %eax
-mul $3
-endsnippet
-
-snippet div "Divide" b
-xor %edx, %edx
-mov $1, %eax
-div $2
-endsnippet
-
-snippet div64 "Divide numbers greater than 2^32" b
-mov $1, %edx
-mov $2, %eax
-div $3
-endsnippet
-
-snippet pr "Call printf" b
-pushl $1
-call printf
-popl $2
-endsnippet
-
-snippet sc "Call scanf" b
-pushl $1
-call scanf
-popl $2
-endsnippet
-
-snippet mindex "Current index from a matrix" b
-# Current index from a matrix stored in %eax
-xor %edx, %edx
-movl $1, %eax # line index
-mull $2 # number of columns
-addl $3, %eax # column index
-endsnippet
-
-snippet ffl "Call fflush" b
-pushl \$0
-call fflush
-popl $1
-endsnippet
-
-snippet at "Call atoi" b
-pushl $1
-call atoi
-popl $2
-endsnippet
-
-snippet len "Call strlen" b
-pushl $1
-call strlen
-popl $2
-endsnippet
-
-snippet proc "Basic procedure" b
-$1:
-pushl %ebp
-movl %esp, %ebp
-
-$2
-
-popl %ebp
-ret
-endsnippet
diff --git a/snippets/asm.snippets b/snippets/asm.snippets
new file mode 100644
index 000000000..3c7f70fcd
--- /dev/null
+++ b/snippets/asm.snippets
@@ -0,0 +1,195 @@
+snippet scode Start basic code for assembly
+	.data
+
+
+	.text
+
+
+	.global main
+
+
+	main:
+
+
+snippet scodes Start basic code for assembly with _start label
+	.data
+
+
+	.text
+
+
+	.globl _start
+
+
+	_start:
+
+
+snippet lo Long
+	$1: .long $2
+snippet wo Word
+	$1: .word $2
+snippet by Byte
+	$1: .byte $2
+snippet sp Space
+	$1: .space $2
+snippet ai Ascii
+	$1: .ascii "$2"
+snippet az Asciz
+	$1: .asciz "$2"
+snippet ze Zero
+	$1: .zero "$2"
+snippet qu Quad
+	$1: .quad "$2"
+snippet si Single
+	$1: .single "$2"
+snippet do Double
+	$1: .single "$2"
+snippet fl Float
+	$1: .single "$2"
+snippet oc Octa
+	$1: .single "$2"
+snippet sh Short
+	$1: .single "$2"
+snippet exit0 Exit without error
+	movl \$1, %eax
+	xorl %ebx, %ebx
+	int \$0x80
+
+snippet exit Exit with error
+	mov \$1, %eax
+	mov $1, %ebx
+	int \$0x80
+
+snippet readfstdin Read fixed length text from stdin
+	mov \$3, %eax
+	mov \$2, %ebx
+	mov $1, %ecx
+	mov $2, %edx
+	int \$0x80
+
+snippet writestdout Write text to stdout
+	mov \$4, %eax
+	mov \$1, %ebx
+	mov $1, %ecx
+	mov $2, %edx
+	int \$0x80
+
+snippet writestderr Write text to stderr
+	mov \$4, %eax
+	mov \$2, %ebx
+	mov $1, %ecx
+	mov $2, %edx
+	int \$0x80
+
+snippet * Multiplication
+	mov $1, %eax
+	mul $2
+
+snippet / Division
+	mov $1, %eax
+	div $2
+
+snippet jmpl Conditional lower jump
+	cmp $1, $2
+	jl $3 
+
+snippet jmple Conditional lower or equal jump
+	cmp $1, $2
+	jle $3 
+
+snippet jmpe Conditional equal jump
+	cmp $1, $2
+	je $3 
+
+snippet jmpn Conditional not equal jump
+	cmp $1, $2
+	jn $3
+
+snippet jmpg Conditional greater jump
+	cmp $1, $2
+	jg $3
+
+snippet jmpge Conditional greater or equal jump
+	cmp $1, $2
+	je $3
+
+snippet loopn Loop n times
+	mov $1, %ecx
+
+	et_for:
+		$2
+
+		loop et_for
+
+snippet loopnn Loop n-1 times
+	mov $1, %ecx
+	dec %ecx
+
+	et_for:
+		$2
+
+		loop et_for
+
+snippet loopv Loop through a vector
+	lea $1, %edi
+	xor %ecx, %ecx
+
+	et_for:
+		cmp %ecx, $2
+		je $3
+
+		$4
+
+		inc %ecx
+		jmp et_for
+
+snippet mul Multiply
+	xor %edx, %edx
+	mov $1, %eax
+	mul $2
+snippet mul64 Multiply numbers greater than 2^32
+	mov $1, %edx
+	mov $2, %eax
+	mul $3
+snippet div Divide
+	xor %edx, %edx
+	mov $1, %eax
+	div $2
+snippet div64 Divide numbers greater than 2^32
+	mov $1, %edx
+	mov $2, %eax
+	div $3
+snippet pr Call printf
+	pushl $1
+	call printf
+	popl $2
+snippet sc Call scanf
+	pushl $1
+	call scanf
+	popl $2
+snippet mindex Current index from a matrix
+	xor %edx, %edx
+	movl $1, %eax
+	mull $2
+	addl $3, %eax
+snippet ffl Call fflush
+	pushl \$0
+	call fflush
+	popl $1
+snippet at Call atoi
+	pushl $1
+	call atoi
+	popl $2
+snippet len Call strlen
+	pushl $1
+	call strlen
+	popl $2
+snippet proc Basic procedure
+	$1:
+	pushl %ebp
+	movl %esp, %ebp
+
+	$2
+
+	popl %ebp
+	ret

From 11c771065bfadcc0583b9711d3932c765f168bb4 Mon Sep 17 00:00:00 2001
From: kiryph <kiryph@users.noreply.github.com>
Date: Wed, 25 May 2022 10:52:19 +0200
Subject: [PATCH 1513/1587] Add bar to snippets/tex.snippets

exists already in UltiSnips/tex.snippets
---
 snippets/tex.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index ff94f187b..4437f93ea 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -406,6 +406,10 @@ snippet ddot ddot
 snippet vec vector
 	\\vec{{$1}} {$0}
 
+# Bar
+snippet bar bar
+	\\bar{{$1}} {$0}
+
 # Cross product
 snippet \x cross product
 	\\times {$0}

From 96525d25f05aefe9bdf54c7fb89ccd4e11ca85fc Mon Sep 17 00:00:00 2001
From: sqliuchang <jssqliuchang@gmail.com>
Date: Fri, 10 Jun 2022 14:52:41 +0800
Subject: [PATCH 1514/1587] correct indentation in eql

---
 snippets/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 4437f93ea..e85e95f89 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -63,7 +63,7 @@ snippet eq equation environment
 snippet eql Labeled equation environment
 	\\begin{equation}
 		\\label{eq:${2}}
-	${0:${VISUAL}}
+		${0:${VISUAL}}
 	\\end{equation}
 # Equation
 snippet eq* unnumbered equation environment

From e4310343641e7a75cf7f81b429548eca217b2c5a Mon Sep 17 00:00:00 2001
From: sqliuchang <jssqliuchang@gmail.com>
Date: Fri, 10 Jun 2022 15:40:36 +0800
Subject: [PATCH 1515/1587] add $ as inline math delimiter for tex

---
 UltiSnips/tex.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 3e7e3e8d0..647286f9a 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -217,6 +217,10 @@ snippet inmath "Inline Math" w
 \\(${1}\\) $0
 endsnippet
 
+snippet im "Inline Math $" A
+$$${1}$$ $0
+endsnippet
+
 snippet dm "Display Math" w
 \[
 	${1:${VISUAL}}

From 222cf7b44bb569c9a046a9891000c898bd4c43c9 Mon Sep 17 00:00:00 2001
From: sqliuchang <jssqliuchang@gmail.com>
Date: Fri, 10 Jun 2022 18:14:10 +0800
Subject: [PATCH 1516/1587] Revert "add $ as inline math delimiter for tex"

This reverts commit e4310343641e7a75cf7f81b429548eca217b2c5a.

delete error codes
---
 UltiSnips/tex.snippets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 647286f9a..3e7e3e8d0 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -217,10 +217,6 @@ snippet inmath "Inline Math" w
 \\(${1}\\) $0
 endsnippet
 
-snippet im "Inline Math $" A
-$$${1}$$ $0
-endsnippet
-
 snippet dm "Display Math" w
 \[
 	${1:${VISUAL}}

From 476de3d6bae8806a693df13b67a0464859a00005 Mon Sep 17 00:00:00 2001
From: Sergiu Bivol <sergiu@cip.md>
Date: Tue, 26 Jul 2022 00:53:42 +0100
Subject: [PATCH 1517/1587] Fix mixed indent, add newlines for readability

---
 snippets/python.snippets | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index 9b3798b8b..ace5b5d39 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -12,6 +12,7 @@ snippet uni
 		${0:representation}
 snippet from
 	from ${1:package} import ${0:module}
+
 # Module Docstring
 snippet docs
 	"""
@@ -29,18 +30,22 @@ snippet sk "skip unittests" b
 snippet wh
 	while ${1:condition}:
 		${0:${VISUAL}}
+
 # dowh - does the same as do...while in other languages
 snippet dowh
 	while True:
 		${1}
 		if ${0:condition}:
 			break
+
 snippet with
 	with ${1:expr} as ${2:var}:
 		${0:${VISUAL}}
+
 snippet awith
 	async with ${1:expr} as ${2:var}:
 		${0:${VISUAL}}
+
 # New Class
 snippet cl
 	class ${1:ClassName}(${2:object}):
@@ -52,6 +57,7 @@ snippet cl
 snippet cla
 	class ${1:class_name}:
 		"""${0:description}"""
+
 snippet clai
 	class ${1:class_name}:
 		"""${2:description}"""
@@ -72,6 +78,7 @@ snippet adef
 snippet adeff
 	async def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
 		${0}
+
 # New Method
 snippet defi
 	def __init__(self, ${1:args}):
@@ -108,6 +115,7 @@ snippet ei
 snippet for
 	for ${1:item} in ${2:items}:
 		${0}
+
 # Encodes
 snippet cutf8
 	# -*- coding: utf-8 -*-
@@ -115,15 +123,18 @@ snippet clatin1
 	# -*- coding: latin-1 -*-
 snippet cascii
 	# -*- coding: ascii -*-
+
 # Lambda
 snippet ld
 	${1:var} = lambda ${2:vars} : ${0:action}
+
 snippet ret
 	return ${0}
 snippet .
 	self.
 snippet sa self.attribute = attribute
 	self.${1:attribute} = $1
+
 snippet try Try/Except
 	try:
 		${1:${VISUAL}}
@@ -152,6 +163,7 @@ snippet tryef Try/Except/Else/Finally
 		${5}
 	finally:
 		${0}
+
 # if __name__ == '__main__':
 snippet ifmain
 	if __name__ == '__main__':
@@ -196,9 +208,11 @@ snippet nosetrace
 	__import__('nose').tools.set_trace()
 snippet pprint
 	__import__('pprint').pprint(${1})
+
 snippet "
 	"""${0:doc}
 	"""
+
 # assertions
 snippet a=
 	self.assertEqual(${0}, ${1})
@@ -219,6 +233,7 @@ snippet tgwt
 	# then: ${3}
 snippet fut
 	from __future__ import ${0}
+
 #getopt
 snippet getopt
 	try:
@@ -236,6 +251,7 @@ snippet getopt
 			${0}
 		elif option in ("-v", "--verbose"):
 			verbose = argument
+
 # argparse
 snippet addp
 	parser = ${VISUAL:argparse.}ArgumentParser()
@@ -279,7 +295,7 @@ snippet epydoc
 	"""
 snippet dol
 	def ${1:__init__}(self, *args, **kwargs):
-	    super(${0:ClassName}, self).$1(*args, **kwargs)
+		super(${0:ClassName}, self).$1(*args, **kwargs)
 snippet kwg
 	self.${1:var_name} = kwargs.get('$1', ${2:None})
 snippet lkwg

From c9f667b536e6a9a4fbfa231683a23d4079d6c3bb Mon Sep 17 00:00:00 2001
From: Sergiu Bivol <sergiu@cip.md>
Date: Tue, 26 Jul 2022 00:53:53 +0100
Subject: [PATCH 1518/1587] Add snippets for match and dataclass

---
 snippets/python.snippets | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index ace5b5d39..b8f3822ae 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -63,6 +63,18 @@ snippet clai
 		"""${2:description}"""
 		def __init__(self, ${3:args}):
 			${0}
+
+# Data class
+snippet dcl dataclass
+	@dataclass
+	class ${1:ClassName}:
+		"""${2:description}"""
+		${3:var_1}: ${4:int}
+		${5:var_2}: ${6:float} = ${7:0}
+
+		def ${8:total}(self): -> $6:
+			return ${0:self.$3 * self.$5}
+
 # New Function
 snippet def
 	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
@@ -111,6 +123,23 @@ snippet el
 snippet ei
 	elif ${1:condition}:
 		${0:${VISUAL}}
+
+# Match
+snippet match Structural pattern matching
+	match ${1:expression}:
+		case ${2:pattern_1}:
+			${3:pass}
+		case ${4:pattern_2}:
+			${5:pass}
+
+# Match with wildcard
+snippet matchw Pattern matching with wildcard
+	match ${1:expression}:
+		case ${2:pattern_1}:
+			${3:pass}
+		case _:
+			${0:pass}
+
 # For
 snippet for
 	for ${1:item} in ${2:items}:

From fd547e2317d851a524fa9a4845dbd4c815ba9bd9 Mon Sep 17 00:00:00 2001
From: Sergiu Bivol <sergiu@cip.md>
Date: Tue, 26 Jul 2022 02:50:28 +0100
Subject: [PATCH 1519/1587] Update addon name and URL

---
 addon-info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon-info.json b/addon-info.json
index 303bf2858..22d8f375b 100644
--- a/addon-info.json
+++ b/addon-info.json
@@ -1,8 +1,8 @@
 {
-  "name" : "snipmate-snippets",
+  "name" : "vim-snippets",
   "author" : "community",
   "maintainer" : "honza @ github & others",
-  "repository" : {"type": "git", "url": "git://github.com/honza/snipmate-snippets.git"},
+  "repository" : {"type": "git", "url": "git://github.com/honza/vim-snippets.git"},
   "dependencies" : {
   },
   "description" : "community driven set of snippets for snipmate"

From c5d977c49211883b9241086874fe89c72ae378ca Mon Sep 17 00:00:00 2001
From: Sergiu Bivol <sergiu@cip.md>
Date: Tue, 26 Jul 2022 02:53:03 +0100
Subject: [PATCH 1520/1587] Add snippets for match and dataclass (UltiSnips)

---
 UltiSnips/python.snippets | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index c4afcdc90..dc5761af2 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -343,6 +343,18 @@ write_init_body(args, t[2], snip)
 endsnippet
 
 
+snippet dcl "dataclass" b
+@dataclass
+class ${1:MyClass}:
+	`!p snip.rv = triple_quotes(snip)`${2:Docstring for $1. }`!p snip.rv = triple_quotes(snip)`
+	${3:var_1}: ${4:int}
+	${5:var_2}: ${6:float} = ${7:0}
+
+	def ${8:total}(self): -> $6:
+		return ${0:self.$3 * self.$5}
+endsnippet
+
+
 snippet contain "methods for emulating a container type" b
 def __len__(self):
 	${1:pass}
@@ -603,9 +615,9 @@ $1 = property(**$1(), doc=$1.__doc__)
 endsnippet
 
 
-####################
-# If / Else / Elif #
-####################
+############################
+# If / Else / Elif / Match #
+############################
 snippet if "If" b
 if ${1:condition}:
 	${2:${VISUAL:pass}}
@@ -627,6 +639,22 @@ else:
 	${5:pass}
 endsnippet
 
+snippet match "Structural pattern matching" b
+match ${1:expression}:
+	case ${2:pattern_1}:
+		${3:pass}
+	case ${4:pattern_2}:
+		${0:pass}
+endsnippet
+
+snippet matchw "Pattern matching with wildcard" b
+match ${1:expression}:
+	case ${2:pattern_1}:
+		${3:pass}
+	case _:
+		${0:pass}
+endsnippet
+
 
 ##########################
 # Try / Except / Finally #

From aa52ad401bb1057c6c60d5adf37250bac79ce5fc Mon Sep 17 00:00:00 2001
From: "Hashem A. Damrah" <57925294+SingularisArt@users.noreply.github.com>
Date: Sun, 14 Aug 2022 06:02:33 -0700
Subject: [PATCH 1521/1587] Update lua.snippets

---
 UltiSnips/lua.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/lua.snippets b/UltiSnips/lua.snippets
index 51d8d58d7..de54cdea3 100644
--- a/UltiSnips/lua.snippets
+++ b/UltiSnips/lua.snippets
@@ -104,11 +104,11 @@ snippet local "local x = 1"
 local ${1:x} = ${0:1}
 endsnippet
 
-snippet use "Use" Ab
+snippet use "Use" b
 use { '$1' }
 endsnippet
 
-snippet req "Require"
+snippet req "Require" b
 require('$1')
 endsnippet
 

From 5aa8330b67a0b2e4c759950a9b16a75e5eda9c90 Mon Sep 17 00:00:00 2001
From: kiryph <kiryph@users.noreply.github.com>
Date: Sun, 14 Aug 2022 09:27:26 +0200
Subject: [PATCH 1522/1587] Convert the UltiSnips tex snippet `tmplt` to
 snipmate format

The snippet does not use any features specific to UltiSnips.
Now it is also available for Snipmate, LuaSnip, ... user.
---
 UltiSnips/tex.snippets | 21 ---------------------
 snippets/tex.snippets  | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 3e7e3e8d0..00e910de4 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -454,27 +454,6 @@ snippet docls "Document Class" bA
 \documentclass{$1}$0
 endsnippet
 
-snippet tmplt "Template"
-\documentclass{article}
-
-\usepackage{import}
-\usepackage{pdfpages}
-\usepackage{transparent}
-\usepackage{xcolor}
-$1
-
-\newcommand{\incfig}[2][1]{%
-		\def\svgwidth{#1\columnwidth}
-		\import{./figures/}{#2.pdf_tex}
-}
-$2
-\pdfsuppresswarningpagegroup=1
-
-\begin{document}
-		$0
-\end{document}
-endsnippet
-
 
 #########
 # OTHER #
diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index e85e95f89..25f8f37f7 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -6,6 +6,27 @@ snippet dcl \documentclass{}
 #documentclass with options
 snippet dclo \documentclass[]{}
 	\\documentclass[${1:options}]{${2:class}} ${0}
+
+snippet tmplt "Template"
+	\\documentclass{${1:article}}
+
+	\\usepackage{import}
+	\\usepackage{pdfpages}
+	\\usepackage{transparent}
+	\\usepackage{xcolor}
+	$2
+	
+	\\newcommand{\incfig}[2][1]{%
+		    \def\svgwidth{#1\columnwidth}
+		    \import{./figures/}{#2.pdf_tex}
+	}
+	$3
+	\\pdfsuppresswarningpagegroup=1
+	
+	\\begin{document}
+		    $0
+	\\end{document}
+
 #newcommand
 snippet nc \newcommand
 	\\newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}

From e8a3d1f48bd34f0227f0e1254ce6890fa420f58f Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Mon, 15 Aug 2022 22:57:19 -0400
Subject: [PATCH 1523/1587] Move cursor to the next line after include in C

---
 snippets/c.snippets    | 2 ++
 snippets/html.snippets | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index 2af81e860..570297d3b 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -18,9 +18,11 @@ snippet mainn
 # #include <...>
 snippet inc
 	#include <${1:stdio}.h>
+	$0
 # #include "..."
 snippet Inc
 	#include "${1:`vim_snippets#Filename("$1.h")`}"
+	$0
 # ifndef...define...endif
 snippet ndef
 	#ifndef $1
diff --git a/snippets/html.snippets b/snippets/html.snippets
index 0ec6cd896..bf7170032 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -441,10 +441,9 @@ snippet html5
 			<meta charset="utf-8">
 			<meta name="viewport" content="width=device-width">
 			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
-			${2:link}
 		</head>
 		<body>
-			${0:body}
+			$0
 		</body>
 	</html>
 snippet html5l

From b0bea3e1736abc4febf1560d46bb238c68213c09 Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Fri, 19 Aug 2022 04:21:18 -0400
Subject: [PATCH 1524/1587] Add `exit` snippet for C

---
 snippets/c.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index 570297d3b..89745bdba 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -113,6 +113,8 @@ snippet case
 		${3:break;}
 snippet ret
 	return ${0};
+snippet ex
+	exit($0);
 ##
 ## Loops
 # for

From f9024bdc848b709e7095d3b9a69abee44dd613ce Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Fri, 19 Aug 2022 04:55:42 -0400
Subject: [PATCH 1525/1587] Add `warn` and `err` C snippets

---
 snippets/c.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index 89745bdba..2efb625d1 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -281,6 +281,14 @@ snippet prf
 	printf("${1:} = %f\n", $1);
 snippet prx
 	printf("${1:} = %${2}\n", $1);
+snippet warn
+	warn("${1:%s}"$0);
+snippet warnx
+	warnx("${1:%s}"$0);
+snippet err
+	err(${1:1}, "${2:%s}"$0);
+snippet errx
+	errx(${1:1}, "${2:%s}"$0);
 # getopt
 snippet getopt
 	int choice;

From e3dc360bc37f6db0c905aae1165ce40d78c80ff6 Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Tue, 23 Aug 2022 10:32:38 -0400
Subject: [PATCH 1526/1587] Add `print` function snippets for Python

---
 snippets/python.snippets | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/snippets/python.snippets b/snippets/python.snippets
index b8f3822ae..b980b54c0 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -508,3 +508,16 @@ snippet numeric "methods for emulating a numeric type" b
 	def __coerce__(self, other):
 		${25:pass}
 
+# Printing
+snippet pr
+	print($0)
+snippet prs
+	print("$0")
+snippet prf
+	print(f"$0")
+snippet fpr
+	print($0, file=${1:sys.stderr})
+snippet fprs
+	print("$0", file=${1:sys.stderr})
+snippet fprf
+	print(f"$0", file=${1:sys.stderr})

From 443c2effe4172bcd73bf1a82083d51b7204c101e Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Wed, 24 Aug 2022 22:56:20 -0400
Subject: [PATCH 1527/1587] Improve print and write functions for Lua

---
 snippets/lua.snippets | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/snippets/lua.snippets b/snippets/lua.snippets
index ff6c0619b..ce87bb88b 100644
--- a/snippets/lua.snippets
+++ b/snippets/lua.snippets
@@ -42,5 +42,23 @@ snippet while
 	end
 snippet print
 	print("${1:string}")
+snippet pr
+	print($0)
+snippet prs
+	print("$0")
+snippet prf
+	print(string.format("${1:%s}"$0))
+snippet wr
+	io.write($0)
+snippet wrs
+	io.write("$0")
+snippet wrf
+	io.write(string.format("${1:%s}"$0))
+snippet fwr
+	io.${1:stderr}:write($0)
+snippet fwrs
+	io.${1:stderr}:write("$0")
+snippet fwrf
+	io.${1:stderr}:write(string.format("${2:%s}"$0))
 snippet im
 	import "${1:import file}"

From 83a7d05725d6b5019b92c9b2af69d9ab7150a315 Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Fri, 26 Aug 2022 20:33:30 -0400
Subject: [PATCH 1528/1587] Redefine `mainn` snippet for C++ without `void`

---
 snippets/cpp.snippets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 5d99f3d65..46e9ec7ec 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -1,5 +1,14 @@
+priority 2
 extends c
 
+## Main
+# main()
+snippet mainn
+	int main()
+	{
+		${0}
+		return 0;
+	}
 ##
 ## Preprocessor
 # #include <...>

From 962b8ea77800cf118d3fcbbb6be1562d834ab111 Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Sat, 27 Aug 2022 13:17:18 -0400
Subject: [PATCH 1529/1587] Improve POSIX-compliant shell snippets

---
 snippets/bash.snippets | 25 +++++++++++++++++++++++++
 snippets/sh.snippets   |  8 ++++----
 snippets/zsh.snippets  |  5 ++++-
 3 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 snippets/bash.snippets

diff --git a/snippets/bash.snippets b/snippets/bash.snippets
new file mode 100644
index 000000000..973483c48
--- /dev/null
+++ b/snippets/bash.snippets
@@ -0,0 +1,25 @@
+extends sh
+
+# Shebang
+snippet #!
+	#!/usr/bin/env bash
+
+snippet s#!
+	#!/usr/bin/env bash
+	set -eu
+
+snippet if
+	if [[ ${1:condition} ]]; then
+		${0:${VISUAL}}
+	fi
+snippet elif
+	elif [[ ${1:condition} ]]; then
+		${0:${VISUAL}}
+snippet wh
+	while [[ ${1:condition} ]]; do
+		${0:${VISUAL}}
+	done
+snippet until
+	until [[ ${1:condition} ]]; do
+		${0:${VISUAL}}
+	done
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index b92ae952c..77ddc0829 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -18,11 +18,11 @@ snippet sbash
 	IFS=$'\n\t'
 
 snippet if
-	if [[ ${1:condition} ]]; then
+	if [ ${1:condition} ]; then
 		${0:${VISUAL}}
 	fi
 snippet elif
-	elif [[ ${1:condition} ]]; then
+	elif [ ${1:condition} ]; then
 		${0:${VISUAL}}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
@@ -33,11 +33,11 @@ snippet fori
 		${0:${VISUAL}}
 	done
 snippet wh
-	while [[ ${1:condition} ]]; do
+	while [ ${1:condition} ]; do
 		${0:${VISUAL}}
 	done
 snippet until
-	until [[ ${1:condition} ]]; do
+	until [ ${1:condition} ]; do
 		${0:${VISUAL}}
 	done
 snippet case
diff --git a/snippets/zsh.snippets b/snippets/zsh.snippets
index a8173c268..abfe6656d 100644
--- a/snippets/zsh.snippets
+++ b/snippets/zsh.snippets
@@ -1,6 +1,9 @@
 # #!/bin/zsh
+priority 1
+extends bash
+
 snippet #!
-	#!/bin/zsh
+	#!/usr/bin/env zsh
 
 snippet if
 	if ${1:condition}; then

From 0a8952865e49694640fb6002193dfbc5f6180ffa Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Sun, 28 Aug 2022 19:03:25 -0400
Subject: [PATCH 1530/1587] Remove all mentions of `priority`

---
 snippets/cpp.snippets | 1 -
 snippets/zsh.snippets | 1 -
 2 files changed, 2 deletions(-)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 46e9ec7ec..4e4155a82 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -1,4 +1,3 @@
-priority 2
 extends c
 
 ## Main
diff --git a/snippets/zsh.snippets b/snippets/zsh.snippets
index abfe6656d..63061fe8e 100644
--- a/snippets/zsh.snippets
+++ b/snippets/zsh.snippets
@@ -1,5 +1,4 @@
 # #!/bin/zsh
-priority 1
 extends bash
 
 snippet #!

From 1bc95cea003f3459388a997dc3f8c68f975048a5 Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Mon, 29 Aug 2022 15:03:22 -0400
Subject: [PATCH 1531/1587] Add nvim-snippy and LuaSnip to snippet engines

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index c8a242a30..8b31f770b 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,12 @@ snippets by typing the name of a snippet hitting the expansion mapping.
   snippets/*
 - [github.com/Shougo/neosnippet](https://github.com/Shougo/neosnippet.vim):
   VimL, supports snippets/* with some configuration.
+- [github.com/dcampos/nvim-snippy](https://github.com/dcampos/nvim-snippy):
+  Lua, supports snippets/* with some configuration.
+- [github.com/L3MON4D3/LuaSnip](https://github.com/L3MON4D3/LuaSnip):
+  Lua, supports snippets/* with some configuration.
+  Also supports redefining snippets without changing the priority, unlike
+  nvim-snippy.
 - [github.com/drmingdrmer/xptemplate](https://github.com/drmingdrmer/xptemplate):
   Totally different syntax, does not read snippets contained in this file, but
   it is also very powerful. It does not support vim-snippets (just listing it
@@ -46,6 +52,9 @@ If you have VimL only (vim without python support) your best option is using
 [garbas/vim-snipmate](https://github.com/garbas/vim-snipmate) and cope with the
 minor bugs found in the engine.
 
+If you use Neovim and prefer Lua plugins,
+[L3MON4D3/LuaSnip](https://github.com/L3MON4D3/LuaSnip) is the best option.
+
 **Q**: Should snipMate be deprecated in favour of UltiSnips?
 
 **A**: No, because snipMate is VimL, and UltiSnips requires Python.

From 487b31e22c61f4d7549bb5997929c377246541c9 Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Tue, 30 Aug 2022 02:57:23 -0400
Subject: [PATCH 1532/1587] Create `all.snippets`

LuaSnip uses `all` instead of `_` for global snippets.
---
 snippets/all.snippets | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 snippets/all.snippets

diff --git a/snippets/all.snippets b/snippets/all.snippets
new file mode 100644
index 000000000..2f2765286
--- /dev/null
+++ b/snippets/all.snippets
@@ -0,0 +1 @@
+extends _

From 569c72257910b5b6f5e915b46d0978f73dbfa90a Mon Sep 17 00:00:00 2001
From: Amar Al-Zubaidi <92645199+amarakon@users.noreply.github.com>
Date: Tue, 30 Aug 2022 01:17:11 -0400
Subject: [PATCH 1533/1587] c: Do not `return 0` in the `main` function

---
 snippets/c.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index 2efb625d1..fbeae6cd9 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -4,14 +4,12 @@ snippet main
 	int main(int argc, char *argv[])
 	{
 		${0}
-		return 0;
 	}
 # main(void)
 snippet mainn
 	int main(void)
 	{
 		${0}
-		return 0;
 	}
 ##
 ## Preprocessor

From 026d8b2698a76c0e0c2f139018e2458fe512029e Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Tue, 30 Aug 2022 14:30:36 -0400
Subject: [PATCH 1534/1587] Support `while true` loops

For `while` loops in several languages, the default condition is true.
Snippets called `wht` are also added in which the condition is true.
---
 snippets/c.snippets                     | 6 +++++-
 snippets/java.snippets                  | 4 +++-
 snippets/javascript/javascript.snippets | 6 +++++-
 snippets/lua.snippets                   | 8 ++++++++
 snippets/r.snippets                     | 8 ++++++--
 snippets/rust.snippets                  | 6 +++++-
 snippets/sh.snippets                    | 4 ++++
 7 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index fbeae6cd9..f4db58a3c 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -127,7 +127,11 @@ snippet forr
 	}
 # while
 snippet wh
-	while (${1:/* condition */}) {
+	while (${1:1}) {
+		${0:${VISUAL}}
+	}
+snippet wht
+	while (true) {
 		${0:${VISUAL}}
 	}
 # do... while
diff --git a/snippets/java.snippets b/snippets/java.snippets
index 739f20b70..997089774 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -211,7 +211,9 @@ snippet enfor
 snippet for
 	for (${1}; ${2}; ${3}) ${0}
 snippet wh
-	while (${1}) ${0}
+	while (${1:true}) ${0}
+snippet wht
+	while (true) ${0}
 ##
 ## Main method
 snippet psvm
diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index 78c651ebd..b34495c4b 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -107,7 +107,11 @@ snippet forr "reversed for (...) {...}"
 		${0:${VISUAL}}
 	}
 snippet wh "(condition) { ... }"
-	while (${1:/* condition */}) {
+	while (${1:true}) {
+		${0:${VISUAL}}
+	}
+snippet wht "(true) { ... }"
+	while (true) {
 		${0:${VISUAL}}
 	}
 snippet do "do { ... } while (condition)"
diff --git a/snippets/lua.snippets b/snippets/lua.snippets
index ce87bb88b..868f2f62a 100644
--- a/snippets/lua.snippets
+++ b/snippets/lua.snippets
@@ -40,6 +40,14 @@ snippet while
 	while ${1:condition} do
 		${0:--body}
 	end
+snippet wh
+	while ${1:true} do
+		${0}
+	end
+snippet wht
+	while true do
+		${0}
+	end
 snippet print
 	print("${1:string}")
 snippet pr
diff --git a/snippets/r.snippets b/snippets/r.snippets
index 9dbe0f39d..c3953bfc5 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -25,8 +25,12 @@ snippet ei
 
 # loops
 snippet wh
-	while(${1}) {
-		${2}
+	while(${1:true}) {
+		${0}
+	}
+snippet wht
+	while(true) {
+		${0}
 	}
 snippet for
 	for (${1:item} in ${2:list}) {
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 5e9eb2b18..afc312648 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -147,7 +147,11 @@ snippet loop "loop {}" b
 		${0:${VISUAL}}
 	}
 snippet wh "while loop"
-	while ${1:condition} {
+	while ${1:true} {
+		${0:${VISUAL}}
+	}
+snippet wht "forever loop"
+	while true {
 		${0:${VISUAL}}
 	}
 snippet whl "while let (...)"
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 77ddc0829..9c7573327 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -36,6 +36,10 @@ snippet wh
 	while [ ${1:condition} ]; do
 		${0:${VISUAL}}
 	done
+snippet wht
+	while true; do
+		${0:${VISUAL}}
+	done
 snippet until
 	until [ ${1:condition} ]; do
 		${0:${VISUAL}}

From a6d2976f05cf31da5f4ebceb4b6f9fe2e0ec7c34 Mon Sep 17 00:00:00 2001
From: Amar Al-Zubaidi <92645199+amarakon@users.noreply.github.com>
Date: Wed, 31 Aug 2022 14:52:45 -0400
Subject: [PATCH 1535/1587] Fix mistake in `rust.snippets`

Rust uses `loop` instead of `while true` for forever loops.
---
 snippets/rust.snippets | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index afc312648..5e9eb2b18 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -147,11 +147,7 @@ snippet loop "loop {}" b
 		${0:${VISUAL}}
 	}
 snippet wh "while loop"
-	while ${1:true} {
-		${0:${VISUAL}}
-	}
-snippet wht "forever loop"
-	while true {
+	while ${1:condition} {
 		${0:${VISUAL}}
 	}
 snippet whl "while let (...)"

From b34243e79bce3eda0d7c1afdc3b1135cbb598307 Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Thu, 1 Sep 2022 16:27:37 -0400
Subject: [PATCH 1536/1587] Improve Markdown and R Markdown snippets

---
 snippets/markdown.snippets | 24 +++++++++++----
 snippets/rmd.snippets      | 60 ++------------------------------------
 2 files changed, 20 insertions(+), 64 deletions(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index 364066cfa..39ccecd76 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -67,17 +67,21 @@ snippet <*
 	<`@*`>
 snippet <c
 	<`@+`>
-snippet **
-	**${1:bold}**
-snippet __
-	__${1:bold}__
-snippet ===
+snippet ** Bold
+	**$0**
+snippet __ Bold
+	__$0__
+snippet --- Front matter
+	---
+	$0
+	---
+snippet ====
 	`repeat('=', strlen(getline(line('.') - 3)))`
 
 	${0}
 snippet -
 	-   ${0}
-snippet ---
+snippet ----
 	`repeat('-', strlen(getline(line('.') - 3)))`
 
 	${0}
@@ -142,3 +146,11 @@ snippet pullquote
 	{% pullquote %}
 	${1:text} {" ${2:quote} "} ${0:text}
 	{% endpullquote %}
+
+# Definition lists
+snippet : Definition list
+	$1
+	: $0
+snippet :: Alternate definition list
+	$1
+	  - $0
diff --git a/snippets/rmd.snippets b/snippets/rmd.snippets
index 96b0ea0e4..bfaaefd76 100644
--- a/snippets/rmd.snippets
+++ b/snippets/rmd.snippets
@@ -6,6 +6,8 @@
 # vim's `"*` register---i.e., the contents of the
 # system clipboard---to insert text.
 
+extends markdown
+
 # Insert Title Block
 snippet %%
 	% ${1:`Filename('', 'title')`}
@@ -20,64 +22,6 @@ snippet %%*
 
 	${4}
 
-# Insert Definition List
-snippet ::
-	${1:term}
-	  ~  ${2:definition}
-
-# Underline with `=`s or `-`s
-snippet ===
-	`repeat('=', strlen(getline(line(".") - 1)))`
-	
-	${1}
-snippet ---
-	`repeat('-', strlen(getline(line(".") - 1)))`
-	
-	${1}
-
-# Links and their kin
-# -------------------
-#
-# (These don't play very well with delimitMate)
-#
-
-snippet [
-	[${1:link}](http://${2:url} "${3:title}")${4}
-snippet [*
-	[${1:link}](${2:`@*`} "${3:title}")${4}
-
-snippet [:
-	[${1:id}]: http://${2:url} "${3:title}"
-snippet [:*
-	[${1:id}]: ${2:`@*`} "${3:title}"
-
-snippet [@
-	[${1:link}](mailto:${2:email})${3}
-snippet [@*
-	[${1:link}](mailto:${2:`@*`})${3}
-
-snippet [:@
-	[${1:id}]: mailto:${2:email} "${3:title}"
-snippet [:@*
-	[${1:id}]: mailto:${2:`@*`} "${3:title}"
-
-snippet ![
-	![${1:alt}](${2:url} "${3:title}")${4}
-snippet ![*
-	![${1:alt}](${2:`@*`} "${3:title}")${4}
-
-snippet ![:
-	![${1:id}]: ${2:url} "${3:title}"
-snippet ![:*
-	![${1:id}]: ${2:`@*`} "${3:title}"
-
-snippet [^:
-	[^${1:id}]: ${2:note}
-snippet [^:*
-	[^${1:id}]: ${2:`@*`}
-
-#
-
 # library()
 snippet req
 	require(${1:}, quietly = TRUE)

From 0ad1efb34ea81c34131faea8fdf1d68ecededa11 Mon Sep 17 00:00:00 2001
From: Amar Al-Zubaidi <92645199+amarakon@users.noreply.github.com>
Date: Thu, 1 Sep 2022 16:32:47 -0400
Subject: [PATCH 1537/1587] `pandoc`: delete an extra line

---
 snippets/pandoc.snippets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snippets/pandoc.snippets b/snippets/pandoc.snippets
index 1dd9e82eb..c94e53432 100644
--- a/snippets/pandoc.snippets
+++ b/snippets/pandoc.snippets
@@ -1,2 +1 @@
 extends markdown
-

From 0d65141fb7512618651b307c561dda135db7c323 Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Mon, 5 Sep 2022 13:14:55 -0400
Subject: [PATCH 1538/1587] `sh`: `#!/usr/bin/env sh` -> `#!/bin/sh`

`#!/bin/sh` is actually more portable than `#!/usr/bin/env sh`.
---
 snippets/sh.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 9c7573327..75d51b9d2 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -1,9 +1,9 @@
-# Shebang. Executing bash via /usr/bin/env makes scripts more portable.
+# Shebang
 snippet #!
-	#!/usr/bin/env sh
+	#!/bin/sh
 
 snippet s#!
-	#!/usr/bin/env sh
+	#!/bin/sh
 	set -eu
 
 snippet safe

From 2058ac6d2da18ee06cad6513f9c5c2d211f03493 Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Mon, 5 Sep 2022 19:07:21 -0400
Subject: [PATCH 1539/1587] Remove unnecessary placeholder text

---
 snippets/actionscript.snippets          |  7 +++----
 snippets/arduino.snippets               | 10 +++++-----
 snippets/autoit.snippets                | 12 ++++++------
 snippets/bash.snippets                  |  8 ++++----
 snippets/c.snippets                     |  8 ++++----
 snippets/codeigniter.snippets           |  2 +-
 snippets/coffee/coffee.snippets         | 16 +++++++--------
 snippets/crystal.snippets               | 12 ++++++------
 snippets/dart.snippets                  |  6 +++---
 snippets/elixir.snippets                | 12 ++++++------
 snippets/falcon.snippets                |  6 +++---
 snippets/fortran.snippets               |  4 ++--
 snippets/go.snippets                    |  4 ++--
 snippets/haml.snippets                  |  4 ++--
 snippets/htmltornado.snippets           |  6 +++---
 snippets/java.snippets                  |  4 ++--
 snippets/javascript/javascript.snippets |  6 +++---
 snippets/liquid.snippets                | 24 +++++++++++------------
 snippets/lpc.snippets                   |  8 ++++----
 snippets/ls.snippets                    | 10 +++++-----
 snippets/lua.snippets                   | 10 +++++-----
 snippets/mako.snippets                  |  4 ++--
 snippets/perl.snippets                  | 10 +++++-----
 snippets/perl6.snippets                 |  8 ++++----
 snippets/php.snippets                   |  4 ++--
 snippets/processing.snippets            |  2 +-
 snippets/ps1.snippets                   | 12 ++++++------
 snippets/python.snippets                |  8 ++++----
 snippets/r.snippets                     |  4 ++--
 snippets/rmd.snippets                   |  4 ++--
 snippets/ruby.snippets                  | 26 ++++++++++++-------------
 snippets/rust.snippets                  |  2 +-
 snippets/sass.snippets                  |  6 +++---
 snippets/scss.snippets                  |  6 +++---
 snippets/sh.snippets                    |  8 ++++----
 snippets/yii.snippets                   | 22 ++++++++++-----------
 snippets/zsh.snippets                   | 10 +++++-----
 37 files changed, 157 insertions(+), 158 deletions(-)

diff --git a/snippets/actionscript.snippets b/snippets/actionscript.snippets
index 5d7443902..e4b8c93bf 100644
--- a/snippets/actionscript.snippets
+++ b/snippets/actionscript.snippets
@@ -114,7 +114,7 @@ snippet forr
 	}
 # If Condition
 snippet if
-	if (${1:/* condition */}) {
+	if ($1) {
 		${0:${VISUAL}}
 	}
 snippet el
@@ -122,8 +122,8 @@ snippet el
 		${0:${VISUAL}}
 	}
 # Ternary conditional
-snippet t
-	${1:/* condition */} ? ${2:a} : ${0:b}
+snippet t Ternary: `condition ? true : false`
+	$1 ? $2 : $0
 snippet fun
 	function ${1:function_name}(${2})${3}
 	{
@@ -150,4 +150,3 @@ snippet FlxSprite
 			}
 		}
 	}
-
diff --git a/snippets/arduino.snippets b/snippets/arduino.snippets
index a2732a5e9..7a59a30de 100644
--- a/snippets/arduino.snippets
+++ b/snippets/arduino.snippets
@@ -19,7 +19,7 @@ snippet def
 
 # if
 snippet if
-	if (${1:/* condition */}) {
+	if ($1) {
 		${0:${VISUAL}}
 	}
 # else
@@ -29,12 +29,12 @@ snippet el
 	}
 # else if
 snippet elif
-	else if (${1:/* condition */}) {
+	else if ($1) {
 		${2}
 	}
 # ifi
 snippet ifi
-	if (${1:/* condition */}) ${2};
+	if ($1) ${2};
 
 # switch
 snippet switch
@@ -63,14 +63,14 @@ snippet forr
 	}
 # while
 snippet wh
-	while (${1:/* condition */}) {
+	while ($1) {
 		${2}
 	}
 # do... while
 snippet do
 	do {
 		${2}
-	} while (${1:/* condition */});
+	} while ($1);
 ##
 ## Functions
 # function definition
diff --git a/snippets/autoit.snippets b/snippets/autoit.snippets
index f973fbc37..48713e577 100644
--- a/snippets/autoit.snippets
+++ b/snippets/autoit.snippets
@@ -1,16 +1,16 @@
 snippet if
-	If ${1:condition} Then
+	If $1 Then
 		${0:; True code}
 	EndIf
 snippet el
 	Else
 		${0}
 snippet eif
-	ElseIf ${1:condition} Then
+	ElseIf $1 Then
 		${0:; True code}
 # If/Else block
 snippet ife
-	If ${1:condition} Then
+	If $1 Then
 		${2:; True code}
 	Else
 		${0:; Else code}
@@ -26,7 +26,7 @@ snippet ifelif
 	EndIf
 # Switch block
 snippet switch
-	Switch (${1:condition})
+	Switch ($1)
 	Case ${2:case1}:
 		${3:; Case 1 code}
 	Case Else:
@@ -34,7 +34,7 @@ snippet switch
 	EndSwitch
 # Select block
 snippet select
-	Select (${1:condition})
+	Select ($1)
 	Case ${2:case1}:
 		${3:; Case 1 code}
 	Case Else:
@@ -42,7 +42,7 @@ snippet select
 	EndSelect
 # While loop
 snippet wh
-	While (${1:condition})
+	While ($1)
 		${0:; code...}
 	WEnd
 # For loop
diff --git a/snippets/bash.snippets b/snippets/bash.snippets
index 973483c48..65b07072a 100644
--- a/snippets/bash.snippets
+++ b/snippets/bash.snippets
@@ -9,17 +9,17 @@ snippet s#!
 	set -eu
 
 snippet if
-	if [[ ${1:condition} ]]; then
+	if [[ $1 ]]; then
 		${0:${VISUAL}}
 	fi
 snippet elif
-	elif [[ ${1:condition} ]]; then
+	elif [[ $1 ]]; then
 		${0:${VISUAL}}
 snippet wh
-	while [[ ${1:condition} ]]; do
+	while [[ $1 ]]; do
 		${0:${VISUAL}}
 	done
 snippet until
-	until [[ ${1:condition} ]]; do
+	until [[ $1 ]]; do
 		${0:${VISUAL}}
 	done
diff --git a/snippets/c.snippets b/snippets/c.snippets
index f4db58a3c..df5595b9e 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -86,8 +86,8 @@ snippet elif
 snippet ifi
 	if (${1:true}) ${0};
 # ternary
-snippet t
-	${1:/* condition */} ? ${2:a} : ${3:b}
+snippet t Ternary: `condition ? true : false`
+	$1 ? $2 : $0
 # switch
 snippet switch
 	switch (${1:/* variable */}) {
@@ -138,7 +138,7 @@ snippet wht
 snippet do
 	do {
 		${0:${VISUAL}}
-	} while (${1:/* condition */});
+	} while ($1);
 ##
 ## Functions
 # function definition
@@ -351,7 +351,7 @@ snippet getopt
 
 ## Assertions
 snippet asr
-	assert(${1:condition});
+	assert($1);
 
 snippet anl
 	assert(${1:ptr} != NULL);
diff --git a/snippets/codeigniter.snippets b/snippets/codeigniter.snippets
index c38aa4dbd..afaf9638c 100644
--- a/snippets/codeigniter.snippets
+++ b/snippets/codeigniter.snippets
@@ -99,7 +99,7 @@ snippet ci_db-select
 snippet ci_db-from
 	$this->db->from("${1:table}");${2}
 snippet ci_db-join
-	$this->db->join("${1:table}", "${2:condition}", "${3:type}");${4}
+	$this->db->join("${1:table}", "$2", "${3:type}");${4}
 snippet ci_db-where
 	$this->db->where("${1:key}", "${2:value}");${3}
 snippet ci_db-or_where
diff --git a/snippets/coffee/coffee.snippets b/snippets/coffee/coffee.snippets
index f23156cc8..76a822f25 100644
--- a/snippets/coffee/coffee.snippets
+++ b/snippets/coffee/coffee.snippets
@@ -54,24 +54,24 @@ snippet cla class .. extends .. constructor: ..
 		${0}
 # If
 snippet if
-	if ${1:condition}
+	if $1
 		${0:${VISUAL}}
 # If __ Else
 snippet ife
-	if ${1:condition}
+	if $1
 		${2:${VISUAL}}
 	else
-		${0:# body...}
+		${0}
 # Else if
 snippet eif
-	else if ${1:condition}
+	else if $1
 		${0:${VISUAL}}
 # Ternary If
-snippet ifte
-	if ${1:condition} then ${2:value} else ${0:other}
+snippet ifte Ternary
+	if $1 then $2 else $0
 # Unless
-snippet unl
-	${1:action} unless ${0:condition}
+snippet unl Unless
+	$1 unless $0
 # Switch
 snippet swi
 	switch ${1:object}
diff --git a/snippets/crystal.snippets b/snippets/crystal.snippets
index 34d254065..a5848f88e 100644
--- a/snippets/crystal.snippets
+++ b/snippets/crystal.snippets
@@ -1,12 +1,12 @@
 snippet req require
 	require "${1}"
 snippet case
-	case ${1:object}
-	when ${2:condition}
+	case $1
+	when $2
 		${0}
 	end
 snippet when
-	when ${1:condition}
+	when $1
 		${0}
 snippet def
 	def ${1:method_name}
@@ -17,17 +17,17 @@ snippet pdef
 		${0}
 	end
 snippet if
-	if ${1:condition}
+	if $1
 		${0:${VISUAL}}
 	end
 snippet ife
-	if ${1:condition}
+	if $1
 		${2:${VISUAL}}
 	else
 		${0}
 	end
 snippet wh
-	while ${1:condition}
+	while $1
 		${0:${VISUAL}}
 	end
 snippet cla class .. end
diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index de5cb6239..f4fd4f13e 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -61,15 +61,15 @@ snippet fore
 	  ${0}
 	}
 snippet wh
-	while (${1:/* condition */}) {
+	while ($1) {
 	  ${0}
 	}
 snippet dowh
 	do {
 	  ${0}
-	} while (${0:/* condition */});
+	} while ($0);
 snippet as
-	assert(${0:/* condition */});
+	assert($0);
 snippet try
 	try {
 	  ${0:${VISUAL}}
diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index ee093eb9c..c04c9ade6 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -13,29 +13,29 @@ snippet if if .. do .. end
 		${0:${VISUAL}}
 	end
 snippet if: if .. do: ..
-	if ${1:condition}, do: ${0}
+	if $1, do: ${0}
 snippet ife if .. do .. else .. end
-	if ${1:condition} do
+	if $1 do
 		${2:${VISUAL}}
 	else
 		${0}
 	end
 snippet ife: if .. do: .. else:
-	if ${1:condition}, do: ${2}, else: ${0}
+	if $1, do: ${2}, else: ${0}
 snippet unless unless .. do .. end
 	unless ${1} do
 		${0:${VISUAL}}
 	end
 snippet unless: unless .. do: ..
-	unless ${1:condition}, do: ${0}
+	unless $1, do: ${0}
 snippet unlesse unless .. do .. else .. end
-	unless ${1:condition} do
+	unless $1 do
 		${2:${VISUAL}}
 	else
 		${0}
 	end
 snippet unlesse: unless .. do: .. else:
-	unless ${1:condition}, do: ${2}, else: ${0}
+	unless $1, do: ${2}, else: ${0}
 snippet cond
 	cond do
 		${1} ->
diff --git a/snippets/falcon.snippets b/snippets/falcon.snippets
index c523980d6..5894fe1c3 100644
--- a/snippets/falcon.snippets
+++ b/snippets/falcon.snippets
@@ -19,13 +19,13 @@ snippet class
 
 # If
 snippet if
-	if ${1:condition}
+	if $1
 		${0}
 	end
 
 # If else
 snippet ife
-	if ${1:condition}
+	if $1
 		${0}
 	else
 	    ${1}
@@ -33,7 +33,7 @@ snippet ife
 
 # If else if
 snippet eif
-	elif ${1:condition}
+	elif $1
 		${0}
 
 # Switch case
diff --git a/snippets/fortran.snippets b/snippets/fortran.snippets
index 8cb6f9a75..a073424e4 100644
--- a/snippets/fortran.snippets
+++ b/snippets/fortran.snippets
@@ -64,7 +64,7 @@ snippet intent
 snippet /
 	(/ $1 /) ${2:,&} ${0}
 snippet if
-	if (${1:condition}) then
+	if ($1) then
 		${0}
 	end if
 snippet case
@@ -78,7 +78,7 @@ snippet do
 		${0}
 	end do
 snippet dow
-	do while (${1:condition})
+	do while ($1)
 		$2
 	end do
 snippet sub
diff --git a/snippets/go.snippets b/snippets/go.snippets
index 722e82fd4..7245252c6 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -64,13 +64,13 @@ snippet inf "full interface "
 	}
 
 snippet if "if condition"
-	if ${1:/* condition */} {
+	if $1 {
 		${2:${VISUAL}}
 	}
 
 
 snippet ife "if else condition"
-	if ${1:/* condition */} {
+	if $1 {
 		${2:${VISUAL}}
 	} else {
 		${0}
diff --git a/snippets/haml.snippets b/snippets/haml.snippets
index b1feaa51f..798c555ee 100644
--- a/snippets/haml.snippets
+++ b/snippets/haml.snippets
@@ -26,12 +26,12 @@ snippet mt
 snippet mts
 	= mail_to ${1:email_address}, ${2:name}, :subject => ${3}, :body => ${4}
 snippet ife
-	- if ${1:condition}
+	- if $1
 		${2:${VISUAL}}
 	- else
 		${0}
 snippet ifp
-	- if ${1:condition}.presence?
+	- if $1.presence?
 		${0:${VISUAL}}
 snippet ntc
 	= number_to_currency(${1})
diff --git a/snippets/htmltornado.snippets b/snippets/htmltornado.snippets
index 1620e11da..5dd81555e 100644
--- a/snippets/htmltornado.snippets
+++ b/snippets/htmltornado.snippets
@@ -24,11 +24,11 @@ snippet for
 snippet from
 	{% from ${1:x} import ${0:y} %}
 snippet if
-	{% if ${1:condition} %}
+	{% if $1 %}
 	  ${0}
 	{% end %}
 snippet eif
-	{% elif ${0:condition} %}
+	{% elif $0 %}
 snippet el
 	{% else %}
 snippet import
@@ -50,6 +50,6 @@ snippet try
 	  ${0}
 	{% end %}
 snippet wh
-	{% while ${1:condition} %}
+	{% while $1 %}
 	  ${0}
 	{% end %}
diff --git a/snippets/java.snippets b/snippets/java.snippets
index 997089774..d3e69684e 100644
--- a/snippets/java.snippets
+++ b/snippets/java.snippets
@@ -142,9 +142,9 @@ snippet ae
 snippet aae
 	assertArrayEquals("${1:Failure message}", ${2:expecteds}, ${3:actuals});
 snippet af
-	assertFalse("${1:Failure message}", ${2:condition});
+	assertFalse("${1:Failure message}", $2);
 snippet at
-	assertTrue("${1:Failure message}", ${2:condition});
+	assertTrue("${1:Failure message}", $2);
 snippet an
 	assertNull("${1:Failure message}", ${2:object});
 snippet ann
diff --git a/snippets/javascript/javascript.snippets b/snippets/javascript/javascript.snippets
index b34495c4b..de1ca113b 100644
--- a/snippets/javascript/javascript.snippets
+++ b/snippets/javascript/javascript.snippets
@@ -62,8 +62,8 @@ snippet ife "if (condition) { ... } else { ... }"
 		${2}
 	}
 # tertiary conditional
-snippet ter
-	${1:/* condition */} ? ${2:/* if true */} : ${0:/* if false */}
+snippet ter Ternary: `condition ? true : false`
+	$1 ? $2: $0
 # switch
 snippet switch
 	switch (${1:expression}) {
@@ -117,7 +117,7 @@ snippet wht "(true) { ... }"
 snippet do "do { ... } while (condition)"
 	do {
 		${0:${VISUAL}}
-	} while (${1:/* condition */});
+	} while ($1);
 # For in loop
 snippet fori
 	for (let ${1:prop} in ${2:object}) {
diff --git a/snippets/liquid.snippets b/snippets/liquid.snippets
index 72a78d0e4..e12bf0604 100644
--- a/snippets/liquid.snippets
+++ b/snippets/liquid.snippets
@@ -2,32 +2,32 @@
 # https://marketplace.visualstudio.com/items?itemName=killalau.vscode-liquid-snippets
 
 snippet if
-	{% if ${1:condition} %}
+	{% if $1 %}
 		${0:${VISUAL}}
 	{% endif %}
 snippet else
 	{% else %}
 snippet elsif
-	{% elsif ${1:condition} %}
+	{% elsif $1 %}
 snippet ifelse
-	{% if ${1:condition} %}
+	{% if $1 %}
 		${2}
 	{% else %}
 		${0}
 	{% endif %}
 snippet unless
-	{% unless ${1:condition} %}
+	{% unless $1 %}
 		${0:${VISUAL}}
 	{% endunless %}
 snippet case
 	{% case ${1:variable} %}
-		{% when ${2:condition} %}
+		{% when $2 %}
 			${3}
 		{% else %}
 			${0}
 	{% endcase %}
 snippet when
-	{% when ${1:condition} %}
+	{% when $1 %}
 		${0:${VISUAL}}
 snippet cycle
 	{% cycle '${1:odd}', '${2:even}' %}
@@ -102,32 +102,32 @@ snippet javascript
 snippet comment-
 	{%- comment -%}${0:${VISUAL}}{%- endcomment -%}
 snippet if-
-	{%- if ${1:condition} -%}
+	{%- if $1 -%}
 		${0:${VISUAL}}
 	{%- endif -%}
 snippet else-
 	{%- else -%}
 snippet elsif-
-	{%- elsif ${1:condition} -%}
+	{%- elsif $1 -%}
 snippet ifelse-
-	{%- if ${1:condition} -%}
+	{%- if $1 -%}
 		${2}
 	{%- else -%}
 		${0}
 	{%- endif -%}
 snippet unless-
-	{%- unless ${1:condition} -%}
+	{%- unless $1 -%}
 		${0:${VISUAL}}
 	{%- endunless -%}
 snippet case-
 	{%- case ${1:variable} -%}
-		{%- when ${2:condition} -%}
+		{%- when $2 -%}
 			${3}
 		{%- else -%}
 			${0}
 	{%- endcase -%}
 snippet when-
-	{%- when ${1:condition} -%}
+	{%- when $1 -%}
 		${0:${VISUAL}}
 snippet cycle-
 	{%- cycle '${1:odd}', '${2:even}' -%}
diff --git a/snippets/lpc.snippets b/snippets/lpc.snippets
index 2a849efaf..3410c93b3 100644
--- a/snippets/lpc.snippets
+++ b/snippets/lpc.snippets
@@ -66,8 +66,8 @@ snippet elif
 snippet ifi
 	if(${1:true}) ${0};
 # ternary
-snippet t
-	${1:/* condition */} ? ${2:a} : ${3:b}
+snippet t Ternary: `condition ? true : false`
+	$1 ? $2 : $0
 # switch
 snippet switch
 	switch(${1:/* variable */})
@@ -115,7 +115,7 @@ snippet forr
 	}
 # while
 snippet wh
-	while(${1:/* condition */})
+	while($1)
 	{
 		${0:${VISUAL}}
 	}
@@ -123,7 +123,7 @@ snippet wh
 snippet do
 	do{
 		${0:${VISUAL}}
-	}while (${1:/* condition */});
+	}while ($1);
 ##
 ## Functions
 # function definition
diff --git a/snippets/ls.snippets b/snippets/ls.snippets
index 7c924e64d..822119d99 100644
--- a/snippets/ls.snippets
+++ b/snippets/ls.snippets
@@ -54,24 +54,24 @@ snippet cla class .. extends .. constructor: ..
 		${5}
 # If
 snippet if
-	if ${1:condition}
+	if $1
 		${2}
 # If __ Else
 snippet ife
-	if ${1:condition}
+	if $1
 		${2}
 	else
 		${3}
 # Else if
 snippet elif
-	else if ${1:condition}
+	else if $1
 		${2}
 # Ternary If
 snippet ifte
-	if ${1:condition} then ${2:value} else ${3:other}
+	if $1 then $2 else $0
 # Unless
 snippet unl
-	${1:action} unless ${2:condition}
+	$1 unless $0
 # Switch
 snippet swi
 	switch ${1:object}
diff --git a/snippets/lua.snippets b/snippets/lua.snippets
index 868f2f62a..855ec6f14 100644
--- a/snippets/lua.snippets
+++ b/snippets/lua.snippets
@@ -20,24 +20,24 @@ snippet fori
 		${0:-- body}
 	end
 snippet if
-	if ${1:condition} then
+	if $1 then
 		${2:-- body}
 	end
 snippet ife
-	if ${1:condition} then
+	if $1 then
 		${2:-- if condition}
 	else
 		${0:-- else}
 	end
 snippet elif
-	elseif ${1:condition} then
+	elseif $1 then
 		${0:--body}
 snippet repeat
 	repeat
 		${1:--body}
-	until ${0:condition}
+	until $0
 snippet while
-	while ${1:condition} do
+	while $1 do
 		${0:--body}
 	end
 snippet wh
diff --git a/snippets/mako.snippets b/snippets/mako.snippets
index 659caf77d..b2ff4052a 100644
--- a/snippets/mako.snippets
+++ b/snippets/mako.snippets
@@ -19,11 +19,11 @@ snippet for
 		${0:}
 	% endfor
 snippet if if
-	% if ${1:condition}:
+	% if $1:
 		${0:}
 	% endif
 snippet ife if/else
-	% if ${1:condition}:
+	% if $1:
 		${2:}
 	% else:
 		${0:}
diff --git a/snippets/perl.snippets b/snippets/perl.snippets
index b318d18c5..79ddad433 100644
--- a/snippets/perl.snippets
+++ b/snippets/perl.snippets
@@ -40,7 +40,7 @@ snippet eif
 	}
 # Conditional One-line
 snippet xif
-	${1:expression} if ${2:condition};
+	$1 if $0;
 # Unless conditional
 snippet unless
 	unless (${1}) {
@@ -48,7 +48,7 @@ snippet unless
 	}
 # Unless conditional One-line
 snippet xunless
-	${1:expression} unless ${2:condition};
+	$1 unless $0;
 # Try/Except
 snippet eval
 	local $@;
@@ -65,7 +65,7 @@ snippet wh
 	}
 # While Loop One-line
 snippet xwh
-	${1:expression} while ${2:condition};
+	$1 while $0;
 # C-style For Loop
 snippet cfor
 	for (my $${2:var} = 0; $$2 < ${1:count}; $$2${3:++}) {
@@ -73,7 +73,7 @@ snippet cfor
 	}
 # For loop one-line
 snippet xfor
-	${1:expression} for @${2:array};
+	$1 for @$0;
 # Foreach Loop
 snippet for
 	foreach my $${1:x} (@${2:array}) {
@@ -81,7 +81,7 @@ snippet for
 	}
 # Foreach Loop One-line
 snippet fore
-	${1:expression} foreach @${2:array};
+	$1 foreach @$0;
 # Package
 snippet package
 	package ${1:`expand('%:p:s?.*lib/??:r:gs?/?::?')`};
diff --git a/snippets/perl6.snippets b/snippets/perl6.snippets
index aa7406059..e7db89a1e 100644
--- a/snippets/perl6.snippets
+++ b/snippets/perl6.snippets
@@ -33,7 +33,7 @@ snippet eif
 	}
 # Conditional One-line
 snippet xif
-	${1:expression} if ${2:condition};
+	${1} if $2;
 # Unless conditional
 snippet unless
 	unless ${1} {
@@ -41,14 +41,14 @@ snippet unless
 	}
 # Unless conditional One-line
 snippet xunless
-	${1:expression} unless ${2:condition};
+	${1} unless $2;
 # Ternary conditional
 snippet tc
-	${1:condition} ?? ${2:value-if-true} !! ${3:value-if-false};
+	$1 ?? ${2:value-if-true} !! ${3:value-if-false};
 # given - when (perl6 switch)
 snippet switch
 	given ${1:$var} {
-	  when ${2:condition} {
+	  when $2 {
 		  ${3:# code block ...}
 	  }
 	  ${4}
diff --git a/snippets/php.snippets b/snippets/php.snippets
index c769baabb..b0bae1b3c 100644
--- a/snippets/php.snippets
+++ b/snippets/php.snippets
@@ -86,7 +86,7 @@ snippet =?:
 snippet ?:
 	${1:true} ? ${2:a} : ${0}
 snippet t "$retVal = (condition) ? a : b"
-	$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};
+	$${1:retVal} = ($2) ? ${3:a} : ${4:b};
 # Predefined variables
 snippet C
 	$_COOKIE['${1:variable}']
@@ -283,7 +283,7 @@ snippet def "define('VARIABLE_NAME', 'definition')"
 snippet def?
 	${1}defined('${2}')
 snippet wh "while (condition) { ... }"
-	while (${1:/* condition */}) {
+	while ($1) {
 		${0:${VISUAL}}
 	}
 snippet do "do { ... } while (condition)"
diff --git a/snippets/processing.snippets b/snippets/processing.snippets
index 798e54583..0fe69022b 100644
--- a/snippets/processing.snippets
+++ b/snippets/processing.snippets
@@ -64,7 +64,7 @@ snippet for
 	};
 #loop while
 snippet wh
-	while (${1:/* condition */}) {
+	while ($1) {
 		${0}
 	}
 #break
diff --git a/snippets/ps1.snippets b/snippets/ps1.snippets
index 08de1efd8..652f0d861 100644
--- a/snippets/ps1.snippets
+++ b/snippets/ps1.snippets
@@ -43,13 +43,13 @@ snippet enum
 
 # PowerShell if..then
 snippet if
-	if (${1:condition}) {
-		${2:statement}
+	if ($1) {
+		$0
 	}
 
 # PowerShell if..else
 snippet ife
-	if ( ${1:condition} ) {
+	if ( $1 ) {
 		${2}
 	}
 	else {
@@ -58,8 +58,8 @@ snippet ife
 
 # PowerShell While Loop
 snippet while
-	while (${1:condition}) {
-		${2:statement}
+	while ($1) {
+		$0
 	}
 
 # PowerShell Filter..Sort
@@ -69,7 +69,7 @@ snippet filtersort
 # PowerShell foreach
 snippet foreach
 	foreach ( $${1:iterator} in $${2:collection} ) {
-		${3:statement}
+		$0
 	}
 
 # PowerShell export-csv
diff --git a/snippets/python.snippets b/snippets/python.snippets
index b980b54c0..75302a492 100644
--- a/snippets/python.snippets
+++ b/snippets/python.snippets
@@ -28,14 +28,14 @@ snippet sk "skip unittests" b
 	@unittest.skip(${1:skip_reason})
 
 snippet wh
-	while ${1:condition}:
+	while $1:
 		${0:${VISUAL}}
 
 # dowh - does the same as do...while in other languages
 snippet dowh
 	while True:
 		${1}
-		if ${0:condition}:
+		if $0:
 			break
 
 snippet with
@@ -115,13 +115,13 @@ snippet property
 
 # Ifs
 snippet if
-	if ${1:condition}:
+	if $1:
 		${0:${VISUAL}}
 snippet el
 	else:
 		${0:${VISUAL}}
 snippet ei
-	elif ${1:condition}:
+	elif $1:
 		${0:${VISUAL}}
 
 # Match
diff --git a/snippets/r.snippets b/snippets/r.snippets
index c3953bfc5..46f316c91 100644
--- a/snippets/r.snippets
+++ b/snippets/r.snippets
@@ -11,7 +11,7 @@ snippet source
 
 # conditionals
 snippet if
-	if (${1:condition}) {
+	if ($1) {
 		${0}
 	}
 snippet el
@@ -19,7 +19,7 @@ snippet el
 		${0}
 	}
 snippet ei
-	else if (${1:condition}) {
+	else if ($1) {
 		${0}
 	}
 
diff --git a/snippets/rmd.snippets b/snippets/rmd.snippets
index bfaaefd76..13d55363e 100644
--- a/snippets/rmd.snippets
+++ b/snippets/rmd.snippets
@@ -27,7 +27,7 @@ snippet req
 	require(${1:}, quietly = TRUE)
 # If Condition
 snippet if
-	if ( ${1:condition} )
+	if ( $1 )
 	{
 		${2:}
 	}
@@ -51,7 +51,7 @@ snippet fun
 snippet re
 	repeat{
 	  ${2:}
-	  if(${1:condition}) break
+	  if($1) break
 	}
 
 # matrix
diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 20c789b5b..34d56fb29 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -34,11 +34,11 @@ snippet #
 	# =>
 snippet case
 	case ${1:object}
-	when ${2:condition}
+	when $2
 		${0}
 	end
 snippet when
-	when ${1:condition}
+	when $1
 		${0:${VISUAL}}
 snippet def
 	def ${1:method_name}
@@ -55,46 +55,46 @@ snippet descendants
 		end
 	end
 snippet if
-	if ${1:condition}
+	if $1
 		${0:${VISUAL}}
 	end
 snippet ife
-	if ${1:condition}
+	if $1
 		${2:${VISUAL}}
 	else
 		${0}
 	end
 snippet eif
-	elsif ${1:condition}
+	elsif $1
 		${0:${VISUAL}}
 snippet ifee
-	if ${1:condition}
+	if $1
 		$2
-	elsif ${3:condition}
+	elsif $3
 		$4
 	else
 		$0
 	end
 snippet unless
-	unless ${1:condition}
+	unless $1
 		${0:${VISUAL}}
 	end
 snippet unlesse
-	unless ${1:condition}
+	unless $1
 		$2
 	else
 		$0
 	end
 snippet unlesee
-	unless ${1:condition}
+	unless $1
 		$2
-	elsif ${3:condition}
+	elsif $3
 		$4
 	else
 		$0
 	end
 snippet wh
-	while ${1:condition}
+	while $1
 		${0:${VISUAL}}
 	end
 snippet for
@@ -102,7 +102,7 @@ snippet for
 		${0}
 	end
 snippet until
-	until ${1:condition}
+	until $1
 		${0:${VISUAL}}
 	end
 snippet cla class .. end
diff --git a/snippets/rust.snippets b/snippets/rust.snippets
index 5e9eb2b18..04f05dd60 100644
--- a/snippets/rust.snippets
+++ b/snippets/rust.snippets
@@ -147,7 +147,7 @@ snippet loop "loop {}" b
 		${0:${VISUAL}}
 	}
 snippet wh "while loop"
-	while ${1:condition} {
+	while $1 {
 		${0:${VISUAL}}
 	}
 snippet whl "while let (...)"
diff --git a/snippets/sass.snippets b/snippets/sass.snippets
index 30bac6c7e..992341e7c 100644
--- a/snippets/sass.snippets
+++ b/snippets/sass.snippets
@@ -13,15 +13,15 @@ snippet fun
 	@function ${1:name}(${2:args})
 		${0}
 snippet if
-	@if ${1:condition}
+	@if $1
 		${0:${VISUAL}}
 snippet ife
-	@if ${1:condition}
+	@if $1
 		${2:${VISUAL}}
 	@else
 		${0}
 snippet eif
-	@else if ${1:condition}
+	@else if $1
 		${0:${VISUAL}}
 snippet for
 	@for ${1:$i} from ${2:1} through ${3:3}
diff --git a/snippets/scss.snippets b/snippets/scss.snippets
index 998a12005..475c2b387 100644
--- a/snippets/scss.snippets
+++ b/snippets/scss.snippets
@@ -17,17 +17,17 @@ snippet fun
 		${0}
 	}
 snippet if
-	@if ${1:condition} {
+	@if $1 {
 		${0}
 	}
 snippet ife
-	@if ${1:condition} {
+	@if $1 {
 		${2}
 	} @else {
 		${0}
 	}
 snippet eif
-	@else if ${1:condition} {
+	@else if $1 {
 		${0}
 	}
 snippet for
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 75d51b9d2..37f985f18 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -18,11 +18,11 @@ snippet sbash
 	IFS=$'\n\t'
 
 snippet if
-	if [ ${1:condition} ]; then
+	if [ $1 ]; then
 		${0:${VISUAL}}
 	fi
 snippet elif
-	elif [ ${1:condition} ]; then
+	elif [ $1 ]; then
 		${0:${VISUAL}}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
@@ -33,7 +33,7 @@ snippet fori
 		${0:${VISUAL}}
 	done
 snippet wh
-	while [ ${1:condition} ]; do
+	while [ $1 ]; do
 		${0:${VISUAL}}
 	done
 snippet wht
@@ -41,7 +41,7 @@ snippet wht
 		${0:${VISUAL}}
 	done
 snippet until
-	until [ ${1:condition} ]; do
+	until [ $1 ]; do
 		${0:${VISUAL}}
 	done
 snippet case
diff --git a/snippets/yii.snippets b/snippets/yii.snippets
index 1f9fc6f78..1aecad293 100644
--- a/snippets/yii.snippets
+++ b/snippets/yii.snippets
@@ -144,7 +144,7 @@ snippet yrp
 #----------------Yii Model-----------------------------
 #Yii Model count
 snippet ycountm
-	${1:ModelName}::model()->count(${2:condition}, array('${3:key}'=>${0:value}));
+	${1:ModelName}::model()->count($2, array('${3:key}'=>${0:value}));
 
 #Yii Model countBySql
 snippet ycountbs
@@ -152,35 +152,35 @@ snippet ycountbs
 
 #Yii Model updateAll
 snippet yupdatea
-	${1:ModelName}::model()->updateAll(${2:array('attributes')}, ${3:condition},array('${4:key}'=>${0:value}));
+	${1:ModelName}::model()->updateAll(${2:array('attributes')}, $3,array('${4:key}'=>${0:value}));
 
 #Yii Model updateByPk
 snippet yupdatebp
-	${1:ModelName}::model()->updateByPk(${2:pk}, ${3:array('attributes')}, ${4:condition},array('${5:key}'=>${0:value}));
+	${1:ModelName}::model()->updateByPk(${2:pk}, ${3:array('attributes')}, $4,array('${5:key}'=>${0:value}));
 
 #Yii Model deleteAll
 snippet ydela
-	${1:ModelName}::model()->deleteAll(${2:condition},array('${3:key}'=>${0:value}));
+	${1:ModelName}::model()->deleteAll($2,array('${3:key}'=>${0:value}));
 
 #Yii Model deleteByPk
 snippet ydelbp
-	${1:ModelName}::model()->deleteByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${0:value}));
+	${1:ModelName}::model()->deleteByPk(${2:pk}, $3, array('${4:key}'=>${0:value}));
 
 #Yii Model find
 snippet yfind
-	${1:ModelName}::model()->find(${2:condition},array('${3:key}'=>${0:value}));
+	${1:ModelName}::model()->find($2,array('${3:key}'=>${0:value}));
 
 #Yii Model findAll
 snippet yfinda
-	${1:ModelName}::model()->findAll(${2:condition},array('${3:key}'=>${0:value}));
+	${1:ModelName}::model()->findAll($2,array('${3:key}'=>${0:value}));
 
 #Yii Model findByPk
 snippet yfindbp
-	${1:ModelName}::model()->findByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${0:value}));
+	${1:ModelName}::model()->findByPk(${2:pk}, $3, array('${4:key}'=>${0:value}));
 
 #Yii Model findAllByPk
 snippet yfindabp
-	${1:ModelName}::model()->findAllByPk(${2:pk}, ${3:condition},array('${4:key}'=>${0:value}));
+	${1:ModelName}::model()->findAllByPk(${2:pk}, $3,array('${4:key}'=>${0:value}));
 
 #Yii Model findBySql
 snippet yfindbs
@@ -188,11 +188,11 @@ snippet yfindbs
 
 #Yii Model findAllByAttributes
 snippet yfindaba
-	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), ${4:condition}, array('${5:key}'=>${0:value}));
+	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), $4, array('${5:key}'=>${0:value}));
 
 #Yii Model exists
 snippet yexists
-	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${0:value}));
+	${1:ModelName}::model()->exists($2, array('${3:key}'=>${0:value}));
 
 #Yii Create model class
 snippet ymodel
diff --git a/snippets/zsh.snippets b/snippets/zsh.snippets
index 63061fe8e..485766fea 100644
--- a/snippets/zsh.snippets
+++ b/snippets/zsh.snippets
@@ -5,17 +5,17 @@ snippet #!
 	#!/usr/bin/env zsh
 
 snippet if
-	if ${1:condition}; then
+	if $1; then
 		${0:${VISUAL}}
 	fi
 snippet ife
-	if ${1:condition}; then
+	if $1; then
 		${2:${VISUAL}}
 	else
 		${0:# statements}
 	fi
 snippet eif
-	elif ${1:condition}; then
+	elif $1; then
 		${0:${VISUAL}}
 snippet for
 	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
@@ -30,11 +30,11 @@ snippet fore
 		${0:${VISUAL}}
 	done
 snippet wh
-	while ${1:condition}; do
+	while $1; do
 		${0:${VISUAL}}
 	done
 snippet until
-	until ${1:condition}; do
+	until $1; do
 		${0:${VISUAL}}
 	done
 snippet repeat

From b055962fcc0f9d868521785fd423cca493de353a Mon Sep 17 00:00:00 2001
From: amarakon <amar.al-zubaidi45@tutanota.com>
Date: Wed, 7 Sep 2022 16:24:09 -0400
Subject: [PATCH 1540/1587] Remove unnecessary body placeholder text

---
 snippets/clojure.snippets       |  4 ++--
 snippets/coffee/coffee.snippets | 20 ++++++++++----------
 snippets/erlang.snippets        | 12 ++++++------
 snippets/html.snippets          |  2 +-
 snippets/lua.snippets           | 14 +++++++-------
 snippets/plsql.snippets         |  6 +++---
 snippets/rst.snippets           |  2 +-
 snippets/sh.snippets            |  4 ++--
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/snippets/clojure.snippets b/snippets/clojure.snippets
index 048ce9fee..cc9d07043 100644
--- a/snippets/clojure.snippets
+++ b/snippets/clojure.snippets
@@ -81,7 +81,7 @@ snippet print
 snippet reduce
 	(reduce ${1:(fn [p n] ${3})} ${2})
 snippet when
-	(when ${1:test} ${0:body})
+	(when ${1:test} $0)
 snippet when-let
 	(when-let [${1:result} ${2:test}]
-		${0:body})
+		$0)
diff --git a/snippets/coffee/coffee.snippets b/snippets/coffee/coffee.snippets
index 76a822f25..d07b1b624 100644
--- a/snippets/coffee/coffee.snippets
+++ b/snippets/coffee/coffee.snippets
@@ -2,37 +2,37 @@
 snippet forindo
 	for ${1:name} in ${2:array}
 		do ($1) ->
-			${0:// body}
+			$0
 # Array comprehension
 snippet fora
 	for ${1:name} in ${2:array}
-		${0:# body...}
+		$0
 # Object comprehension
 snippet foro
 	for ${1:key}, ${2:value} of ${3:object}
-		${0:# body...}
+		$0
 # Range comprehension (inclusive)
 snippet forr
 	for ${1:name} in [${2:start}..${3:finish}]
-		${0:# body...}
+		$0
 snippet forrb
 	for ${1:name} in [${2:start}..${3:finish}] by ${4:step}
-		${0:# body...}
+		$0
 # Range comprehension (exclusive)
 snippet forrex
 	for ${1:name} in [${2:start}...${3:finish}]
-		${0:# body...}
+		$0
 snippet forrexb
 	for ${1:name} in [${2:start}...${3:finish}] by ${4:step}
-		${0:# body...}
+		$0
 # Function
 snippet fun
 	(${1:args}) ->
-		${0:# body...}
+		$0
 # Function (bound)
 snippet bfun
 	(${1:args}) =>
-		${0:# body...}
+		$0
 # Class
 snippet cla class ..
 	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
@@ -76,7 +76,7 @@ snippet unl Unless
 snippet swi
 	switch ${1:object}
 		when ${2:value}
-			${0:# body...}
+			$0
 
 # Log
 snippet log
diff --git a/snippets/erlang.snippets b/snippets/erlang.snippets
index 7a0a6116a..d655a9b9a 100644
--- a/snippets/erlang.snippets
+++ b/snippets/erlang.snippets
@@ -17,7 +17,7 @@ snippet dt
 	erlang:display({${1}, ${0}}),
 # define directive
 snippet def
-	-define(${1:macro}, ${2:body}).
+	-define(${1:macro}, $2).
 # export directive
 snippet exp
 	-export([${1:function}/${0:arity}]).
@@ -44,17 +44,17 @@ snippet undef
 snippet if
 	if
 		${1:guard} ->
-			${0:body}
+			$0
 	end
 # case expression
 snippet case
 	case ${1:expression} of
 		${2:pattern} ->
-			${0:body};
+			$0;
 	end
 # anonymous function
 snippet fun
-	fun (${1:Parameters}) -> ${2:body} end
+	fun (${1:Parameters}) -> $2 end
 # try...catch
 snippet try
 	try
@@ -65,10 +65,10 @@ snippet try
 snippet rcv "Receive Expression"
 	receive
 	${1:	${2:pattern}${3: when ${4:guard}} ->
-			${5:body}}
+			$5
 	${6:after
 		${7:expression} ->
-			${8:body}}
+			$8
 	end
 # record directive
 snippet rec
diff --git a/snippets/html.snippets b/snippets/html.snippets
index bf7170032..5388dbc8e 100644
--- a/snippets/html.snippets
+++ b/snippets/html.snippets
@@ -456,7 +456,7 @@ snippet html5l
 			${3:link}
 		</head>
 		<body>
-			${0:body}
+			$0
 		</body>
 	</html>
 snippet i
diff --git a/snippets/lua.snippets b/snippets/lua.snippets
index 855ec6f14..87cdc8e4a 100644
--- a/snippets/lua.snippets
+++ b/snippets/lua.snippets
@@ -5,7 +5,7 @@ snippet local
 	local ${1:x} = ${0:1}
 snippet fun
 	function ${1:fname}(${2:...})
-		${0:-- body}
+		$0
 	end
 snippet for
 	for ${1:i}=${2:1},${3:10} do
@@ -13,15 +13,15 @@ snippet for
 	end
 snippet forp
 	for ${1:i},${2:v} in pairs(${3:table_name}) do
-		${0:-- body}
+		$0
 	end
 snippet fori
 	for ${1:i},${2:v} in ipairs(${3:table_name}) do
-		${0:-- body}
+		$0
 	end
 snippet if
 	if $1 then
-		${2:-- body}
+		$2
 	end
 snippet ife
 	if $1 then
@@ -31,14 +31,14 @@ snippet ife
 	end
 snippet elif
 	elseif $1 then
-		${0:--body}
+		$0
 snippet repeat
 	repeat
-		${1:--body}
+		$1
 	until $0
 snippet while
 	while $1 do
-		${0:--body}
+		$0
 	end
 snippet wh
 	while ${1:true} do
diff --git a/snippets/plsql.snippets b/snippets/plsql.snippets
index 2920758ad..6a75f7739 100644
--- a/snippets/plsql.snippets
+++ b/snippets/plsql.snippets
@@ -8,7 +8,7 @@ snippet ps
 snippet pb
 	create or replace package body ${1:name}
 	as
-		${0:-- body}
+		$0
 	end; -- end of package body $1;
 # package procedure spec
 snippet pps
@@ -18,7 +18,7 @@ snippet ppb
 	procedure ${1:name}(${2:args})
 	as
 	begin
-		${0:-- body}
+		$0
 	end $2;
 # package function spec
 snippet pfs
@@ -31,7 +31,7 @@ snippet pfb
 	as
 		l_res	$3;
 	begin
-		${0:-- body};
+		$0;
 		return l_res;
 	end $1;
 # snow errors
diff --git a/snippets/rst.snippets b/snippets/rst.snippets
index 31b4fec20..8279af5a0 100644
--- a/snippets/rst.snippets
+++ b/snippets/rst.snippets
@@ -1,7 +1,7 @@
 # rst
 
 snippet :
-	:${1:field name}: ${0:field body}
+	:${1:field name}: $0
 snippet *
 	*${1:Emphasis}* ${0}
 snippet **
diff --git a/snippets/sh.snippets b/snippets/sh.snippets
index 37f985f18..ef94e683e 100644
--- a/snippets/sh.snippets
+++ b/snippets/sh.snippets
@@ -101,10 +101,10 @@ snippet root
 
 snippet fun-sh
 	${1:function_name}() {
-		${0:#function_body}
+		$0
 	}
 
 snippet fun
 	function ${1:function_name}() {
-		${0:#function_body}
+		$0
 	}

From 724c1ecb64e87580dd5b85378849eb89c593abcc Mon Sep 17 00:00:00 2001
From: Shad <stephane.pontier@sfr.com>
Date: Sun, 4 Sep 2022 14:37:40 +0200
Subject: [PATCH 1541/1587] add snippets for smarty

---
 snippets/smarty.snippets | 144 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 snippets/smarty.snippets

diff --git a/snippets/smarty.snippets b/snippets/smarty.snippets
new file mode 100644
index 000000000..59899900d
--- /dev/null
+++ b/snippets/smarty.snippets
@@ -0,0 +1,144 @@
+# snippets for smarty3
+
+extends html
+extends javascript
+extends css
+
+# https://www.smarty.net/docs/en/language.function.if.tpl
+snippet if "{if cond} ... {/if}"
+	{if ${1}}
+		${0:${VISUAL}}
+	{/if}
+
+snippet ifn "{if !cond} ... {/if}"
+	{if ${1}}
+		${0:${VISUAL}}
+	{/if}
+
+snippet ife "{if cond} ... {else} ... {/if}"
+	{if ${1}}
+		${0:${VISUAL}}
+	{else}
+		${2}
+	{/if}
+
+snippet eif "{elseif cond} ... {/if}"
+	{elseif ${1}}
+		${0:${VISUAL}}
+	{/if}
+
+snippet el "{else} ... {/if}"
+	{else}
+		${1}
+	{/if}
+
+# https://www.smarty.net/docs/en/language.function.for.tpl
+snippet for "The {for} tag is used to create simple loops."
+	{for $${1:var}=${2:start} to ${3:end}${4: step ${5}}${6: max ${7}}}
+		${0:${VISUAL}}
+	{/for}
+
+snippet forelse "The {for}{forelse} tag is used to create simple loops."
+	{for $${1:var}=${2:start} to ${3:end}${4: step ${5}}${6: max ${7}}}
+		${0:${VISUAL}}
+	{forelse}
+		${7}
+	{/for}
+
+# https://www.smarty.net/docs/en/language.function.foreach.tpl
+snippet foreach "{foreach} is used for looping over arrays of data."
+	{foreach $${1:array_variable} as $${2:var_or_key}${3: => $${4:itemvar}}}
+		${0:${VISUAL}}
+	{/foreach}
+
+snippet foreach2 "[Smarty2] {foreach} is used for looping over arrays of data."
+	{foreach from='$${1:collection} item='${2}'${3: key='${4}'}${5: name='${6}'}}
+		${0:${VISUAL}}
+	{/foreach}
+
+snippet foreachelse "{foreach} is used for looping over arrays of data."
+	{foreach $${1:array_variable} as $${2:var_or_key}${3: => $${4:itemvar}}}
+		${0:${VISUAL}}
+	{foreachelse}
+		${5}
+	{/foreach}
+
+snippet wh "{while} loops in Smarty have much the same flexibility as PHP while statements, with a few added features for the template engine. Every {while} must be paired with a matching {/while}. All PHP conditionals and functions are recognized, such as ||, or, &&, and, is_array(), etc."
+	{while ${1} }
+		${0:${VISUAL}}
+	{/while}
+
+
+
+# https://www.smarty.net/docs/en/language.function.append.tpl
+snippet append "{append} is used for creating or appending template variable arrays during the execution of a template."
+	{append var='${1}' value='${2}'${3: index='${4:first|last}'}${5: scope='${6:parent|root|global}'}}
+
+# https://www.smarty.net/docs/en/language.function.assign.tpl
+snippet assign "{assign} is used for assigning template variables during the execution of a template."
+	{assign var='${1}' value='${2}'${3: scope='${4parent|root|global}'}}
+
+# https://www.smarty.net/docs/en/language.function.block.tpl
+snippet block "{block} is used to define a named area of template source for template inheritance."
+	{block name='${1:name}'}
+		${0:${VISUAL}}
+	{/block}
+
+# https://www.smarty.net/docs/en/language.function.call.tpl
+snippet call "{call} is used to call a template function defined by the {function} tag just like a plugin function."
+	{call name=${1:name}${2: assign=${3}} ${0}}
+
+# https://www.smarty.net/docs/en/language.function.capture.tpl
+snippet capture "{capture} is used to collect the output of the template between the tags into a variable instead of displaying it. Any content between {capture name='foo'} and {/capture} is collected into the variable specified in the name attribute. "
+	{capture name='${1}'${2: assign='${3:variable}' }${4: append='${5:array_variable}'}}
+		${0:${VISUAL}}
+	{/capture}
+
+# https://www.smarty.net/docs/en/language.function.config.load.tpl
+snippet config_load "config_load"
+	{config_load file='${1}'${2: section='${3}'}${4: scope='${5:local|parent|global}'}]
+
+# https://www.smarty.net/docs/en/language.function.extends.tpl
+snippet extends "{extends} tags are used in child templates in template inheritance for extending parent templates."
+	{extends file='${1}'}
+
+# https://www.smarty.net/docs/en/language.function.function.tpl
+snippet function "{function} is used to create functions within a template and call them just like a plugin function. Instead of writing a plugin that generates presentational content, keeping it in the template is often a more manageable choice. It also simplifies data traversal, such as deeply nested menus."
+	{function name='${1}' ${2:variables}}
+		${0:${VISUAL}}
+	{/function}
+
+snippet include "{include} tags are used for including other templates in the current template. Any variables available in the current template are also available within the included template."
+	{include file='${1}'${2: assign='${3:name}'}${4: cache_lifetime=${5}}${6: compile_id='${7}'}${8: cache_id='${9}'}${10: scope='${11:parent|root|global}'}${12: variables}}
+
+# https://www.smarty.net/docs/en/language.function.literal.tpl
+snippet literal "{literal} tags allow a block of data to be taken literally. This is typically used around Javascript or stylesheet blocks where {curly braces} would interfere with the template delimiter syntax"
+	{literal}
+		${0:${VISUAL}}
+	{/literal}
+
+# https://www.smarty.net/docs/en/language.function.nocache.tpl
+snippet nocache "{nocache} is used to disable caching of a template section. Every {nocache} must be paired with a matching {/nocache}."
+	{nocache}
+		${0:${VISUAL}}
+	{/nocache}
+
+# https://www.smarty.net/docs/en/language.function.section.tpl
+snippet section "A {section} is for looping over sequentially indexed arrays of data, unlike {foreach} which is used to loop over a single associative array. Every {section} tag must be paired with a closing {/section} tag."
+	{section name='${1}'${2: loop='${3}'}${4: start=${5}}${6: step=${7}}${8: max=${9}}${10: show=${11}}}
+		${0:${VISUAL}}
+	{/section}
+
+# https://www.smarty.net/docs/en/language.function.setfilter.tpl
+snippet setfilter "The {setfilter}...{/setfilter} block tag allows the definition of template instance's variable filters."
+	{setfilter ${1:filters}}
+		${0:${VISUAL}}
+	{/setfilter}
+
+# https://www.smarty.net/docs/en/language.function.strip.tpl
+snippet strip "Anything within {strip}{/strip} tags are stripped of the extra spaces or carriage returns at the beginnings and ends of the lines before they are displayed. This way you can keep your templates readable, and not worry about extra white space causing problems."
+	{strip}
+		${0:${VISUAL}}
+	{/strip}
+
+

From 835a7cf3ad7281dde7832ecaac26e6e56cda5be9 Mon Sep 17 00:00:00 2001
From: Shad <stephane.pontier@sfr.com>
Date: Sun, 4 Sep 2022 18:05:59 +0200
Subject: [PATCH 1542/1587] typo

---
 snippets/smarty.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/smarty.snippets b/snippets/smarty.snippets
index 59899900d..39e060a3c 100644
--- a/snippets/smarty.snippets
+++ b/snippets/smarty.snippets
@@ -76,7 +76,7 @@ snippet append "{append} is used for creating or appending template variable arr
 
 # https://www.smarty.net/docs/en/language.function.assign.tpl
 snippet assign "{assign} is used for assigning template variables during the execution of a template."
-	{assign var='${1}' value='${2}'${3: scope='${4parent|root|global}'}}
+	{assign var='${1}' value='${2}'${3: scope='${4:parent|root|global}'}}
 
 # https://www.smarty.net/docs/en/language.function.block.tpl
 snippet block "{block} is used to define a named area of template source for template inheritance."

From 83f437b210219a97d25adaf01e6c6e65b551568d Mon Sep 17 00:00:00 2001
From: Shad <stephane.pontier@sfr.com>
Date: Mon, 5 Sep 2022 09:28:10 +0200
Subject: [PATCH 1543/1587] convert to UltiSnips format + remove trivial
 placeholder

---
 {snippets => UltiSnips}/smarty.snippets | 167 ++++++++++++++----------
 1 file changed, 96 insertions(+), 71 deletions(-)
 rename {snippets => UltiSnips}/smarty.snippets (67%)

diff --git a/snippets/smarty.snippets b/UltiSnips/smarty.snippets
similarity index 67%
rename from snippets/smarty.snippets
rename to UltiSnips/smarty.snippets
index 39e060a3c..77c5f4ce0 100644
--- a/snippets/smarty.snippets
+++ b/UltiSnips/smarty.snippets
@@ -6,139 +6,164 @@ extends css
 
 # https://www.smarty.net/docs/en/language.function.if.tpl
 snippet if "{if cond} ... {/if}"
-	{if ${1}}
-		${0:${VISUAL}}
-	{/if}
+{if ${1}}
+	${0:${VISUAL}}
+{/if}
+endsnippet
 
 snippet ifn "{if !cond} ... {/if}"
-	{if ${1}}
-		${0:${VISUAL}}
-	{/if}
+{if ${1}}
+	${0:${VISUAL}}
+{/if}
+endsnippet
 
 snippet ife "{if cond} ... {else} ... {/if}"
-	{if ${1}}
-		${0:${VISUAL}}
-	{else}
-		${2}
-	{/if}
+{if ${1}}
+	${0:${VISUAL}}
+{else}
+	${2}
+{/if}
+endsnippet
 
 snippet eif "{elseif cond} ... {/if}"
-	{elseif ${1}}
-		${0:${VISUAL}}
-	{/if}
+{elseif ${1}}
+	${0:${VISUAL}}
+{/if}
+endsnippet
 
 snippet el "{else} ... {/if}"
-	{else}
-		${1}
-	{/if}
+{else}
+	${1}
+{/if}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.for.tpl
 snippet for "The {for} tag is used to create simple loops."
-	{for $${1:var}=${2:start} to ${3:end}${4: step ${5}}${6: max ${7}}}
-		${0:${VISUAL}}
-	{/for}
+{for $${1:var}=${2:start} to ${3:end}${4: step ${5}}${6: max=${7}}}
+	${0:${VISUAL}}
+{/for}
+endsnippet
 
 snippet forelse "The {for}{forelse} tag is used to create simple loops."
-	{for $${1:var}=${2:start} to ${3:end}${4: step ${5}}${6: max ${7}}}
-		${0:${VISUAL}}
-	{forelse}
-		${7}
-	{/for}
+{for $${1:var}=${2:start} to ${3:end}${4: step ${5}}${6: max=${7}}}
+	${0:${VISUAL}}
+{forelse}
+	${8}
+{/for}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.foreach.tpl
 snippet foreach "{foreach} is used for looping over arrays of data."
-	{foreach $${1:array_variable} as $${2:var_or_key}${3: => $${4:itemvar}}}
-		${0:${VISUAL}}
-	{/foreach}
+{foreach $${1:array_variable} as $${2:var_or_key}${3: => $${4:itemvar}}}
+	${0:${VISUAL}}
+{/foreach}
+endsnippet
 
 snippet foreach2 "[Smarty2] {foreach} is used for looping over arrays of data."
-	{foreach from='$${1:collection} item='${2}'${3: key='${4}'}${5: name='${6}'}}
-		${0:${VISUAL}}
-	{/foreach}
+{foreach from='$${1:collection} item='${2}'${3: key='${4}'}${5: name='${6}'}}
+	${0:${VISUAL}}
+{/foreach}
+endsnippet
 
 snippet foreachelse "{foreach} is used for looping over arrays of data."
-	{foreach $${1:array_variable} as $${2:var_or_key}${3: => $${4:itemvar}}}
-		${0:${VISUAL}}
-	{foreachelse}
-		${5}
-	{/foreach}
+{foreach $${1:array_variable} as $${2:var_or_key}${3: => $${4:itemvar}}}
+	${0:${VISUAL}}
+{foreachelse}
+	${5}
+{/foreach}
+endsnippet
 
 snippet wh "{while} loops in Smarty have much the same flexibility as PHP while statements, with a few added features for the template engine. Every {while} must be paired with a matching {/while}. All PHP conditionals and functions are recognized, such as ||, or, &&, and, is_array(), etc."
-	{while ${1} }
-		${0:${VISUAL}}
-	{/while}
+{while ${1} }
+	${0:${VISUAL}}
+{/while}
+endsnippet
+
 
 
 
 # https://www.smarty.net/docs/en/language.function.append.tpl
 snippet append "{append} is used for creating or appending template variable arrays during the execution of a template."
-	{append var='${1}' value='${2}'${3: index='${4:first|last}'}${5: scope='${6:parent|root|global}'}}
+{append var='${1}' value='${2}'${3: index='${4|first,last|}'}${5: scope='${6|parent,root,global|}'}}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.assign.tpl
 snippet assign "{assign} is used for assigning template variables during the execution of a template."
-	{assign var='${1}' value='${2}'${3: scope='${4:parent|root|global}'}}
+{assign var='${1}' value='${2}'${3: scope='${4|parent,root,global|}'}}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.block.tpl
 snippet block "{block} is used to define a named area of template source for template inheritance."
-	{block name='${1:name}'}
-		${0:${VISUAL}}
-	{/block}
+{block name='${1}'}
+	${0:${VISUAL}}
+{/block}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.call.tpl
 snippet call "{call} is used to call a template function defined by the {function} tag just like a plugin function."
-	{call name=${1:name}${2: assign=${3}} ${0}}
+{call name=${1}${2: assign=${3}}${4: variables}}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.capture.tpl
 snippet capture "{capture} is used to collect the output of the template between the tags into a variable instead of displaying it. Any content between {capture name='foo'} and {/capture} is collected into the variable specified in the name attribute. "
-	{capture name='${1}'${2: assign='${3:variable}' }${4: append='${5:array_variable}'}}
-		${0:${VISUAL}}
-	{/capture}
+{capture name='${1}'${2: assign='${3}' }${4: append='${5:array_variable}'}}
+	${0:${VISUAL}}
+{/capture}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.config.load.tpl
 snippet config_load "config_load"
-	{config_load file='${1}'${2: section='${3}'}${4: scope='${5:local|parent|global}'}]
+{config_load file='${1}'${2: section='${3}'}${4: scope='${5|local,parent,global|}'}]
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.extends.tpl
 snippet extends "{extends} tags are used in child templates in template inheritance for extending parent templates."
-	{extends file='${1}'}
+{extends file='${1}'}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.function.tpl
 snippet function "{function} is used to create functions within a template and call them just like a plugin function. Instead of writing a plugin that generates presentational content, keeping it in the template is often a more manageable choice. It also simplifies data traversal, such as deeply nested menus."
-	{function name='${1}' ${2:variables}}
-		${0:${VISUAL}}
-	{/function}
+{function name='${1}' ${2:variables}}
+	${0:${VISUAL}}
+{/function}
+endsnippet
 
+# https://www.smarty.net/docs/en/language.function.include.tpl
 snippet include "{include} tags are used for including other templates in the current template. Any variables available in the current template are also available within the included template."
-	{include file='${1}'${2: assign='${3:name}'}${4: cache_lifetime=${5}}${6: compile_id='${7}'}${8: cache_id='${9}'}${10: scope='${11:parent|root|global}'}${12: variables}}
+{include file='${1}'${2: assign='${3}'}${4: cache_lifetime=${5}}${6: compile_id='${7}'}${8: cache_id='${9}'}${10: scope='${11|parent,root,global|}'}${12: variables}}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.literal.tpl
 snippet literal "{literal} tags allow a block of data to be taken literally. This is typically used around Javascript or stylesheet blocks where {curly braces} would interfere with the template delimiter syntax"
-	{literal}
-		${0:${VISUAL}}
-	{/literal}
+{literal}
+	${0:${VISUAL}}
+{/literal}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.nocache.tpl
 snippet nocache "{nocache} is used to disable caching of a template section. Every {nocache} must be paired with a matching {/nocache}."
-	{nocache}
-		${0:${VISUAL}}
-	{/nocache}
+{nocache}
+	${0:${VISUAL}}
+{/nocache}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.section.tpl
 snippet section "A {section} is for looping over sequentially indexed arrays of data, unlike {foreach} which is used to loop over a single associative array. Every {section} tag must be paired with a closing {/section} tag."
-	{section name='${1}'${2: loop='${3}'}${4: start=${5}}${6: step=${7}}${8: max=${9}}${10: show=${11}}}
-		${0:${VISUAL}}
-	{/section}
+{section name='${1}'${2: loop='${3}'}${4: start=${5}}${6: step=${7}}${8: max=${9}}${10: show=${11}}}
+	${0:${VISUAL}}
+{/section}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.setfilter.tpl
 snippet setfilter "The {setfilter}...{/setfilter} block tag allows the definition of template instance's variable filters."
-	{setfilter ${1:filters}}
-		${0:${VISUAL}}
-	{/setfilter}
+{setfilter ${1:filters}}
+	${0:${VISUAL}}
+{/setfilter}
+endsnippet
 
 # https://www.smarty.net/docs/en/language.function.strip.tpl
 snippet strip "Anything within {strip}{/strip} tags are stripped of the extra spaces or carriage returns at the beginnings and ends of the lines before they are displayed. This way you can keep your templates readable, and not worry about extra white space causing problems."
-	{strip}
-		${0:${VISUAL}}
-	{/strip}
-
-
+{strip}
+	${0:${VISUAL}}
+{/strip}
+endsnippet

From 7a268565575acea413afa3e2649f17004e40285d Mon Sep 17 00:00:00 2001
From: Shad <stephane.pontier@sfr.com>
Date: Thu, 8 Sep 2022 22:04:09 +0200
Subject: [PATCH 1544/1587] split snippet in snipMate & UltiSnips format

snipMate for the plain simple snippets
UltiSnips for the four snippets with choices selection (append, assign, config_load, include)
---
 UltiSnips/smarty.snippets | 143 +-------------------------------------
 snippets/smarty.snippets  | 139 ++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+), 142 deletions(-)
 create mode 100644 snippets/smarty.snippets

diff --git a/UltiSnips/smarty.snippets b/UltiSnips/smarty.snippets
index 77c5f4ce0..09677d6f3 100644
--- a/UltiSnips/smarty.snippets
+++ b/UltiSnips/smarty.snippets
@@ -4,81 +4,6 @@ extends html
 extends javascript
 extends css
 
-# https://www.smarty.net/docs/en/language.function.if.tpl
-snippet if "{if cond} ... {/if}"
-{if ${1}}
-	${0:${VISUAL}}
-{/if}
-endsnippet
-
-snippet ifn "{if !cond} ... {/if}"
-{if ${1}}
-	${0:${VISUAL}}
-{/if}
-endsnippet
-
-snippet ife "{if cond} ... {else} ... {/if}"
-{if ${1}}
-	${0:${VISUAL}}
-{else}
-	${2}
-{/if}
-endsnippet
-
-snippet eif "{elseif cond} ... {/if}"
-{elseif ${1}}
-	${0:${VISUAL}}
-{/if}
-endsnippet
-
-snippet el "{else} ... {/if}"
-{else}
-	${1}
-{/if}
-endsnippet
-
-# https://www.smarty.net/docs/en/language.function.for.tpl
-snippet for "The {for} tag is used to create simple loops."
-{for $${1:var}=${2:start} to ${3:end}${4: step ${5}}${6: max=${7}}}
-	${0:${VISUAL}}
-{/for}
-endsnippet
-
-snippet forelse "The {for}{forelse} tag is used to create simple loops."
-{for $${1:var}=${2:start} to ${3:end}${4: step ${5}}${6: max=${7}}}
-	${0:${VISUAL}}
-{forelse}
-	${8}
-{/for}
-endsnippet
-
-# https://www.smarty.net/docs/en/language.function.foreach.tpl
-snippet foreach "{foreach} is used for looping over arrays of data."
-{foreach $${1:array_variable} as $${2:var_or_key}${3: => $${4:itemvar}}}
-	${0:${VISUAL}}
-{/foreach}
-endsnippet
-
-snippet foreach2 "[Smarty2] {foreach} is used for looping over arrays of data."
-{foreach from='$${1:collection} item='${2}'${3: key='${4}'}${5: name='${6}'}}
-	${0:${VISUAL}}
-{/foreach}
-endsnippet
-
-snippet foreachelse "{foreach} is used for looping over arrays of data."
-{foreach $${1:array_variable} as $${2:var_or_key}${3: => $${4:itemvar}}}
-	${0:${VISUAL}}
-{foreachelse}
-	${5}
-{/foreach}
-endsnippet
-
-snippet wh "{while} loops in Smarty have much the same flexibility as PHP while statements, with a few added features for the template engine. Every {while} must be paired with a matching {/while}. All PHP conditionals and functions are recognized, such as ||, or, &&, and, is_array(), etc."
-{while ${1} }
-	${0:${VISUAL}}
-{/while}
-endsnippet
-
 
 
 
@@ -92,78 +17,12 @@ snippet assign "{assign} is used for assigning template variables during the exe
 {assign var='${1}' value='${2}'${3: scope='${4|parent,root,global|}'}}
 endsnippet
 
-# https://www.smarty.net/docs/en/language.function.block.tpl
-snippet block "{block} is used to define a named area of template source for template inheritance."
-{block name='${1}'}
-	${0:${VISUAL}}
-{/block}
-endsnippet
-
-# https://www.smarty.net/docs/en/language.function.call.tpl
-snippet call "{call} is used to call a template function defined by the {function} tag just like a plugin function."
-{call name=${1}${2: assign=${3}}${4: variables}}
-endsnippet
-
-# https://www.smarty.net/docs/en/language.function.capture.tpl
-snippet capture "{capture} is used to collect the output of the template between the tags into a variable instead of displaying it. Any content between {capture name='foo'} and {/capture} is collected into the variable specified in the name attribute. "
-{capture name='${1}'${2: assign='${3}' }${4: append='${5:array_variable}'}}
-	${0:${VISUAL}}
-{/capture}
-endsnippet
-
 # https://www.smarty.net/docs/en/language.function.config.load.tpl
 snippet config_load "config_load"
-{config_load file='${1}'${2: section='${3}'}${4: scope='${5|local,parent,global|}'}]
-endsnippet
-
-# https://www.smarty.net/docs/en/language.function.extends.tpl
-snippet extends "{extends} tags are used in child templates in template inheritance for extending parent templates."
-{extends file='${1}'}
-endsnippet
-
-# https://www.smarty.net/docs/en/language.function.function.tpl
-snippet function "{function} is used to create functions within a template and call them just like a plugin function. Instead of writing a plugin that generates presentational content, keeping it in the template is often a more manageable choice. It also simplifies data traversal, such as deeply nested menus."
-{function name='${1}' ${2:variables}}
-	${0:${VISUAL}}
-{/function}
+{config_load file='${1}'${2: section='${3}'}${4: scope='${5|local,parent,global|}'}}
 endsnippet
 
 # https://www.smarty.net/docs/en/language.function.include.tpl
 snippet include "{include} tags are used for including other templates in the current template. Any variables available in the current template are also available within the included template."
 {include file='${1}'${2: assign='${3}'}${4: cache_lifetime=${5}}${6: compile_id='${7}'}${8: cache_id='${9}'}${10: scope='${11|parent,root,global|}'}${12: variables}}
 endsnippet
-
-# https://www.smarty.net/docs/en/language.function.literal.tpl
-snippet literal "{literal} tags allow a block of data to be taken literally. This is typically used around Javascript or stylesheet blocks where {curly braces} would interfere with the template delimiter syntax"
-{literal}
-	${0:${VISUAL}}
-{/literal}
-endsnippet
-
-# https://www.smarty.net/docs/en/language.function.nocache.tpl
-snippet nocache "{nocache} is used to disable caching of a template section. Every {nocache} must be paired with a matching {/nocache}."
-{nocache}
-	${0:${VISUAL}}
-{/nocache}
-endsnippet
-
-# https://www.smarty.net/docs/en/language.function.section.tpl
-snippet section "A {section} is for looping over sequentially indexed arrays of data, unlike {foreach} which is used to loop over a single associative array. Every {section} tag must be paired with a closing {/section} tag."
-{section name='${1}'${2: loop='${3}'}${4: start=${5}}${6: step=${7}}${8: max=${9}}${10: show=${11}}}
-	${0:${VISUAL}}
-{/section}
-endsnippet
-
-# https://www.smarty.net/docs/en/language.function.setfilter.tpl
-snippet setfilter "The {setfilter}...{/setfilter} block tag allows the definition of template instance's variable filters."
-{setfilter ${1:filters}}
-	${0:${VISUAL}}
-{/setfilter}
-endsnippet
-
-# https://www.smarty.net/docs/en/language.function.strip.tpl
-snippet strip "Anything within {strip}{/strip} tags are stripped of the extra spaces or carriage returns at the beginnings and ends of the lines before they are displayed. This way you can keep your templates readable, and not worry about extra white space causing problems."
-{strip}
-	${0:${VISUAL}}
-{/strip}
-endsnippet
diff --git a/snippets/smarty.snippets b/snippets/smarty.snippets
new file mode 100644
index 000000000..070fcd7e1
--- /dev/null
+++ b/snippets/smarty.snippets
@@ -0,0 +1,139 @@
+# snippets for smarty3
+
+extends html
+extends javascript
+extends css
+
+# https://www.smarty.net/docs/en/language.function.if.tpl
+snippet if "{if cond} ... {/if}"
+	{if ${1}}
+		${0:${VISUAL}}
+	{/if}
+
+snippet ifn "{if !cond} ... {/if}"
+	{if ${1}}
+		${0:${VISUAL}}
+	{/if}
+
+snippet ife "{if cond} ... {else} ... {/if}"
+	{if ${1}}
+		${0:${VISUAL}}
+	{else}
+		${2}
+	{/if}
+
+snippet eif "{elseif cond} ... {/if}"
+	{elseif ${1}}
+		${0:${VISUAL}}
+	{/if}
+
+snippet el "{else} ... {/if}"
+	{else}
+		${1}
+	{/if}
+
+# https://www.smarty.net/docs/en/language.function.for.tpl
+snippet for "The {for} tag is used to create simple loops."
+	{for $${1:var}=${2:start} to ${3:end}${4: step ${5}}${6: max=${7}}}
+		${0:${VISUAL}}
+	{/for}
+
+snippet forelse "The {for}{forelse} tag is used to create simple loops."
+	{for $${1:var}=${2:start} to ${3:end}${4: step ${5}}${6: max=${7}}}
+		${0:${VISUAL}}
+	{forelse}
+		${8}
+	{/for}
+
+# https://www.smarty.net/docs/en/language.function.foreach.tpl
+snippet foreach "{foreach} is used for looping over arrays of data."
+	{foreach $${1:array_variable} as $${2:var_or_key}${3: => $${4:itemvar}}}
+		${0:${VISUAL}}
+	{/foreach}
+
+snippet foreach2 "[Smarty2] {foreach} is used for looping over arrays of data."
+	{foreach from=$${1:collection} item='${2}'${3: key='${4}'}${5: name='${6}'}}
+		${0:${VISUAL}}
+	{/foreach}
+
+snippet foreachelse "{foreach} is used for looping over arrays of data."
+	{foreach $${1:array_variable} as $${2:var_or_key}${3: => $${4:itemvar}}}
+		${0:${VISUAL}}
+	{foreachelse}
+		${5}
+	{/foreach}
+
+snippet wh "{while} loops in Smarty have much the same flexibility as PHP while statements, with a few added features for the template engine. Every {while} must be paired with a matching {/while}. All PHP conditionals and functions are recognized, such as ||, or, &&, and, is_array(), etc."
+	{while ${1}}
+		${0:${VISUAL}}
+	{/while}
+
+
+
+# https://www.smarty.net/docs/en/language.function.append.tpl
+#snippet append implemented in UltiSnips format
+
+# https://www.smarty.net/docs/en/language.function.assign.tpl
+#snippet assign implemented in UltiSnips format
+
+# https://www.smarty.net/docs/en/language.function.block.tpl
+snippet block "{block} is used to define a named area of template source for template inheritance."
+	{block name='${1}'}
+		${0:${VISUAL}}
+	{/block}
+
+# https://www.smarty.net/docs/en/language.function.call.tpl
+snippet call "{call} is used to call a template function defined by the {function} tag just like a plugin function."
+	{call name=${1}${2: assign=${3}}${4: variables}}
+
+# https://www.smarty.net/docs/en/language.function.capture.tpl
+snippet capture "{capture} is used to collect the output of the template between the tags into a variable instead of displaying it. Any content between {capture name='foo'} and {/capture} is collected into the variable specified in the name attribute. "
+	{capture name='${1}'${2: assign='${3}' }${4: append='${5:array_variable}'}}
+		${0:${VISUAL}}
+	{/capture}
+
+# https://www.smarty.net/docs/en/language.function.config.load.tpl
+#snippet config_load implemented in UltiSnips format
+
+# https://www.smarty.net/docs/en/language.function.extends.tpl
+snippet extends "{extends} tags are used in child templates in template inheritance for extending parent templates."
+	{extends file='${1}'}
+
+# https://www.smarty.net/docs/en/language.function.function.tpl
+snippet function "{function} is used to create functions within a template and call them just like a plugin function. Instead of writing a plugin that generates presentational content, keeping it in the template is often a more manageable choice. It also simplifies data traversal, such as deeply nested menus."
+	{function name='${1}' ${2:variables}}
+		${0:${VISUAL}}
+	{/function}
+
+# https://www.smarty.net/docs/en/language.function.include.tpl
+#snippet include implemented in UltiSnips format
+
+# https://www.smarty.net/docs/en/language.function.literal.tpl
+snippet literal "{literal} tags allow a block of data to be taken literally. This is typically used around Javascript or stylesheet blocks where {curly braces} would interfere with the template delimiter syntax"
+	{literal}
+		${0:${VISUAL}}
+	{/literal}
+
+# https://www.smarty.net/docs/en/language.function.nocache.tpl
+snippet nocache "{nocache} is used to disable caching of a template section. Every {nocache} must be paired with a matching {/nocache}."
+	{nocache}
+		${0:${VISUAL}}
+	{/nocache}
+
+# https://www.smarty.net/docs/en/language.function.section.tpl
+snippet section "A {section} is for looping over sequentially indexed arrays of data, unlike {foreach} which is used to loop over a single associative array. Every {section} tag must be paired with a closing {/section} tag."
+	{section name='${1}'${2: loop='${3}'}${4: start=${5}}${6: step=${7}}${8: max=${9}}${10: show=${11}}}
+		${0:${VISUAL}}
+	{/section}
+
+# https://www.smarty.net/docs/en/language.function.setfilter.tpl
+snippet setfilter "The {setfilter}...{/setfilter} block tag allows the definition of template instance's variable filters."
+	{setfilter ${1:filters}}
+		${0:${VISUAL}}
+	{/setfilter}
+
+# https://www.smarty.net/docs/en/language.function.strip.tpl
+snippet strip "Anything within {strip}{/strip} tags are stripped of the extra spaces or carriage returns at the beginnings and ends of the lines before they are displayed. This way you can keep your templates readable, and not worry about extra white space causing problems."
+	{strip}
+		${0:${VISUAL}}
+	{/strip}

From cc77a816191e1ab649be67310adbb2471fd60e75 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Sun, 11 Sep 2022 11:20:48 +0100
Subject: [PATCH 1545/1587] Snippet for #pragma once include guard

It is non-standard, but most (all?) compilers implement it.

See also https://en.wikipedia.org/wiki/Pragma_once#Portability
---
 UltiSnips/cpp.snippets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index a997f001e..2202dfd69 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -30,6 +30,11 @@ endglobal
 ###########################################################################
 #                            TextMate Snippets                            #
 ###########################################################################
+snippet ponce "#pragma once include guard"
+#pragma once
+
+endsnippet
+
 snippet main
 int main(int argc, char *argv[])
 {

From faaa499189c4ee3fe13860e675e2370d55e3e5dd Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Sun, 11 Sep 2022 20:32:45 +0100
Subject: [PATCH 1546/1587] C++ snippet for namespace and type aliases and for
 using directives and declarations

---
 UltiSnips/cpp.snippets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/UltiSnips/cpp.snippets b/UltiSnips/cpp.snippets
index 2202dfd69..4a22782fb 100644
--- a/UltiSnips/cpp.snippets
+++ b/UltiSnips/cpp.snippets
@@ -72,6 +72,14 @@ namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`}
 }${1/.+/ \/* /m}$1${1/.+/ *\/ /m}
 endsnippet
 
+snippet nsa "namespace alias"
+namespace ${1:alias} = ${2:namespace};
+endsnippet
+
+snippet using "using directive/using declaration/type alias"
+using ${1:namespace}`!p snip.rv = ' ' if t[1] == 'namespace' else ' = ' if t[1] != '' else ''`${2:name};
+endsnippet
+
 snippet readfile "read file (readF)"
 std::vector<char> v;
 if (FILE *fp = fopen(${1:"filename"}, "r"))

From 250fd916757a545e7dfa29a62afa1e7ea16e2460 Mon Sep 17 00:00:00 2001
From: Whyme Lyu <callme5long@gmail.com>
Date: Fri, 7 Oct 2022 05:06:39 +0800
Subject: [PATCH 1547/1587] Escape $ in ruby.snippets for $PROGRAM_NAME

---
 snippets/ruby.snippets | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 34d56fb29..95de362e2 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -199,18 +199,18 @@ snippet defds
 snippet am
 	alias_method :${1:new_name}, :${0:old_name}
 snippet app
-	if __FILE__ == $PROGRAM_NAME
+	if __FILE__ == \$PROGRAM_NAME
 		${0}
 	end
 # usage_if()
 snippet usai
 	if ARGV.${1}
-		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${0}
+		abort "Usage: #{\$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${0}
 	end
 # usage_unless()
 snippet usau
 	unless ARGV.${1}
-		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${0}
+		abort "Usage: #{\$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${0}
 	end
 snippet array
 	Array.new(${1:10}) { |${2:i}| ${0} }
@@ -439,7 +439,7 @@ snippet optp
 	options = { ${0:default: 'args'} }
 
 	ARGV.options do |opts|
-		opts.banner = "Usage: #{File.basename($PROGRAM_NAME)}"
+		opts.banner = "Usage: #{File.basename(\$PROGRAM_NAME)}"
 	end
 snippet opt
 	opts.on('-${1:o}', '--${2:long-option-name}', ${3:String}, '${4:Option description.}') do |${5:opt}|

From 9a7f3968c92c6589d3a12aa5448e8374c8d68a42 Mon Sep 17 00:00:00 2001
From: Craig Paterson <darksavant@gmail.com>
Date: Mon, 10 Oct 2022 12:16:45 +1100
Subject: [PATCH 1548/1587] Add parentheses for IO call since the code
 formatter prefers it that way

---
 snippets/elixir.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index c04c9ade6..f0b17c4ed 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -3,9 +3,9 @@ snippet do
 		${0:${VISUAL}}
 	end
 snippet put IO.puts
-	IO.puts "${0}"
+	IO.puts("${0}")
 snippet ins IO.inspect
-	IO.inspect ${0}
+	IO.inspect(${0})
 snippet insl IO.inspect with label
 	IO.inspect(${0}label: "${1:label}")
 snippet if if .. do .. end
@@ -247,7 +247,7 @@ snippet >f pipe to filter
 snippet >r pipe to reduce
 	|> Enum.reduce(${1:acc}, fn ${2}, ${3:acc} -> ${0} end)
 snippet >i pipe to inspect
-	|> IO.inspect
+	|> IO.inspect()
 snippet >il pipe to inspect with label
 	|> IO.inspect(label: "${1:label}")
 snippet cs

From 53851075981f6c785a0b96830f0689fc76078853 Mon Sep 17 00:00:00 2001
From: Craig Paterson <darksavant@gmail.com>
Date: Mon, 10 Oct 2022 12:35:38 +1100
Subject: [PATCH 1549/1587] Improvements to the GenServer and Supervisor
 snippets

---
 snippets/elixir.snippets | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index f0b17c4ed..d217489b6 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -265,22 +265,27 @@ snippet genserver basic genserver structure
 	use GenServer
 
 	@doc false
-	def start_link do
-		GenServer.start_link(__MODULE__, ${1:Map.new})
+	def start_link(init_args) do
+		GenServer.start_link(__MODULE__, init_args, name: __MODULE__)
 	end
 
 	@impl true
-	def init(state) do
-		{:ok, state}
+	def init(_init_args) do
+		{:ok, []}
 	end
-snippet genserver: basic genserver structure
-	use GenServer
+snippet super basic supervisor structure
+	use Supervisor
 
 	@doc false
-	def start_link, do: GenServer.start_link(__MODULE__, ${1:Map.new})
+	def start_link(init_args) do
+		Supervisor.start_link(__MODULE__, init_args, name: __MODULE__)
+	end
 
 	@impl true
-	def init(state), do: {:ok, state}
+	def init(_init_args) do
+		children = [${1}]
+		Supervisor.init(children, strategy: :one_for_one)
+	end
 snippet impl
 	@impl true
 	def ${1:name} do

From b47c2e37237875185d170f32cac67af5ab72f22d Mon Sep 17 00:00:00 2001
From: Craig Paterson <darksavant@gmail.com>
Date: Tue, 11 Oct 2022 14:59:50 +1100
Subject: [PATCH 1550/1587] pass state into genserver

---
 snippets/elixir.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/elixir.snippets b/snippets/elixir.snippets
index d217489b6..37b1c0191 100644
--- a/snippets/elixir.snippets
+++ b/snippets/elixir.snippets
@@ -270,8 +270,8 @@ snippet genserver basic genserver structure
 	end
 
 	@impl true
-	def init(_init_args) do
-		{:ok, []}
+	def init(state) do
+		{:ok, state}
 	end
 snippet super basic supervisor structure
 	use Supervisor

From b904e5a68aeda29a0b6e09a6f61305a462ae2627 Mon Sep 17 00:00:00 2001
From: xuxin <xuxinmight@gmail.com>
Date: Tue, 22 Nov 2022 15:19:23 +0800
Subject: [PATCH 1551/1587] fix lua "require" snippet

---
 snippets/lua.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/lua.snippets b/snippets/lua.snippets
index 87cdc8e4a..6fe3fd365 100644
--- a/snippets/lua.snippets
+++ b/snippets/lua.snippets
@@ -68,5 +68,5 @@ snippet fwrs
 	io.${1:stderr}:write("$0")
 snippet fwrf
 	io.${1:stderr}:write(string.format("${2:%s}"$0))
-snippet im
-	import "${1:import file}"
+snippet req
+	require('${1:mod}')

From 6173350127d56dcc5664f50320b3f522951f56e9 Mon Sep 17 00:00:00 2001
From: Jimmy Z <j5nx.zhao@gmail.com>
Date: Mon, 28 Nov 2022 02:46:12 +0000
Subject: [PATCH 1552/1587] Disabled auto trigger for leq and geq

---
 UltiSnips/tex.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 00e910de4..8b71c283d 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -371,11 +371,11 @@ snippet != "Not Equal" w
 \neq 
 endsnippet
 
-snippet <= "leq" Aw
+snippet <= "leq" w
 \le 
 endsnippet
 
-snippet >= "geq" Aw
+snippet >= "geq" w
 \ge 
 endsnippet
 

From e96b116ab23d8cbb43f2c74296ea08c29955cc98 Mon Sep 17 00:00:00 2001
From: ybenel <44820142+M1ndo@users.noreply.github.com>
Date: Wed, 7 Dec 2022 23:06:52 +0000
Subject: [PATCH 1553/1587] Adding Org Mode

Adding Org-Mode snippets because they are missing.
---
 snippets/org.snippets | 125 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 snippets/org.snippets

diff --git a/snippets/org.snippets b/snippets/org.snippets
new file mode 100644
index 000000000..56ea5c8bd
--- /dev/null
+++ b/snippets/org.snippets
@@ -0,0 +1,125 @@
+# Org Mode Snippets Imported from (https://github.com/doomemacs/snippets/)
+# Imported by ybenel (github.com/m1ndo)
+
+# Begin 
+snippet begin
+	#+begin_${1:type} ${2:options}
+	$0
+	#+end_$1
+# Begin Center
+snippet <C
+	#+begin_center
+	$0
+	#+end_center
+# Begin Comment
+snippet <c
+	#+begin_comment
+	$0
+	#+end_comment
+# Begin Example
+snippet <e
+	#+begin_example
+	$0
+	#+end_example
+# Begin Export Ascii
+snippet <a
+	#+begin_export ascii
+	$0
+	#+end_export
+# Begin export html
+snippet <h
+	#+begin_export html
+	$0
+	#+end_export
+# Begin export Latex
+snippet <l
+	#+begin_export latex
+	$0
+	#+end_export
+# dot
+snippet dot
+	#+begin_src dot :file ${1:file}.${2:svg} :results file graphics
+	$0
+	#+end_src
+# elisp
+snippet elisp
+	#+begin_src emacs-lisp :tangle yes
+	$0
+	#+end_src
+# Entry
+snippet entry
+	#+begin_html
+	---
+	layout: ${1:default}
+	title: ${2:title}
+	---
+	#+end_html
+	$0
+# Begin example
+snippet ex
+	#+begin_example
+	$0
+	#+end_example
+# Begin export
+snippet export
+	#+begin_export ${1:type}
+	$0
+	#+end_export
+# Figure
+snippet fig
+	#+caption: ${1:caption}
+	#+attr_latex: ${2:scale=0.75}
+	#+name: fig-${3:label}
+# Org Header
+snippet head
+	#+title:     ${1:untitled document}
+	#+author:    ${2:`user-full-name`}
+	#+email:     ${3:`user-mail-address`}
+# Image
+snippet img
+	#+attr_html: :alt $2 :align ${3:left} :class img
+	[[${1:src}]${4:[${5:title}]}]
+	$0
+# Inline 
+snippet inl
+	src_${1:language}${2:[${3::exports code}]}{${4:code}}
+# Inline source
+snippet srci
+	src_${1:language}[${2:header}]{${0:body}}
+# Jupyter
+snippet jupyter
+	#+begin_src jupyter-${1:$$(yas-choose-value '("python" "julia" "R"))}${2: :session $3}${4: :async yes}
+	$0
+	#+end_src
+# Matrix (latex)
+snippet matrix
+	\left \(
+	\begin{array}{${1:ccc}}
+	${2:v1 & v2} \\
+	$0
+	\end{array}
+	\right \)
+# Name
+snippet name
+	#+name: $0
+# Quote
+snippet quote
+	#+begin_quote
+	$0
+	#+end_quote
+# Source
+snippet src
+	#+begin_src $1
+	$0
+	#+end_src
+# Todo
+snippet todo
+	TODO ${1:task description}
+# Verse
+snippet verse
+	#+begin_verse
+	$0
+	#+end_verse
+# Atrribute Width
+snippet #+attr_html:width
+	#+attr_html: :width ${1:500px}

From 8c917944354552c1263159a4a218ad924969be0c Mon Sep 17 00:00:00 2001
From: ybenel <44820142+M1ndo@users.noreply.github.com>
Date: Wed, 7 Dec 2022 23:26:15 +0000
Subject: [PATCH 1554/1587] Updating Org Mode

Fixing head snippet and adding sh and py snippets for export.
---
 snippets/org.snippets | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/snippets/org.snippets b/snippets/org.snippets
index 56ea5c8bd..0559cd68a 100644
--- a/snippets/org.snippets
+++ b/snippets/org.snippets
@@ -36,6 +36,16 @@ snippet <l
 	#+begin_export latex
 	$0
 	#+end_export
+# Begin export python 
+snippet <p
+	#+begin_export python
+	$0
+	#+end_export
+# Begin export shell
+snippet <s
+	#+begin_export shell
+	$0
+	#+end_export
 # dot
 snippet dot
 	#+begin_src dot :file ${1:file}.${2:svg} :results file graphics
@@ -73,8 +83,8 @@ snippet fig
 # Org Header
 snippet head
 	#+title:     ${1:untitled document}
-	#+author:    ${2:`user-full-name`}
-	#+email:     ${3:`user-mail-address`}
+	#+author:    ${2:user-full-name}
+	#+email:     ${3:user-mail-address}
 # Image
 snippet img
 	#+attr_html: :alt $2 :align ${3:left} :class img

From c2c1b75058175f7459777d4908c8e2fb1823938b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20D=C3=A9murg=C3=A9?= <gdemurge@gmail.com>
Date: Fri, 13 Jan 2023 14:26:40 +0100
Subject: [PATCH 1555/1587] Fixed constructors and createState definition

---
 snippets/dart-flutter.snippets | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/snippets/dart-flutter.snippets b/snippets/dart-flutter.snippets
index f51f11ca4..86775cb6c 100644
--- a/snippets/dart-flutter.snippets
+++ b/snippets/dart-flutter.snippets
@@ -3,6 +3,8 @@
 # Flutter stateless widget
 snippet stless
 	class $1 extends StatelessWidget {
+		const $1({super.key});
+
 		@override
 		Widget build(BuildContext context) {
 			return Container(
@@ -14,8 +16,10 @@ snippet stless
 # Flutter stateful widget
 snippet stful
 	class $1 extends StatefulWidget {
+		const $1({super.key});
+
 		@override
-		_$1State createState() => _$1State();
+		State<$1> createState() => _$1State();
 	}
 
 	class _$1State extends State<$1> {
@@ -30,8 +34,10 @@ snippet stful
 # Flutter widget with AnimationController
 snippet stanim
 	class $1 extends StatefulWidget {
+		const $1({super.key});
+
 		@override
-		_$1State createState() => _$1State();
+		State<$1> createState() => _$1State();
 	}
 
 	class _$1State extends State<$1>
@@ -85,5 +91,3 @@ snippet fsa
 			);
 		}
 	}
-
-

From 1049d2425b6d270621b48e110de37d5467a2a621 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 14 Jan 2023 15:45:35 +0000
Subject: [PATCH 1556/1587] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 8b31f770b..a54c31342 100644
--- a/README.md
+++ b/README.md
@@ -245,7 +245,6 @@ This list is kept up-to-date on a best effort basis.
 * Python - [honza](http://github.com/honza)
 * Ruby - [taq](http://github.com/taq)
 * Scala - [gorodinskiy](https://github.com/gorodinskiy)
-* Supercollider - [lpil](https://github.com/lpil)
 
 License
 -------

From 5086416dad71ab4952cbf381a5103947f16ae134 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Fri, 23 Dec 2022 14:02:48 +0000
Subject: [PATCH 1557/1587] LaTeX snippets for sectioning commands include
 labels

---
 UltiSnips/tex.snippets | 55 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 8b71c283d..f6b0cd8be 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -520,4 +520,59 @@ snippet subpar* "Sub Paragraph*" wi
 \subparagraph*{$1${VISUAL}}
 endsnippet
 
+snippet chapl "Chapter with label" wi
+\chapter{$1${VISUAL}}
+\label{cha:${2:${1/\W+/-/g}}}
+endsnippet
+
+snippet secl "Section with label" wi
+\section{$1${VISUAL}}
+\label{sec:${2:${1/\W+/-/g}}}
+endsnippet
+
+snippet sec*l "Section* with label" wi
+\section*{$1${VISUAL}}
+\label{sec:${2:${1/\W+/-/g}}}
+endsnippet
+
+snippet subl "Subsection with label" wi
+\subsection{$1${VISUAL}}
+\label{sub:${2:${1/\W+/-/g}}}
+endsnippet
+
+snippet sub*l "Subsection* with label" wi
+\subsection*{$1${VISUAL}}
+\label{sub:${2:${1/\W+/-/g}}}
+endsnippet
+
+snippet subsubl "Subsection with label" wi
+\subsubsection{$1${VISUAL}}
+\label{ssub:${2:${1/\W+/-/g}}}
+endsnippet
+
+snippet subsub*l "Subsubsection with label" wi
+\subsubsection*{$1${VISUAL}}
+\label{ssub:${2:${1/\W+/-/g}}}
+endsnippet
+
+snippet parl "Paragraph with label" wi
+\paragraph{$1${VISUAL}}
+\label{par:${2:${1/\W+/-/g}}}
+endsnippet
+
+snippet par*l "Paragraph* with label" wi
+\paragraph*{$1${VISUAL}}
+\label{par:${2:${1/\W+/-/g}}}
+endsnippet
+
+snippet subparl "Sub Paragraph with label" wi
+\subparagraph{$1${VISUAL}}
+\label{subp:${2:${1/\W+/-/g}}}
+endsnippet
+
+snippet subpar*l "Sub Paragraph* with label" wi
+\subparagraph*{$1${VISUAL}}
+\label{subp:${2:${1/\W+/-/g}}}
+endsnippet
+
 # vim:ft=snippets:

From 12a4415a60f2e8779d46aa8b35af34d908446cba Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Sat, 21 Jan 2023 14:09:01 +0000
Subject: [PATCH 1558/1587] Remove erroneous leading tabs from snippet

---
 UltiSnips/tex.snippets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index f6b0cd8be..6feed6913 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -160,9 +160,9 @@ snippet abs "abstract environment" b
 endsnippet
 
 snippet tab "tabular / array environment" b
-	\begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
-	$0${2/(?<=.)(c|l|r)|./(?1: & )/g}
-	\end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
+\begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
+$0${2/(?<=.)(c|l|r)|./(?1: & )/g}
+\end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
 endsnippet
 
 snippet table "Table environment" b

From 6c35df156de83055860a2d75842b5defe996d742 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Mon, 23 Jan 2023 20:05:18 +0000
Subject: [PATCH 1559/1587] Fix LaTeX snippet for inverse

If you type <kbd>1</kbd<kbd>2</kbd<kbd>3</kbd>>><kbd>i</kbd><kbd>n</kbd><kbd>v</kbd><kbd>s</kbd>, you'll see that it will be expanded to `3^{-1}`, throwing away anything but the last character before `invs`. This fixes it.
---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 6feed6913..fa7a8e484 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -400,7 +400,7 @@ snippet <! "normal" Aw
 \triangleleft 
 endsnippet
 
-snippet "(\d|\w)+invs" "inverse" Awr
+snippet "((\d|\w)+)invs" "inverse" Awr
 `!p snip.rv = match.group(1)`^{-1}
 endsnippet
 

From b0721103adf752ee1f724cb7c0c363bac1243e47 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Mon, 23 Jan 2023 19:53:13 +0000
Subject: [PATCH 1560/1587] Remove invasive autotrigger for LaTeX snippet
 (fixes #1476)

---
 UltiSnips/tex.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index fa7a8e484..393b3eee9 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -384,7 +384,7 @@ snippet nn "Tikz node" w
 $0
 endsnippet
 
-snippet lll "l" Aw
+snippet lll "l" w
 \ell
 endsnippet
 

From 04a28bfe31fc4a6b105111a6f2da916bb2cdc359 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sm=C3=A1ri?= <viktorsmari@users.noreply.github.com>
Date: Tue, 24 Jan 2023 09:27:45 +0100
Subject: [PATCH 1561/1587] Replace the hash rocket syntax from ruby with a
 colon

---
 UltiSnips/eruby.snippets | 44 ++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/UltiSnips/eruby.snippets b/UltiSnips/eruby.snippets
index ef93be440..8d97277df 100644
--- a/UltiSnips/eruby.snippets
+++ b/UltiSnips/eruby.snippets
@@ -44,13 +44,13 @@ snippet fi "<%= Fixtures.identify(:symbol) %>"
 endsnippet
 
 snippet ft "form_tag" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => '${2:update}'}${3:, ${4:${5:class} => '${6:form}'\}}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1:action: '${2:update}'}${3:, ${4:${5:class}: '${6:form}'\}}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 	$0
 `!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
 endsnippet
 
 snippet ffs "form_for submit 2" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${1:f}.submit '${2:Submit}'${3:, :disable_with => '${4:$2ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${1:f}.submit '${2:Submit}'${3:, disable_with: '${4:$2ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet f. "f_fields_for (nff)" w
@@ -84,7 +84,7 @@ snippet f. "f.radio_button" w
 endsnippet
 
 snippet f. "f.submit" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.submit "${1:Submit}"${2:, :disable_with => '${3:$1ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.submit "${1:Submit}"${2:, disable_with: '${3:$1ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet f. "f.text_area" w
@@ -110,19 +110,19 @@ snippet ff "form_for" w
 endsnippet
 
 snippet ist "image_submit_tag" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_submit_tag("${1:agree.png}"${2:${3:, :id => "${4:${1/^(\w+)(\.\w*)?$/$1/}}"}${5:, :name => "${6:${1/^(\w+)(\.\w*)?$/$1/}}"}${7:, :class => "${8:${1/^(\w+)(\.\w*)?$/$1/}-button}"}${9:, :disabled => ${10:false}}})`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_submit_tag("${1:agree.png}"${2:${3:, id: "${4:${1/^(\w+)(\.\w*)?$/$1/}}"}${5:, name: "${6:${1/^(\w+)(\.\w*)?$/$1/}}"}${7:, class: "${8:${1/^(\w+)(\.\w*)?$/$1/}-button}"}${9:, disabled: ${10:false}}})`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet it "image_tag" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_tag "$1${2:.png}"${3:${4:, :title => "${5:title}"}${6:, :class => "${7:class}"}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_tag "$1${2:.png}"${3:${4:, title: "${5:title}"}${6:, class: "${7:class}"}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet layout "layout"
-layout "${1:template_name}"${2:${3:, :only => ${4:[:${5:action}, :${6:action}]}}${7:, :except => ${8:[:${9:action}, :${10:action}]}}}
+layout "${1:template_name}"${2:${3:, only: ${4:[:${5:action}, :${6:action}]}}${7:, except: ${8:[:${9:action}, :${10:action}]}}}
 endsnippet
 
 snippet jit "javascript_include_tag" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`javascript_include_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`javascript_include_tag ${1::all}${2:, cache: ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet lt "link_to (name, dest)" w
@@ -130,23 +130,23 @@ snippet lt "link_to (name, dest)" w
 endsnippet
 
 snippet lia "link_to (action)" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", action: "${2:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet liai "link_to (action, id)" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:edit}", :id => ${3:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", action: "${2:edit}", id: ${3:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet lic "link_to (controller)" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", controller: "${2:items}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet lica "link_to (controller, action)" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", controller: "${2:items}", action: "${3:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet licai "link_to (controller, action, id)" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:edit}", :id => ${4:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", controller: "${2:items}", action: "${3:edit}", id: ${4:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet linpp "link_to (nested path plural)" w
@@ -174,15 +174,15 @@ page.hide ${1:"${2:id(s)}"}
 endsnippet
 
 snippet ins "page.insert_html (position, id, partial)"
-page.insert_html :${1:top}, ${2:"${3:id}"}, :${4:partial => "${5:template}"}
+page.insert_html :${1:top}, ${2:"${3:id}"}, ${4:partial: "${5:template}"}
 endsnippet
 
 snippet rep "page.replace (id, partial)"
-page.replace ${1:"${2:id}"}, :${3:partial => "${4:template}"}
+page.replace ${1:"${2:id}"}, ${3:partial: "${4:template}"}
 endsnippet
 
 snippet reph "page.replace_html (id, partial)"
-page.replace_html ${1:"${2:id}"}, :${3:partial => "${4:template}"}
+page.replace_html ${1:"${2:id}"}, ${3:partial: "${4:template}"}
 endsnippet
 
 snippet show "page.show (*ids)"
@@ -198,31 +198,31 @@ page.visual_effect :${1:toggle_slide}, ${2:"${3:DOM ID}"}
 endsnippet
 
 snippet rp "render (partial) (rp)"
-render :partial => "${1:item}"
+render partial: "${1:item}"
 endsnippet
 
 snippet rpc "render (partial,collection) (rpc)"
-render :partial => "${1:item}", :collection => ${2:@$1s}
+render partial: "${1:item}", collection: ${2:@$1s}
 endsnippet
 
 snippet rpl "render (partial,locals) (rpl)"
-render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}$0 }
+render partial: "${1:item}", locals: { ${2:$1}: ${3:@$1}$0 }
 endsnippet
 
 snippet rpo "render (partial,object) (rpo)"
-render :partial => "${1:item}", :object => ${2:@$1}
+render partial: "${1:item}", object: ${2:@$1}
 endsnippet
 
 snippet rps "render (partial,status) (rps)"
-render :partial => "${1:item}", :status => ${2:500}
+render partial: "${1:item}", status: ${2:500}
 endsnippet
 
 snippet slt "stylesheet_link_tag" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`stylesheet_link_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`stylesheet_link_tag ${1::all}${2:, cache: ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet st "submit_tag" w
-`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`submit_tag "${1:Save changes}"${2:, :id => "${3:submit}"}${4:, :name => "${5:$3}"}${6:, :class => "${7:form_$3}"}${8:, :disabled => ${9:false}}${10:, :disable_with => "${11:Please wait...}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`submit_tag "${1:Save changes}"${2:, id: "${3:submit}"}${4:, name: "${5:$3}"}${6:, class: "${7:form_$3}"}${8:, disabled: ${9:false}}${10:, disable_with: "${11:Please wait...}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
 endsnippet
 
 snippet else "else (ERB)"

From 8a0358944c2fc8d2fb4b0a3f93dcb18661f1fd9d Mon Sep 17 00:00:00 2001
From: JeffVenancius <43701418+JeffVenancius@users.noreply.github.com>
Date: Fri, 27 Jan 2023 20:11:40 -0300
Subject: [PATCH 1562/1587] Add files via upload

---
 snippets/gdscript.snippets | 125 +++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 snippets/gdscript.snippets

diff --git a/snippets/gdscript.snippets b/snippets/gdscript.snippets
new file mode 100644
index 000000000..e404092ba
--- /dev/null
+++ b/snippets/gdscript.snippets
@@ -0,0 +1,125 @@
+snippet class
+	class $1 extends ${2:Reference}
+	\t$3
+
+
+snippet pr
+	print($1)
+
+
+snippet ready
+	func _ready():
+	\t${1:pass}
+
+
+snippet init
+	func _init():
+	\t${1:pass}
+
+
+snippet process
+	func _process(delta):
+	\t${1:pass}
+
+
+snippet input
+	func _input(event):
+	\t${1:pass}
+
+
+snippet inpute
+	func _input_event(event):
+	\t${1:pass}
+
+
+snippet draw
+	func _draw():
+	\t${1:pass}
+
+
+snippet guii
+	func _gui_input(event):
+	\t${1:pass}
+
+
+snippet for
+	for $1 in $2:
+	\t${3:pass}
+
+
+snippet for
+	for $1 in range(${2:start}{$3:,end}):
+	\t${4:pass}
+
+
+snippet if
+	if ${1:condition}:
+	\t${3:pass}
+	elif ${2:condition}:
+	\t${4:pass}
+	else:
+	\t${5:pass}
+
+
+snippet if
+	if ${1:condition}:
+	\t${2:pass}
+	else:
+	\t${3:pass}
+
+
+snippet if
+	if ${1:condition}:
+	\t${2:pass}
+
+
+snippet while
+	while ${1:condition}:
+	\t${2:pass}
+
+
+snippet func
+	func ${1:method}(${2:args}):
+	\t${3:pass}
+
+
+snippet signal
+	signal ${1:signalname}(${2:args})
+
+
+snippet export
+	export(${1:type}${2:,other_configs}) var ${3:name}${4: = default}${5: setget }
+
+
+snippet var
+	var ${1:name}${2: = default}${3: setget }
+
+
+snippet onready
+	onready var ${1:name} = get_node($2)
+
+
+snippet is
+	${1:instance} is ${2:class}
+
+
+snippet in
+	${1:element} in ${$2:array}
+
+
+snippet gdscript
+	extends ${1:BaseClass}
+
+	# class member variables go here, for example:
+	# var a = 2
+	# var b = \textvar\
+
+	func _ready():
+	\t# Called every time the node is added to the scene.
+	\t# Initialization here
+	\tpass
+
+
+
+# snippet pass  ##### do we really need this?
+# 	pass

From 8f9eead6c4dfdfee9052d4ea667c1c9d8a396f80 Mon Sep 17 00:00:00 2001
From: sharils <3063067+sharils@users.noreply.github.com>
Date: Fri, 27 Jan 2023 16:33:22 +0800
Subject: [PATCH 1563/1587] Fix UltiSnips " trigger closing quote expansion

---
 UltiSnips/python.snippets | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index dc5761af2..a47544117 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -127,14 +127,18 @@ def triple_quotes_handle_trailing(snip, quoting_style):
 	if not snip.c:
 		# Do this only once, otherwise the following error would happen:
 		# RuntimeError: The snippets content did not converge: …
-		_, col = vim.current.window.cursor
-		line = vim.current.line
+		row, col = vim.current.window.cursor
+
+		# before ultisnip expansion, chars ahead cursor is at row - 1, col
+		# after ultisnip expansion, they are pushed to row + 1, col - 1
+		# when this function is run, it's already after ultisni expansion
+		line = snip.buffer[row + 1]
 
 		# Handle already existing quote chars after the trigger.
 		_ret = quoting_style * 3
 		while True:
 			try:
-				nextc = line[col]
+				nextc = line[col - 1]
 			except IndexError:
 				break
 			if nextc == quoting_style and len(_ret):

From 68dfbccbe97b87ec9c80fa6d5ee144befc3f3a3b Mon Sep 17 00:00:00 2001
From: Max Gorin <regzok@gmail.com>
Date: Mon, 13 Feb 2023 14:40:14 +0530
Subject: [PATCH 1564/1587] Support heex filetype

---
 snippets/heex.snippets | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 snippets/heex.snippets

diff --git a/snippets/heex.snippets b/snippets/heex.snippets
new file mode 100644
index 000000000..41cc260a4
--- /dev/null
+++ b/snippets/heex.snippets
@@ -0,0 +1 @@
+extends eelixir

From 7fe13029e96dcfe48626d6cdaab2249e42e3eefd Mon Sep 17 00:00:00 2001
From: Iwakura Taro <taro@mail333.com>
Date: Sun, 5 Mar 2023 10:42:50 +0200
Subject: [PATCH 1565/1587] Method with memoization

---
 snippets/ruby.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 95de362e2..668194abe 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -44,6 +44,10 @@ snippet def
 	def ${1:method_name}
 		${0}
 	end
+snippet defm
+	def ${1:method}
+		@$1 ||= ${0}
+	end
 snippet deft
 	def test_${1:case_name}
 		${0}

From c7e61b73a546c9dd0525cd158cc1613bb48e414a Mon Sep 17 00:00:00 2001
From: Iwakura Taro <taro@mail333.com>
Date: Sun, 5 Mar 2023 10:43:57 +0200
Subject: [PATCH 1566/1587] Rejecting lines like `grep -v`

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index 668194abe..da82185a3 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -376,6 +376,8 @@ snippet finad
 	end
 snippet gre
 	grep(${1:/pattern/}) { |${2:match}| ${0} }
+snippet grepv
+	select { |${1:line}| $1 !~ ${2:/pattern/} }${0}
 snippet sub
 	${1:g}sub(${2:/pattern/}) { |${3:match}| ${0} }
 snippet sca

From 5094d3658023cf743379f45c4c34bcc0a39ca4a2 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Tue, 25 Apr 2023 20:00:10 +0100
Subject: [PATCH 1567/1587] TeX: remove spurious line breaks

---
 snippets/tex.snippets | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 25f8f37f7..3dddd184a 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -390,63 +390,48 @@ snippet hrefc
 # enquote from package csquotes
 snippet enq enquote
 	\\enquote{${1:${VISUAL:text}}} ${0}
-
 # Time derivative
 snippet ddt time derivative
 	\\frac{d}{dt} {$1} {$0}
-
 # Limit
 snippet lim limit
 	\\lim_{{$1}} {{$2}} {$0}
-
 # Partial derivative
 snippet pdv partial derivation
 	\\frac{\\partial {$1}}{\\partial {$2}} {$0}
-
 # Second order partial derivative
 snippet ppdv second partial derivation
 	\\frac{\\partial^2 {$1}}{\\partial {$2} \\partial {$3}} {$0}
-
 # Ordinary derivative
 snippet dv derivative
 	\\frac{d {$1}}{d {$2}} {$0}
-
 # Summation
 snippet summ summation
 	\\sum_{{$1}} {$0}
-
 # Shorthand for time derivative
 snippet dot dot
 	\\dot{{$1}} {$0}
-
 # Shorthand for second order time derivative
 snippet ddot ddot
 	\\ddot{{$1}} {$0}
-
 # Vector
 snippet vec vector
 	\\vec{{$1}} {$0}
-
 # Bar
 snippet bar bar
 	\\bar{{$1}} {$0}
-
 # Cross product
 snippet \x cross product
 	\\times {$0}
-
 # Dot product
 snippet . dot product
 	\\cdot {$0}
-
 # Integral
 snippet int integral
 	\\int_{{$1}}^{{$2}} {$3} \\: d{$4} {$0}
-
 # Right arrow
 snippet ra rightarrow
 	\\rightarrow {$0}
-
 # Long right arrow
 snippet lra longrightarrow
 	\\longrightarrow {$0}

From 76e35f37aa9e47a8b7f2909de222844ae38c7007 Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Sun, 11 Sep 2022 20:36:47 +0100
Subject: [PATCH 1568/1587] Qualifying Range-v3 and C++20's <ranges> entities;
 ad-hoc snippet for transform and filter

I find myself very frequently writing `ranges::views::`, and I'd be doing the same
with `std::views::` if I was using C++20, so I think this snippets can be useful.

`transform` and `filter` are two of the most used adapters, so haveing a snippet
for them is good (for both `std::` and `ranges::`, at the price of a backspace).
---
 snippets/cpp.snippets | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 4e4155a82..3bd1f001a 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -230,3 +230,24 @@ snippet af auto function
 	{
 		${0}
 	};
+# Range-v3 transform
+snippet transform "ranges::views::transform"
+	${1:${2:std::}${3:ranges::}views::}transform($4)
+# Range-v3 transform
+snippet filter "ranges::views::filter"
+	${1:${2:std::}${3:ranges::}views::}filter($4)
+# Range-v3 ranges::
+snippet r "ranges::"
+	ranges::
+# Range-v3 ranges::views::
+snippet rv "ranges::views::"
+	ranges::views::
+# Range-v3 ranges::actions::
+snippet ra "ranges::actions::"
+	ranges::actions::
+# STL std::ranges::
+snippet sr "std::ranges::"
+	std::ranges::
+# STL std::views::
+snippet sv "std::views::"
+	std::views::

From 845798bbebe893dcb0c8ebfb40be778433db7ba4 Mon Sep 17 00:00:00 2001
From: r3jack <r3jack@gmail.com>
Date: Wed, 23 Aug 2023 14:29:26 +0800
Subject: [PATCH 1569/1587] add dart print and anonymous function snippets

---
 snippets/dart.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index f4fd4f13e..462b5e390 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -1,3 +1,7 @@
+snippet af
+	(${1}) {${2}}${0}
+snippet pr
+	print(${1});
 snippet lib
 	library ${1};
 	${0}

From d37486881a0a771b844a235bc3e025046088690d Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Thu, 24 Aug 2023 23:54:30 +0100
Subject: [PATCH 1570/1587] Remove redundant empty line after #include snippets
 for C

---
 snippets/c.snippets | 2 --
 1 file changed, 2 deletions(-)

diff --git a/snippets/c.snippets b/snippets/c.snippets
index df5595b9e..a3f4d5c99 100644
--- a/snippets/c.snippets
+++ b/snippets/c.snippets
@@ -16,11 +16,9 @@ snippet mainn
 # #include <...>
 snippet inc
 	#include <${1:stdio}.h>
-	$0
 # #include "..."
 snippet Inc
 	#include "${1:`vim_snippets#Filename("$1.h")`}"
-	$0
 # ifndef...define...endif
 snippet ndef
 	#ifndef $1

From 175081434cfee0727b1601d954022eb48490a1cc Mon Sep 17 00:00:00 2001
From: jack <r3jack@gmail.com>
Date: Mon, 4 Sep 2023 15:19:04 +0800
Subject: [PATCH 1571/1587] add debugger to dart

---
 snippets/dart.snippets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snippets/dart.snippets b/snippets/dart.snippets
index 462b5e390..30ab3d5d8 100644
--- a/snippets/dart.snippets
+++ b/snippets/dart.snippets
@@ -2,6 +2,9 @@ snippet af
 	(${1}) {${2}}${0}
 snippet pr
 	print(${1});
+snippet deb
+	debugger();
+	${0}
 snippet lib
 	library ${1};
 	${0}

From ccc2fa1529d372f7ac16d5eb07a385a72b50e05d Mon Sep 17 00:00:00 2001
From: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
Date: Mon, 11 Sep 2023 21:08:16 +0100
Subject: [PATCH 1572/1587] Scheme: remove redundant tab

---
 snippets/scheme.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/scheme.snippets b/snippets/scheme.snippets
index 4c0c78a09..0aa137945 100644
--- a/snippets/scheme.snippets
+++ b/snippets/scheme.snippets
@@ -17,7 +17,7 @@ snippet *
 # Definition
 snippet def
 	(define (${1:name})
-			${0:definition})
+		${0:definition})
 
 # Definition with lambda
 snippet defl

From dd5477668e472d5f39d4b5545f1e269168509ffd Mon Sep 17 00:00:00 2001
From: HBSpy <zymspy@163.com>
Date: Tue, 31 Oct 2023 11:39:52 +0800
Subject: [PATCH 1573/1587] Update php.snippets

---
 UltiSnips/php.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index f27ac8be5..7db6bead6 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -6,7 +6,7 @@ import vim
 # Set g:ultisnips_php_scalar_types to 1 if you'd like to enable PHP 7's scalar types for return values
 def isPHPScalarTypesEnabled():
 	isEnabled = vim.eval("get(g:, 'ultisnips_php_scalar_types', 0)") == "1"
-	return isEnabled or re.match('<\?php\s+declare\(strict_types=[01]\);', '\n'.join(vim.current.window.buffer))
+	return isEnabled or re.match('r<\?php\s+declare\(strict_types=[01]\);', '\n'.join(vim.current.window.buffer))
 endglobal
 
 ## Snippets from SnipMate, taken from

From b039190177d97a968d80518470910aae7faf182a Mon Sep 17 00:00:00 2001
From: HBSpy <zymspy@163.com>
Date: Wed, 1 Nov 2023 16:56:18 +0800
Subject: [PATCH 1574/1587] Update php.snippets

sorry to make a mistake in the last pr
---
 UltiSnips/php.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index 7db6bead6..def1ca4da 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -6,7 +6,7 @@ import vim
 # Set g:ultisnips_php_scalar_types to 1 if you'd like to enable PHP 7's scalar types for return values
 def isPHPScalarTypesEnabled():
 	isEnabled = vim.eval("get(g:, 'ultisnips_php_scalar_types', 0)") == "1"
-	return isEnabled or re.match('r<\?php\s+declare\(strict_types=[01]\);', '\n'.join(vim.current.window.buffer))
+	return isEnabled or re.match(r'<\?php\s+declare\(strict_types=[01]\);', '\n'.join(vim.current.window.buffer))
 endglobal
 
 ## Snippets from SnipMate, taken from

From 5bde67f3c26eaad06d047f3582c1d3a57a3d41e2 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Wed, 22 Nov 2023 16:46:25 +0000
Subject: [PATCH 1575/1587] feat(tex): de-duplicate snippets

Remove from ultisnips those that are already defined in snipmate format
---
 UltiSnips/tex.snippets | 188 -----------------------------------------
 snippets/tex.snippets  |  10 +++
 2 files changed, 10 insertions(+), 188 deletions(-)

diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets
index 393b3eee9..69d86f443 100644
--- a/UltiSnips/tex.snippets
+++ b/UltiSnips/tex.snippets
@@ -36,24 +36,6 @@ endglobal
 # ENVIRONMENT #
 ###############
 
-snippet beg "begin{} / end{}" bi
-\begin{$1}
-	${0:${VISUAL}}
-\end{$1}
-endsnippet
-
-snippet cnt "Center" bi
-\begin{center}
-	${0:${VISUAL}}
-\end{center}
-endsnippet
-
-snippet desc "Description" bi
-\begin{description}
-	\item[${1:${VISUAL}}] $0
-\end{description}
-endsnippet
-
 snippet lemma "Lemma" bi
 \begin{lemma}
 	${0:${VISUAL}}
@@ -135,24 +117,6 @@ snippet fig "Figure environment" bi
 \end{figure}
 endsnippet
 
-snippet enum "Enumerate" bi
-\begin{enumerate}
-	\item ${0:${VISUAL}}
-\end{enumerate}
-endsnippet
-
-snippet item "Itemize" bi
-\begin{itemize}
-	\item ${0:${VISUAL}}
-\end{itemize}
-endsnippet
-
-snippet case "cases" bi
-\begin{cases}
-	${0:${VISUAL}}
-\end{cases}
-endsnippet
-
 snippet abs "abstract environment" b
 \begin{abstract}
 	${0:${VISUAL}}
@@ -247,26 +211,6 @@ snippet srto "... Root" wi
 \sqrt[$1]{${2:${VISUAL}}}$0
 endsnippet
 
-snippet bf "Bold" wi
-\bf{${1:${VISUAL}}}$0
-endsnippet
-
-snippet it "Italic" wi
-\it{${1:${VISUAL}}}$0
-endsnippet
-
-snippet un "Underline" wi
-\un{${1:${VISUAL}}}$0
-endsnippet
-
-snippet rm "Text" wi
-\rm{${1:${VISUAL}}}$0
-endsnippet
-
-snippet itm "Item" wi
-\item ${0:${VISUAL}}
-endsnippet
-
 snippet ceil "Ceil" w
 \left\lceil $1 \right\rceil $0
 endsnippet
@@ -283,34 +227,10 @@ snippet bmat "Bmat" w
 \begin{bmatrix} $1 \end{bmatrix} $0
 endsnippet
 
-snippet () "Left( right)" w
-\left( ${1:${VISUAL}} \right) $0
-endsnippet
-
-snippet lr "left( right)" i
-\left( ${1:${VISUAL}} \right) $0
-endsnippet
-
-snippet lr( "left( right)" i
-\left( ${1:${VISUAL}} \right) $0
-endsnippet
-
-snippet lr| "left| right|" i
-\left| ${1:${VISUAL}} \right| $0
-endsnippet
-
-snippet lr{ "left\{ right\}" i
-\left\\{ ${1:${VISUAL}} \right\\} $0
-endsnippet
-
 snippet lrb "left\{ right\}" i
 \left\\{ ${1:${VISUAL}} \right\\} $0
 endsnippet
 
-snippet lr[ "left[ right]" i
-\left[ ${1:${VISUAL}} \right] $0
-endsnippet
-
 snippet lra "leftangle rightangle" wi
 \left<${1:${VISUAL}} \right>$0
 endsnippet
@@ -467,112 +387,4 @@ snippet ac "Acroynm normal" bi
 \ac{${1:acronym}}
 endsnippet
 
-snippet ni "Non-indented paragraph" bi
-\noindent
-endsnippet
-
-
-############
-# SECTIONS #
-############
-
-snippet chap "Chapter" wi
-\chapter{$1${VISUAL}}
-endsnippet
-
-snippet sec "Section" wi
-\section{$1${VISUAL}}
-endsnippet
-
-snippet sec* "Section*" wi
-\section*{$1${VISUAL}}
-endsnippet
-
-snippet sub "Subsection" wi
-\subsection{$1${VISUAL}}
-endsnippet
-
-snippet sub* "Subsection*" wi
-\subsection*{$1${VISUAL}}
-endsnippet
-
-snippet subsub "Subsection" wi
-\subsubsection{$1${VISUAL}}
-endsnippet
-
-snippet subsub* "Subsubsection" wi
-\subsubsection*{$1${VISUAL}}
-endsnippet
-
-snippet par "Paragraph" wi
-\paragraph{$1${VISUAL}}
-endsnippet
-
-snippet par* "Paragraph*" wi
-\paragraph*{$1${VISUAL}}
-endsnippet
-
-snippet subpar "Sub Paragraph" wi
-\subparagraph{$1${VISUAL}}
-endsnippet
-
-snippet subpar* "Sub Paragraph*" wi
-\subparagraph*{$1${VISUAL}}
-endsnippet
-
-snippet chapl "Chapter with label" wi
-\chapter{$1${VISUAL}}
-\label{cha:${2:${1/\W+/-/g}}}
-endsnippet
-
-snippet secl "Section with label" wi
-\section{$1${VISUAL}}
-\label{sec:${2:${1/\W+/-/g}}}
-endsnippet
-
-snippet sec*l "Section* with label" wi
-\section*{$1${VISUAL}}
-\label{sec:${2:${1/\W+/-/g}}}
-endsnippet
-
-snippet subl "Subsection with label" wi
-\subsection{$1${VISUAL}}
-\label{sub:${2:${1/\W+/-/g}}}
-endsnippet
-
-snippet sub*l "Subsection* with label" wi
-\subsection*{$1${VISUAL}}
-\label{sub:${2:${1/\W+/-/g}}}
-endsnippet
-
-snippet subsubl "Subsection with label" wi
-\subsubsection{$1${VISUAL}}
-\label{ssub:${2:${1/\W+/-/g}}}
-endsnippet
-
-snippet subsub*l "Subsubsection with label" wi
-\subsubsection*{$1${VISUAL}}
-\label{ssub:${2:${1/\W+/-/g}}}
-endsnippet
-
-snippet parl "Paragraph with label" wi
-\paragraph{$1${VISUAL}}
-\label{par:${2:${1/\W+/-/g}}}
-endsnippet
-
-snippet par*l "Paragraph* with label" wi
-\paragraph*{$1${VISUAL}}
-\label{par:${2:${1/\W+/-/g}}}
-endsnippet
-
-snippet subparl "Sub Paragraph with label" wi
-\subparagraph{$1${VISUAL}}
-\label{subp:${2:${1/\W+/-/g}}}
-endsnippet
-
-snippet subpar*l "Sub Paragraph* with label" wi
-\subparagraph*{$1${VISUAL}}
-\label{subp:${2:${1/\W+/-/g}}}
-endsnippet
-
 # vim:ft=snippets:
diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 3dddd184a..4d54fe011 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -195,11 +195,21 @@ snippet par \paragraph
 	\\paragraph{${1:paragraph name}}%
 	\\label{par:${2:$1}}
 	${0}
+# Paragraph*
+snippet par* \paragraph*
+	\\paragraph*{${1:paragraph name}}%
+	\\label{par:${2:$1}}
+	${0}
 # Sub Paragraph
 snippet subp \subparagraph
 	\\subparagraph{${1:subparagraph name}}%
 	\\label{subp:${2:$1}}
 	${0}
+# Sub Paragraph*
+snippet subp* \subparagraph*
+	\\subparagraph*{${1:subparagraph name}}%
+	\\label{subp:${2:$1}}
+	${0}
 snippet ni \noindent
 	\\noindent
 	${0}

From 2ed3a7359f8fcb2b4c06b8c3ba2d0663158f6f09 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 27 Nov 2023 11:51:47 +0000
Subject: [PATCH 1576/1587] chore(readme): note that snipmate contributions
 should be preferred

since UltiSnips supports both
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index a54c31342..8cf06c4b8 100644
--- a/README.md
+++ b/README.md
@@ -169,6 +169,9 @@ on the fly adding those.
 Currently all snippets from UltiSnips have been put into `/UltiSnips` - some work
 on merging should be done (dropping duplicates etc). Also see engines section above.
 
+Since UltiSnips supports both UltiSnip and vim-snipmate snippets, when
+contributing fixes/new snippets, please prefer adding vim-snipmate snippets.
+
 Related repositories
 --------------------
 

From ec4ff7e9c9b274e93295924e59c82b4f51e2ae42 Mon Sep 17 00:00:00 2001
From: Harris <zhuzhzh@163.com>
Date: Tue, 28 Nov 2023 11:03:19 +0800
Subject: [PATCH 1577/1587] Update vimsnippets.py to fix the escape char issue

---
 pythonx/vimsnippets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pythonx/vimsnippets.py b/pythonx/vimsnippets.py
index eceb83c5b..68b430e44 100644
--- a/pythonx/vimsnippets.py
+++ b/pythonx/vimsnippets.py
@@ -14,7 +14,7 @@ def complete(tab, opts):
     :return: a string that match with tab
     """
     el = [x for x in tab]
-    pat = "".join(list(map(lambda x: x + "\w*" if re.match("\w", x) else x,
+    pat = "".join(list(map(lambda x: x + r"\w*" if re.match(r"\w", x) else x,
                            el)))
     try:
         opts = [x for x in opts if re.search(pat, x, re.IGNORECASE)]

From a8dc763b3f534ec1a0c0ae5082689c10dcaf9d5f Mon Sep 17 00:00:00 2001
From: Alexander Shirokov <shirokovalexs@gmail.com>
Date: Mon, 11 Dec 2023 09:44:01 +0100
Subject: [PATCH 1578/1587] Add GTest support

Add a small set of frequently used GTest macros
---
 snippets/cpp.snippets | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/snippets/cpp.snippets b/snippets/cpp.snippets
index 3bd1f001a..bb9528a6f 100644
--- a/snippets/cpp.snippets
+++ b/snippets/cpp.snippets
@@ -251,3 +251,29 @@ snippet sr "std::ranges::"
 # STL std::views::
 snippet sv "std::views::"
 	std::views::
+##
+## Tests
+# GTest:add main
+snippet gtemain "GTest:add main"
+	int main(int argc, char **argv) {
+		testing::InitGoogleTest(&argc, argv);
+		return RUN_ALL_TESTS();
+	}
+# GTest:add test
+snippet gtetest "GTest:add test"
+	TEST(${1:SuiteName}, ${2:TestName}) {
+		${0}
+	}
+# GTest:add fixture
+snippet gtefix "GTest:add fixture"
+	TEST_F(${1:SuiteName}, ${2:TestName}) {
+		${0}
+	}
+# GTest:add parameterized test
+snippet gtepar "GTest:add parameterized test"
+	TEST_P(${1:SuiteName}, ${2:TestName}) {
+		${0}
+	}
+# GTest:instantiate parameterized test
+snippet gteparins "GTest:instantiate parameterized test"
+	INSTANTIATE_TEST_SUITE_P(${1:InstantiationName}, ${2:SuiteName}, ${0});

From ba72b08e04e184ecd0a2a1b8012a81ddb040dbc3 Mon Sep 17 00:00:00 2001
From: Harvey <hsyan2008@qq.com>
Date: Fri, 29 Dec 2023 15:52:57 +0800
Subject: [PATCH 1579/1587] fix the escape issue with python 3.12.0

---
 UltiSnips/java.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltiSnips/java.snippets b/UltiSnips/java.snippets
index 55883a365..9c7ed8208 100644
--- a/UltiSnips/java.snippets
+++ b/UltiSnips/java.snippets
@@ -21,7 +21,7 @@ def nl(snip):
 		snip.rv += " "
 def getArgs(group):
 	import re
-	word = re.compile('[a-zA-Z0-9><.]+ \w+')
+	word = re.compile(r'[a-zA-Z0-9><.]+ \w+')
 	return [i.split(" ") for i in word.findall(group) ]
 
 def camel(word):

From 75cd3fd2a22b8d6eefd553f386e0705e7d2cd4a6 Mon Sep 17 00:00:00 2001
From: AlvinRolling <alvinrolling@gmail.com>
Date: Wed, 17 Jan 2024 18:41:02 +0800
Subject: [PATCH 1580/1587] Universal Verification Methodology (UVM) Snippets.

---
 snippets/systemverilog.snippets | 591 ++++++++++++++++++++++++++++++++
 1 file changed, 591 insertions(+)

diff --git a/snippets/systemverilog.snippets b/snippets/systemverilog.snippets
index f510750d6..828a6de9c 100644
--- a/snippets/systemverilog.snippets
+++ b/snippets/systemverilog.snippets
@@ -71,3 +71,594 @@ snippet pkg
 	package ${1:package_name};
 		${0}
 	endpackage : $1
+
+snippet uvm_object
+	//  Class: $1
+	//
+	class ${1:my_class} extends ${2:uvm_object};
+		\`uvm_object_utils($1);
+
+		//  Group: Variables
+
+
+		//  Group: Constraints
+
+
+		//  Group: Functions
+
+		//  Constructor: new
+		function new(string name = "$1");
+			super.new(name);
+		endfunction: new
+		$0
+	endclass: $1
+
+
+snippet uvm_object_with_parameters
+	//  Class: $1
+	//
+	class ${1:my_class} #(${2:parameters}) extends ${3:uvm_object};
+		typedef $1 #(${2/(\b(parameter|type)\s+([A-Za-z_][A-Za-z0-9_$]*)(\s*=\s*([A-Za-z0-9_$]+))?)*\b/$3/g}) this_type_t;
+		\`uvm_object_param_utils(this_type_t);
+
+		//  Group: Variables
+
+
+		//  Group: Constraints
+
+
+		//  Group: Functions
+
+		//  Constructor: new
+		function new(string name = "$1");
+			super.new(name);
+		endfunction: new
+		$0
+	endclass: $1
+
+
+snippet uvm_component
+	//  Class: $1
+	//
+	class ${1:my_class} extends ${2:uvm_component};
+		\`uvm_component_utils($1);
+
+		//  Group: Configuration Object(s)
+
+		//  Var: config_obj
+		${3:config_obj_t} config_obj;
+
+
+		//  Group: Components
+
+
+		//  Group: Variables
+
+
+		//  Group: Functions
+
+		//  Constructor: new
+		function new(string name = "$1", uvm_component parent);
+			super.new(name, parent);
+		endfunction: new
+
+		$0
+	endclass: $1
+
+
+snippet uvm_component_with_parameters
+	//  Class: $1
+	//
+	class ${1:my_class} #(${2:parameters}) extends ${3:uvm_component};
+		typedef $1 #(${2/(\b(parameter|type)\s+([A-Za-z_][A-Za-z0-9_$]*)(\s*=\s*([A-Za-z0-9_$]+))?)*\b/$3/g}) this_type_t;
+		\`uvm_component_param_utils(this_type_t);
+
+		//  Group: Configuration Object(s)
+
+		//  Var: config_obj
+		${4:config_obj_t} config_obj;
+
+
+		//  Group: Components
+
+
+		//  Group: Variables
+
+
+		//  Constructor: new
+		function new(string name = "$1", uvm_component parent);
+			super.new(name, parent);
+		endfunction: new
+
+		$0
+	endclass: $1
+
+
+snippet uvm_component_extended
+	//  Class: $1
+	//
+	class ${1:my_class} extends ${2:base_class};
+		\`uvm_component_utils($1);
+
+		//  Group: Configuration Object(s)
+
+
+		//  Group: Components
+
+
+		//  Group: Variables
+
+
+		//  Group: Functions
+
+		//  Constructor: new
+		function new(string name = "$1", uvm_component parent);
+			super.new(name, parent);
+		endfunction: new
+
+		/*---  UVM Build Phases            ---*/
+		/*------------------------------------*/
+		//  Function: build_phase
+		extern function void build_phase(uvm_phase phase);
+		//  Function: connect_phase
+		extern function void connect_phase(uvm_phase phase);
+		//  Function: end_of_elaboration_phase
+		extern function void end_of_elaboration_phase(uvm_phase phase);
+
+		/*---  UVM Run Phases              ---*/
+		/*------------------------------------*/
+		//  Function: start_of_simulation_phase
+		extern function void start_of_simulation_phase(uvm_phase phase);
+		//  Function: reset_phase
+		extern task reset_phase(uvm_phase phase);
+		//  Function: configure_phase
+		extern task configure_phase(uvm_phase phase);
+		//  Function: main_phase
+		extern task main_phase(uvm_phase phase);
+		//  Function: shutdown_phase
+		extern task shutdown_phase(uvm_phase phase);
+
+		/*---  UVM Cleanup Phases          ---*/
+		/*------------------------------------*/
+		//  Function: extract_phase
+		extern function void extract_phase(uvm_phase phase);
+		//  Function: report_phase
+		extern function void report_phase(uvm_phase phase);
+		$0
+	endclass: $1
+
+
+	/*----------------------------------------------------------------------------*/
+	/*  UVM Build Phases                                                          */
+	/*----------------------------------------------------------------------------*/
+	function void $1::build_phase(uvm_phase phase);
+		/*  note: Do not call super.build_phase() from any class that is extended from an UVM base class!  */
+		/*  For more information see UVM Cookbook v1800.2 p.503  */
+		// super.build_phase(phase);
+	endfunction: build_phase
+
+
+	function void $1::connect_phase(uvm_phase phase);
+		super.connect_phase(phase);
+	endfunction: connect_phase
+
+
+	function void $1::end_of_elaboration_phase(uvm_phase phase);
+		super.end_of_elaboration_phase(phase);
+	endfunction: end_of_elaboration_phase
+
+
+	/*----------------------------------------------------------------------------*/
+	/*  UVM Run Phases                                                            */
+	/*----------------------------------------------------------------------------*/
+	function void $1::start_of_simulation_phase(uvm_phase phase);
+		super.start_of_simulation_phase(phase);
+	endfunction: start_of_simulation_phase
+
+
+	task $1::reset_phase(uvm_phase phase);
+	endtask: reset_phase
+
+
+	task $1::configure_phase(uvm_phase phase);
+	endtask: configure_phase
+
+
+	task $1::main_phase(uvm_phase phase);
+	endtask: main_phase
+
+
+	task $1::shutdown_phase(uvm_phase phase);
+	endtask: shutdown_phase
+
+
+	/*----------------------------------------------------------------------------*/
+	/*  UVM Cleanup Phases                                                        */
+	/*----------------------------------------------------------------------------*/
+	function void $1::report_phase(uvm_phase phase);
+		super.report_phase(phase);
+	endfunction: report_phase
+
+
+	function void $1::extract_phase(uvm_phase phase);
+		super.extract_phase(phase);
+	endfunction: extract_phase
+
+
+
+snippet uvm_sequence
+	//  Class: $1
+	//
+	class ${1:my_class} extends ${2:uvm_sequence};
+		\`uvm_object_utils($1);
+
+		//  Group: Variables
+
+
+		//  Group: Constraints
+
+
+		//  Group: Functions
+
+		//  Constructor: new
+		function new(string name = "$1");
+			super.new(name);
+		endfunction: new
+
+		//  Task: pre_start
+		//  This task is a user-definable callback that is called before the optional 
+		//  execution of <pre_body>.
+		// extern virtual task pre_start();
+
+		//  Task: pre_body
+		//  This task is a user-definable callback that is called before the execution 
+		//  of <body> ~only~ when the sequence is started with <start>.
+		//  If <start> is called with ~call_pre_post~ set to 0, ~pre_body~ is not called.
+		// extern virtual task pre_body();
+
+		//  Task: pre_do
+		//  This task is a user-definable callback task that is called ~on the parent 
+		//  sequence~, if any. The sequence has issued a wait_for_grant() call and after
+		//  the sequencer has selected this sequence, and before the item is randomized.
+		//
+		//  Although pre_do is a task, consuming simulation cycles may result in unexpected
+		//  behavior on the driver.
+		// extern virtual task pre_do(bit is_item);
+
+		//  Function: mid_do
+		//  This function is a user-definable callback function that is called after the 
+		//  sequence item has been randomized, and just before the item is sent to the 
+		//  driver.
+		// extern virtual function void mid_do(uvm_sequence_item this_item);
+
+		//  Task: body
+		//  This is the user-defined task where the main sequence code resides.
+		extern virtual task body();
+
+		//  Function: post_do
+		//  This function is a user-definable callback function that is called after the 
+		//  driver has indicated that it has completed the item, using either this 
+		//  item_done or put methods. 
+		// extern virtual function void post_do(uvm_sequence_item this_item);
+
+		//  Task: post_body
+		//  This task is a user-definable callback task that is called after the execution 
+		//  of <body> ~only~ when the sequence is started with <start>.
+		//  If <start> is called with ~call_pre_post~ set to 0, ~post_body~ is not called.
+		// extern virtual task post_body();
+
+		//  Task: post_start
+		//  This task is a user-definable callback that is called after the optional 
+		//  execution of <post_body>.
+		// extern virtual task post_start();
+		$0
+	endclass: $1
+
+snippet uvm_sequence_with_parameters
+	//  Class: $1
+	//
+	class ${1:my_class} #(${2:parameters}) extends ${3:uvm_sequence};
+		typedef $1 #(${2/(\b(parameter|type)\s+([A-Za-z_][A-Za-z0-9_$]*)(\s*=\s*([A-Za-z0-9_$]+))?)*\b/$3/g}) this_type_t;
+		\`uvm_object_param_utils(this_type_t);
+
+		//  Group: Variables
+
+
+		//  Group: Constraints
+
+
+		//  Group: Functions
+
+		//  Constructor: new
+		function new(string name = "$1");
+			super.new(name);
+		endfunction: new
+
+		//  Task: pre_start
+		//  This task is a user-definable callback that is called before the optional 
+		//  execution of <pre_body>.
+		// extern virtual task pre_start();
+
+		//  Task: pre_body
+		//  This task is a user-definable callback that is called before the execution 
+		//  of <body> ~only~ when the sequence is started with <start>.
+		//  If <start> is called with ~call_pre_post~ set to 0, ~pre_body~ is not called.
+		// extern virtual task pre_body();
+
+		//  Task: pre_do
+		//  This task is a user-definable callback task that is called ~on the parent 
+		//  sequence~, if any. The sequence has issued a wait_for_grant() call and after
+		//  the sequencer has selected this sequence, and before the item is randomized.
+		//
+		//  Although pre_do is a task, consuming simulation cycles may result in unexpected
+		//  behavior on the driver.
+		// extern virtual task pre_do(bit is_item);
+
+		//  Function: mid_do
+		//  This function is a user-definable callback function that is called after the 
+		//  sequence item has been randomized, and just before the item is sent to the 
+		//  driver.
+		// extern virtual function void mid_do(uvm_sequence_item this_item);
+
+		//  Task: body
+		//  This is the user-defined task where the main sequence code resides.
+		extern virtual task body();
+
+		//  Function: post_do
+		//  This function is a user-definable callback function that is called after the 
+		//  driver has indicated that it has completed the item, using either this 
+		//  item_done or put methods. 
+		// extern virtual function void post_do(uvm_sequence_item this_item);
+
+		//  Task: post_body
+		//  This task is a user-definable callback task that is called after the execution 
+		//  of <body> ~only~ when the sequence is started with <start>.
+		//  If <start> is called with ~call_pre_post~ set to 0, ~post_body~ is not called.
+		// extern virtual task post_body();
+
+		//  Task: post_start
+		//  This task is a user-definable callback that is called after the optional 
+		//  execution of <post_body>.
+		// extern virtual task post_start();
+		$0
+	endclass: $1
+
+snippet uvm_sequence_functions
+	// task ${1:my_class::}pre_start();
+	// endtask: pre_start
+
+
+	// task $1pre_body();
+	// endtask: pre_body
+
+
+	// task $1pre_do(bit is_item);
+	// endtask: pre_do
+
+
+	// function void $1mid_do(uvm_sequence_item this_item);
+	// endfunction: mid_do
+
+
+	task $1body();
+		$0
+	endtask: body
+
+
+	// function void $1post_do(uvm_sequence_item this_item);
+	// endfunction: post_do
+
+
+	// task $1post_body();
+	// endtask: post_body
+
+
+	// task $1post_start();
+	// endtask: post_start
+
+
+snippet uvm_sequence_item
+	//  Class: $1
+	//
+	class ${1:my_class} extends ${2:uvm_sequence_item};
+		typedef $1 this_type_t;
+		\`uvm_object_utils($1);
+
+		//  Group: Variables
+
+
+		//  Group: Constraints
+
+
+		//  Group: Functions
+
+		//  Constructor: new
+		function new(string name = "$1");
+			super.new(name);
+		endfunction: new
+
+		//  Function: do_copy
+		// extern function void do_copy(uvm_object rhs);
+		//  Function: do_compare
+		// extern function bit do_compare(uvm_object rhs, uvm_comparer comparer);
+		//  Function: convert2string
+		// extern function string convert2string();
+		//  Function: do_print
+		// extern function void do_print(uvm_printer printer);
+		//  Function: do_record
+		// extern function void do_record(uvm_recorder recorder);
+		//  Function: do_pack
+		// extern function void do_pack();
+		//  Function: do_unpack
+		// extern function void do_unpack();
+		$0
+	endclass: $1
+
+
+	/*----------------------------------------------------------------------------*/
+	/*  Constraints                                                               */
+	/*----------------------------------------------------------------------------*/
+	
+
+
+
+	/*----------------------------------------------------------------------------*/
+	/*  Functions                                                                 */
+	/*----------------------------------------------------------------------------*/
+	
+
+
+snippet uvm_sequence_item_with_parameters
+	//  Class: $1
+	//
+	class ${1:my_class} #(${2:parameters}) extends ${3:uvm_sequence_item};
+		typedef $1 #(${2/(\b(parameter|type)\s+([A-Za-z_][A-Za-z0-9_$]*)(\s*=\s*([A-Za-z0-9_$]+))?)*\b/$3/g}) this_type_t;
+		\`uvm_object_param_utils(this_type_t);
+
+		//  Group: Variables
+
+
+		//  Group: Constraints
+
+
+		//  Group: Functions
+
+		//  Constructor: new
+		function new(string name = "$1");
+			super.new(name);
+		endfunction: new
+
+		//  Function: do_copy
+		// extern function void do_copy(uvm_object rhs);
+		//  Function: do_compare
+		// extern function bit do_compare(uvm_object rhs, uvm_comparer comparer);
+		//  Function: convert2string
+		// extern function string convert2string();
+		//  Function: do_print
+		// extern function void do_print(uvm_printer printer);
+		//  Function: do_record
+		// extern function void do_record(uvm_recorder recorder);
+		//  Function: do_pack
+		// extern function void do_pack();
+		//  Function: do_unpack
+		// extern function void do_unpack();
+		$0
+	endclass: $1
+
+
+	/*----------------------------------------------------------------------------*/
+	/*  Constraints                                                               */
+	/*----------------------------------------------------------------------------*/
+	
+
+
+
+	/*----------------------------------------------------------------------------*/
+	/*  Functions                                                                 */
+	/*----------------------------------------------------------------------------*/
+	
+
+
+snippet uvm_sequence_item_do_copy
+	function void ${1:my_class}${2:::}do_copy(uvm_object rhs);
+		this_type_t rhs_;
+
+		if (!\$cast(rhs_, rhs)) begin
+			\`uvm_error({this.get_name(), ".do_copy()"}, "Cast failed!");
+			return;
+		end
+		// \`uvm_info({this.get_name(), ".do_copy()"}, "Cast succeded.", UVM_HIGH);
+
+		/*  chain the copy with parent classes  */
+		super.do_copy(rhs);
+
+		/*  list of local properties to be copied  */
+		// <this.property_name = rhs_.property_name>;
+	endfunction: do_copy$0
+
+
+
+snippet uvm_sequence_item_do_compare
+	function bit ${1:my_class}${2:::}do_compare(uvm_object rhs, uvm_comparer comparer);
+		this_type_t rhs_;
+
+		if (!\$cast(rhs_, rhs)) begin
+			\`uvm_error({this.get_name(), ".do_compare()"}, "Cast failed!");
+			return;
+		end
+		// \`uvm_info({this.get_name(), ".do_compare()"}, "Cast succeded.", UVM_HIGH);
+
+		/*  chain the compare with parent classes  */
+		do_compare = super.do_compare(rhs, comparer);
+
+		/*  list of local properties to be compared:  */
+		do_compare &= (
+			// <this.property_name == rhs_.property_name> &&
+			// <this.property_name == rhs_.property_name>
+		);
+	endfunction: do_compare$0
+
+
+
+snippet uvm_sequence_item_convert2string
+	function string ${1:my_class}${2:::}convert2string();
+		string s;
+
+		/*  chain the convert2string with parent classes  */
+		s = super.convert2string();
+
+		/*  list of local properties to be printed:  */
+		//  guide             0---4---8--12--16--20--24--28--32--36--40--44--48--
+		// s = {s, \$sformatf("property_label      : 0x%0h\n", property_name)};
+		// s = {s, \$sformatf("property_label      :   %0d\n", property_name)};
+
+		return s;
+	endfunction: convert2string$0
+
+
+
+snippet uvm_sequence_item_do_print
+	function void ${1:my_class}${2:::}do_print(uvm_printer printer)
+		/*  chain the print with parent classes  */
+		super.do_print(printer);
+
+		/*  list of local properties to be printed:  */
+		// printer.print_string("property_label", property_name);
+		// printer.print_field_int("property_label", property_name, \$bits(property_name), UVM_HEX);
+	endfunction: do_print$0
+
+snippet uvm_sequence_item_do_record
+	function void ${1:my_class}${2:::}do_record(uvm_recorder recorder);
+		/*  chain the record with parent classes  */
+		super.do_record(recorder);
+
+		/*  list of local properties to be recorded:  */
+		/*  note: use uvm_record_int, uvm_record_string, uvm_record_time, uvm_record_real for known basic types.  */
+		// \`uvm_record_string("property_label", property_name);
+		// \`uvm_record_int("property_label", property_name, \$bits(property_name), UVM_HEX);
+	endfunction: do_record$0
+
+snippet uvm_sequence_item_do_pack
+	function void ${1:my_class}${2:::}do_pack(uvm_packer packer);
+		/*  chain the pack with parent classes  */
+		super.do_pack(packer);
+
+		/*  list of local properties to be packed:  */
+		//  note: look up the appropriate macro(s) for your properties!
+		// \`uvm_pack_int(property_name);
+		// \`uvm_pack_queue(property_name);
+		// \`uvm_pack_string(property_name);
+	endfunction: do_pack$0
+
+snippet uvm_sequence_item_do_unpack
+	function void ${1:my_class}${2:::}do_unpack(uvm_packer packer);
+		/*  chain the unpack with parent classes  */
+		super.do_unpack(packer);
+
+		/*  list of local properties to be unpacked:  */
+		//  note: look up the appropriate macro(s) for your properties!
+		// \`uvm_unpack_int(property_name);
+		// \`uvm_unpack_queue(property_name);
+		// \`uvm_unpack_string(property_name);
+	endfunction: do_unpack$0
+

From 9bd88e07865bd4fa982d46356c227b07de66412a Mon Sep 17 00:00:00 2001
From: jack <r3jack@gmail.com>
Date: Wed, 24 Jan 2024 11:07:23 +0800
Subject: [PATCH 1581/1587] Update ruby.snippets: add binding.irb debug

---
 snippets/ruby.snippets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/snippets/ruby.snippets b/snippets/ruby.snippets
index da82185a3..8aadb71dc 100644
--- a/snippets/ruby.snippets
+++ b/snippets/ruby.snippets
@@ -612,6 +612,8 @@ snippet debug18
 	require 'ruby-debug'; debugger
 snippet pry
 	require 'pry'; binding.pry
+snippet irb
+	binding.irb
 snippet strf
 	strftime('${1:%Y-%m-%d %H:%M:%S %z}')${0}
 #

From 132717f9146d53d0aeb59a8b7272791ea0b47ff0 Mon Sep 17 00:00:00 2001
From: Alexey Vyskubov <alexey@pentode.fi>
Date: Fri, 23 Feb 2024 12:32:12 +0200
Subject: [PATCH 1582/1587] Start Gleam snippets with tab character

All other snippet files are doing this, and if it is not done at least
UltiSnips complains about malformed snippet lines.
---
 snippets/gleam.snippets | 90 ++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/snippets/gleam.snippets b/snippets/gleam.snippets
index a01e54075..bb5007512 100644
--- a/snippets/gleam.snippets
+++ b/snippets/gleam.snippets
@@ -1,98 +1,98 @@
 snippet fn "fn"
-  fn ${1:function_name}(${2}) -> ${3:Nil} {
-    ${0:${VISUAL:todo}}
-  }
+	fn ${1:function_name}(${2}) -> ${3:Nil} {
+	  ${0:${VISUAL:todo}}
+	}
 
 snippet pfn "pub fn"
-  pub fn ${1:function_name}(${2}) -> ${3:Nil} {
-    ${0:${VISUAL:todo}}
-  }
+	pub fn ${1:function_name}(${2}) -> ${3:Nil} {
+	  ${0:${VISUAL:todo}}
+	}
 
 snippet test "test fn"
-  pub fn ${1:name}_test() {
-    ${0}
-  }
+	pub fn ${1:name}_test() {
+	  ${0}
+	}
 
 snippet af "anonymous fn"
-  fn(${1}) { ${0:${VISUAL}} }
+	fn(${1}) { ${0:${VISUAL}} }
 
 snippet let "let binding"
-  let ${1} = ${0}
+	let ${1} = ${0}
 
 snippet l "let binding"
-  let ${1} = ${0}
+	let ${1} = ${0}
 
 snippet as "assert binding"
-  assert ${1} = ${0}
+	assert ${1} = ${0}
 
 snippet tr "try binding"
-  try ${1} = ${0}
+	try ${1} = ${0}
 
 snippet - "->"
-  -> ${0}
+	-> ${0}
 
 snippet case "case expression"
-  case ${1} {
-    ${2} -> ${0}
-  }
+	case ${1} {
+	  ${2} -> ${0}
+	}
 
 snippet ty "type"
-  type ${1:Name} {
-    ${0:$1}
-  }
+	type ${1:Name} {
+	  ${0:$1}
+	}
 
 snippet pty "pub type"
-  pub type ${1:Name} {
-    ${0:$1}
-  }
+	pub type ${1:Name} {
+	  ${0:$1}
+	}
 
 snippet tya "type alias"
-  type ${1:Name} =
-    ${0:$1}
+	type ${1:Name} =
+	  ${0:$1}
 
 snippet ptya "pub type alias"
-  pub type ${1:Name} =
-    ${0:$1}
+	pub type ${1:Name} =
+	  ${0:$1}
 
 snippet ext "external type"
-  external type ${0}
+	external type ${0}
 
 snippet pext "pub external type"
-  pub external type ${0}
+	pub external type ${0}
 
 snippet exfn "external fn"
-  external fn ${1:function_name}(${2}) -> ${3}
-    = "${4}" "${0}"
+	external fn ${1:function_name}(${2}) -> ${3}
+	  = "${4}" "${0}"
 
 snippet pexfn "pub external fn"
-  pub external fn ${1:function_name}(${2}) -> ${3}
-    = "${4}" "${0}"
+	pub external fn ${1:function_name}(${2}) -> ${3}
+	  = "${4}" "${0}"
 
 snippet im "import"
-  import ${0:gleam/result}
+	import ${0:gleam/result}
 
 snippet im. "import exposing"
-  import ${1:gleam/result}.{${0}}
+	import ${1:gleam/result}.{${0}}
 
 snippet p "|>"
-  |> ${0}
+	|> ${0}
 
 snippet tup "tuple()"
-  tuple(${0:${VISUAL}})
+	tuple(${0:${VISUAL}})
 
 snippet bl "block"
-  {
-    ${0:${VISUAL}}
-  }
+	{
+	  ${0:${VISUAL}}
+	}
 
 snippet tf "fn(Type) -> Type"
-  fn(${1}) -> ${0}
+	fn(${1}) -> ${0}
 
 snippet seq "should.equal"
-  should.equal(${0:${VISUAL}})
+	should.equal(${0:${VISUAL}})
 
 snippet strue "should.be_true"
-  should.be_true(${0:${VISUAL}})
+	should.be_true(${0:${VISUAL}})
 
 snippet sfalse "should.be_false"
-  should.be_true(${0:${VISUAL}})
+	should.be_true(${0:${VISUAL}})

From 393d980157b8149b3ff65a48bc4aae24dca9c846 Mon Sep 17 00:00:00 2001
From: Louis Pilfold <louis@lpil.uk>
Date: Sat, 24 Feb 2024 16:09:27 +0000
Subject: [PATCH 1583/1587] Update Gleam for current Gleam

---
 snippets/gleam.snippets | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/snippets/gleam.snippets b/snippets/gleam.snippets
index bb5007512..de4056976 100644
--- a/snippets/gleam.snippets
+++ b/snippets/gleam.snippets
@@ -23,10 +23,7 @@ snippet l "let binding"
 	let ${1} = ${0}
 
 snippet as "assert binding"
-	assert ${1} = ${0}
-
-snippet tr "try binding"
-	try ${1} = ${0}
+	let assert ${1} = ${0}
 
 snippet - "->"
 	-> ${0}
@@ -54,20 +51,6 @@ snippet ptya "pub type alias"
 	pub type ${1:Name} =
 	  ${0:$1}
 
-snippet ext "external type"
-	external type ${0}
-
-snippet pext "pub external type"
-	pub external type ${0}
-
-snippet exfn "external fn"
-	external fn ${1:function_name}(${2}) -> ${3}
-	  = "${4}" "${0}"
-
-snippet pexfn "pub external fn"
-	pub external fn ${1:function_name}(${2}) -> ${3}
-	  = "${4}" "${0}"
-
 snippet im "import"
 	import ${0:gleam/result}
 
@@ -77,9 +60,6 @@ snippet im. "import exposing"
 snippet p "|>"
 	|> ${0}
 
-snippet tup "tuple()"
-	tuple(${0:${VISUAL}})
-
 snippet bl "block"
 	{
 	  ${0:${VISUAL}}
@@ -95,4 +75,4 @@ snippet strue "should.be_true"
 	should.be_true(${0:${VISUAL}})
 
 snippet sfalse "should.be_false"
-	should.be_true(${0:${VISUAL}})
+	should.be_false(${0:${VISUAL}})

From a1f605c302c6a6b2346de5eca245c0406fef13ba Mon Sep 17 00:00:00 2001
From: Andrei Eremeev <aeremeev@cinemo.com>
Date: Tue, 28 May 2024 11:25:53 +0200
Subject: [PATCH 1584/1587] fix: go: st and inf generated non-compilable code

---
 snippets/go.snippets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snippets/go.snippets b/snippets/go.snippets
index 7245252c6..1c785f862 100644
--- a/snippets/go.snippets
+++ b/snippets/go.snippets
@@ -59,7 +59,7 @@ snippet in "interface"
 	interface{}
 
 snippet inf "full interface "
-	interface ${1:name} {
+	type ${1:name} interface {
 		${2:/* methods */}
 	}
 
@@ -188,7 +188,7 @@ snippet sr "string"
 	string
 
 snippet st "struct"
-	struct ${1:name} {
+	type ${1:name} struct {
 		${2:/* data */}
 	}
 	${0}

From 96d79529edc3dee1ccf2ce7b75a88cb546ec2501 Mon Sep 17 00:00:00 2001
From: Yinzuo Jiang <jiangyinzuo@foxmail.com>
Date: Mon, 10 Jun 2024 22:10:07 +0800
Subject: [PATCH 1585/1587] Update gitcommit.snippets: add Co-authored-by
 snippet

---
 UltiSnips/gitcommit.snippets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UltiSnips/gitcommit.snippets b/UltiSnips/gitcommit.snippets
index e2f1ba5d0..353aff747 100644
--- a/UltiSnips/gitcommit.snippets
+++ b/UltiSnips/gitcommit.snippets
@@ -71,6 +71,10 @@ build(${1:scope}): ${2:title}
 ${0:${VISUAL}}
 endsnippet
 
+snippet Co-authored-by "Co-authored-by:"
+Co-authored-by: ${1:Author Name} <${2:Email}>
+endsnippet
+
 snippet sign "Signature"
 -------------------------------------------------------------------------------
 ${1:Company Name}

From f0a3184d9f90b96b044d5914625a25c554d7f301 Mon Sep 17 00:00:00 2001
From: Joshua Petitma <joshua@petit.dev>
Date: Fri, 9 Aug 2024 09:55:50 -0700
Subject: [PATCH 1586/1587] Update markdown.snippets

Don't add a default protocol
---
 snippets/markdown.snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets/markdown.snippets b/snippets/markdown.snippets
index 39ccecd76..a8b00cfb2 100644
--- a/snippets/markdown.snippets
+++ b/snippets/markdown.snippets
@@ -5,7 +5,7 @@
 # The suffix `c` stands for "Clipboard".
 
 snippet [
-	[${1:text}](https://${2:address})
+	[${1:text}](${2:address})
 snippet [*
 	[${1:link}](${2:`@*`})
 snippet [c

From f371d635f6f6350d34bbb483e37e383db322d145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Simonis?= <simonisfrederic@gmail.com>
Date: Wed, 3 Sep 2025 15:15:58 +0200
Subject: [PATCH 1587/1587] Remove unnumbered equation

---
 snippets/tex.snippets | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/snippets/tex.snippets b/snippets/tex.snippets
index 4d54fe011..f6b275d82 100644
--- a/snippets/tex.snippets
+++ b/snippets/tex.snippets
@@ -91,11 +91,6 @@ snippet eq* unnumbered equation environment
 	\\begin{equation*}
 		${0:${VISUAL}}
 	\\end{equation*}
-# Unnumbered Equation
-snippet \ unnumbered equation: \[ ... \]
-	\\[
-		${0:${VISUAL}}
-	\\]
 # Equation array
 snippet eqnarray eqnarray environment
 	\\begin{eqnarray}