; 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 b7d0167..24f6cc5 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -1,108 +1,264 @@
-snippet ${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"
/**
- * ${3:@author `whoami`}${4}
- */
-`!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()
-`}
-{
+ * $2
+ * @return ${4:void}
+ * @author ${5:`!v g:snips_author`}
+ **/
+${1:public }function ${2:someFunc}(${3})
+{${6}
}
endsnippet
-snippet st "php static function" b
-${1:public} static function $2($3)
-{
- ${4}
-}
-endsnippet
-
-snippet __ "php constructor" b
-${1:public} function __construct($2)
-{
- ${3}
-}
-endsnippet
-
-snippet sg "Setter and Getter" b
+snippet doc_i "doc_i"
/**
- * @var ${3:`!p snip.rv = t[2][0:1].upper() + t[2][1:]`}
- *
- * ${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
*/
-${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 get${1/\w+\s*/\u$0/}()
{
- $this->$2 = $$2;
-
- return $this;
-}
-
-public function get`!p snip.rv = t[2][0:1].upper() + t[2][1:]`()
-{
- return $this->$2;
+ return $this->$1;$2
}
+$4
endsnippet
-snippet if "php if" !b
-if (${1}) {
- ${2}
+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 ife "php ife" !b
-if (${1}) {
- ${2}
+snippet gs "PHP Class Getter Setter" b
+/*
+ * Getter for ${1/(\w+)\s*;/$1/}
+ */
+public function get${1/(\w+)\s*;/\u$1/}()
+{
+ return $this->${1/(\w+)\s*;/$1/};$2
+}
+
+/*
+ * Setter for ${1/(\w+)\s*;/$1/}
+ */
+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})
+{
+ ${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
+
+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.split('.')[0]`}
+ * @author ${2:`!v g:snips_author`}
+ */
+class $1
+{
+ public function ${3:__construct}(${4:$options})
+ {
+ ${4:// code}
+ }
+}
+$0
+endsnippet
+
+snippet construct "__construct()" b
+/**
+ * @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 '' . var_export($1, 1) . '
';$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
-snippet /** "php comment block" b
-/**
- * @${1}
- */
-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 6609f3f..1a310a1 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 77f923f..3d43316 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 68ae0fe..a8fc1ed 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 File "Defaults for file" b
+File {
+ owner => ${1:username},
+ group => ${2:groupname},
+}
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},
-}
+group { '${1:groupname}':
+ ensure => ${3:present},
+ gid => ${2:gid},
endsnippet
snippet mount "Mount resource type" b
-mount { "${1:path}":
- device => "${2:/dev}",
- fstype => "${3:filesystem}",
- ensure => mounted,
- options => "rw,errors=remount-ro",
+mount { '${1:path}':
+ device => '${2:/dev}',
+ fstype => '${3:filesystem}',
+ ensure => mounted,
+ options => 'rw,errors=remount-ro',
}
endsnippet
+snippet package "Package resource type" b
+package { '${1:name}':
+ ensure => ${2:installed},
+}
+endsnippet
+
+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 a770d2a..357d01d 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 9e0e29f..5c52179 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]
+ 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
+ # 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
+ 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/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
+ # 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
+ 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
+ # 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/}])
+ # 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
+ 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
+ # 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
+ # 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
+ 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
+ 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 88e0caa..e8aef2b 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
+ """
+ find most popular code type in the given rst
- :param path: file to detect
+ :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
- :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 90001b1..09a114f 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 ... end"
if ${1:condition}
- ${2}
+ ${2:# TODO}
end
endsnippet
@@ -33,9 +35,9 @@ endsnippet
snippet ife "if ... else ... end"
if ${1:condition}
- ${2}
+ ${2:# TODO}
else
- ${3}
+ ${3:# TODO}
end
endsnippet
@@ -43,11 +45,11 @@ endsnippet
snippet ifee "if ... elseif ... 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 ... end"
unless ${1:condition}
- ${0}
+ ${0:# TODO}
end
endsnippet
@@ -63,9 +65,9 @@ endsnippet
snippet unlesse "unless ... else ... end"
unless ${1:condition}
- ${2}
+ ${2:# TODO}
else
- ${0}
+ ${0:# TODO}
end
endsnippet
@@ -73,11 +75,11 @@ endsnippet
snippet unlesee "unless ... elseif ... 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 ..." 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 ... rescue ..."
def ${1:function_name}${2: ${3:*args}}
- ${4}
+ ${4:# TODO}
rescue
- ${0}
+ ${0:# TODO}
end
endsnippet
snippet For "(..).each { || }"
-(${1:from}..${2:to}).each { |${3:i}| ${4} }
+(${1:from}..${2:to}).each { |${3:i}| ${4:# TODO} }
endsnippet
snippet for "(..).each do || 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 { |,| }" 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 |,| 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 { |,| }" 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 ,| end" r
`!p snip.rv=match.group(1)`.keep_if do |${1:key},${2:value}|
- ${0}
+ ${0:# TODO}
end
endsnippet
snippet "(\S+)\.Reject" ".reject { |,| }" 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 ,| 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 { |,| }" 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 |,| 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 { || }" 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| 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 { || }" 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 || end" r
`!p snip.rv=match.group(1)`.each_value do |${1:value}|
- ${0}
+ ${0:# TODO}
end
endsnippet
snippet Each ".each { || }"
-${1:elements}.each { |${2:${1/s$//}}| ${3} }
+${1:elements}.each { |${2:${1/s$//}}| ${3:# TODO} }
endsnippet
snippet each ".each do || end"
${1:elements}.each do |${2:${1/s$//}}|
- ${0}
+ ${0:# TODO}
end
endsnippet
-snippet each_?s(lice)? ".each_slice(n) do |slice| end"
-each_slice(${1:2}) do |${2:slice}|
- ${0}
+snippet "each_?s(lice)?" ".each_slice(n) do |slice| end" r
+${1:elements}.each_slice(${2:2}) do |${3:slice}|
+ ${0:# TODO}
end
endsnippet
-snippet Each_?s(lice)? ".each_slice(n) { |slice| }"
-each_slice(${1:2}) { |${2:slice}| ${3} }
+snippet "Each_?s(lice)?" ".each_slice(n) { |slice| }" 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 { |,| }" r
+snippet "(\S+)\.Each_?w(ith)?_?i(ndex)?" ".each_with_index { |,| }" 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 { |,| }" 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 |,| 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
+
+
+snippet do "do || ... end" i
+do |${1:args}|
+ $0
+end
+endsnippet
+
+
+
+snippet Do "do ... end" i
do
$0
end
endsnippet
-snippet dov "do || ... end" i
-do |${1:v}|
- $2
-end
-endsnippet
-
-
snippet until "until ... end"
until ${1:expression}
- ${0}
+ ${0:# TODO}
end
endsnippet
@@ -449,15 +453,15 @@ endsnippet
snippet Until "begin ... end until "
begin
- ${0}
+ ${0:# TODO}
end until ${1:expression}
endsnippet
-snippet wh "while ... end"
+snippet while "while ... end"
while ${1:expression}
- ${0}
+ ${0:# TODO}
end
endsnippet
@@ -465,7 +469,7 @@ endsnippet
snippet While "begin ... end while "
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 0000000..70a44a0
--- /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 cce06ef..9cc4577 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 414f350..ee0c8c7 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 fd53d26..6584915 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 db53307..c32d21f 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}
-
-% subparagraph $2 (end)
endsnippet
+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 03589f0..d0a25e9 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 9db43f7..156b981 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 5655c4b..5ff22d2 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 e69de29..a9c5a29 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 80b017c..92dfb6e 100644
--- a/UltiSnips/xml.snippets
+++ b/UltiSnips/xml.snippets
@@ -1,3 +1,10 @@
+priority -50
+
+snippet xml "XML declaration" b
+
+
+endsnippet
+
snippet t "Simple tag" b
<${1:tag}>
${2:content}
diff --git a/UltiSnips/zsh.snippets b/UltiSnips/zsh.snippets
index 8039459..f7986ea 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