Merge pull request #744 from codeinabox/twig-tidy

Removed redundant UltiSnips for Twig

UltiSnips/twig.snippets

@@ -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

snippets/twig.snippets

@@ -1,43 +1,34 @@
-# twig block
+snippet bl "{% block xyz %} .. {% endblock xyz %}"
-snippet bl
 	{% block ${1} %}
 	${2}
 	{% endblock $1 %}
-# twig javascripts
+snippet js "{% javascripts 'xyz' %} .. {% endjavascripts %}"
-snippet js
 	{% javascripts '${1}' %}
 		<script src="{{ asset_url }}"></script>
 	{% endjavascripts %}
-# twig stylesheets
+snippet css "{% stylesheets 'xyz' %} .. {% endstylesheets %}"
-snippet css
 	{% stylesheets '${1}' %}
 		<link rel="stylesheet" href="{{ asset_url }}">
 	{% endstylesheets %}
-# twig if
+snippet if "{% if %} .. {% endif %}"
-snippet if
 	{% if ${1} %}
 	${2}
 	{% endif %}
-# twig if ... else
+snippet ife "{% if %} .. {% else %} .. {% endif %}"
-snippet ife
 	{% if ${1} %}
 	${2}
 	{% else %}
 	${0}
 	{% endif %}
-# twig else
+snippet el "{% else %}"
-snippet el
 	{% else %}
 	${0}
-# twig elseif
+snippet eif "{% elseif %}"
-snippet eif
 	{% elseif ${1} %}
 	${0}
-# twig for
+snippet for "{% for x in y %} .. {% endfor %}"
-snippet for
 	{% for ${1} in ${2} %}
 	${3}
 	{% endfor %}
-# twig extends
+snippet ext "{% extends xyz %}"
-snippet ext
 	{% extends ${1} %}