Merge branch 'st4152'

deathaxe · deathaxe · commit 9389d8882968 · 2025-10-17T21:26:03.000+02:00
diff --git a/Snippets/autoescape.sublime-snippet b/Snippets/autoescape.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% autoescape ${1:true} %}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endautoescape %}
 ]]></content>
 	<tabTrigger>jautoescape</tabTrigger>
diff --git a/Snippets/block.sublime-snippet b/Snippets/block.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% block ${1:block_name} %}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endblock ${1:block_name} %}
 ]]></content>
 	<tabTrigger>jblock</tabTrigger>
diff --git a/Snippets/call.sublime-snippet b/Snippets/call.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% call ${1:function} %}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endcall %}
 ]]></content>
 	<tabTrigger>jcall</tabTrigger>
diff --git a/Snippets/filter.sublime-snippet b/Snippets/filter.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% filter ${1:filter_name} %}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endfilter %}
 ]]></content>
 	<tabTrigger>jfilter</tabTrigger>
diff --git a/Snippets/for.sublime-snippet b/Snippets/for.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% for ${1:item} in ${2:sequence} %}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endfor %}
 ]]></content>
 	<tabTrigger>jfor</tabTrigger>
diff --git a/Snippets/if.sublime-snippet b/Snippets/if.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% if ${1:condition} %}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endif %}
 ]]></content>
 	<tabTrigger>jif</tabTrigger>
diff --git a/Snippets/if_else.sublime-snippet b/Snippets/if_else.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% if ${1:condition} %}
-${TM_TEMPLATE_INDENT}$1
+${TM_TEMPLATE_INDENT}${1:$SELECTION}
 {% else %}
 ${TM_TEMPLATE_INDENT}$0
 {% endif %}
diff --git a/Snippets/jcomment.sublime-snippet b/Snippets/jcomment.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% comment %}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endcomment %}
 ]]></content>
 	<tabTrigger>jcomment</tabTrigger>
diff --git a/Snippets/macro.sublime-snippet b/Snippets/macro.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% macro ${1:function} %}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endmacro %}
 ]]></content>
 	<tabTrigger>jmacro</tabTrigger>
diff --git a/Snippets/raw.sublime-snippet b/Snippets/raw.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% raw %}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endraw %}
 ]]></content>
 	<tabTrigger>jraw</tabTrigger>
diff --git a/Snippets/set.sublime-snippet b/Snippets/set.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% set $1%}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endset %}
 ]]></content>
 	<tabTrigger>jset</tabTrigger>
diff --git a/Snippets/trans.sublime-snippet b/Snippets/trans.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% trans $1%}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endtrans %}
 ]]></content>
 	<tabTrigger>jtrans</tabTrigger>
diff --git a/Snippets/with.sublime-snippet b/Snippets/with.sublime-snippet
@@ -1,7 +1,7 @@
 <snippet>
 	<content><![CDATA[
 {% with ${1:assignment} %}
-${TM_TEMPLATE_INDENT}$0
+${TM_TEMPLATE_INDENT}${0:$SELECTION}
 {% endwith %}
 ]]></content>
 	<tabTrigger>jwith</tabTrigger>
diff --git a/Syntaxes/Text/Text (Jinja).sublime-syntax b/Syntaxes/Text/Text (Jinja).sublime-syntax
@@ -504,7 +504,7 @@ contexts:
     - match: in\b
       scope: keyword.control.loop.in.jinja
       pop: 1
-    - match: (?=\:?\s*(?:##|$))
+    - match: (?=[)\]}]|%}|\:?\s*(?:##|$))
       pop: 1
     - include: expressions
 
@@ -688,6 +688,14 @@ contexts:
 ###[ OPERATORS ]###############################################################
 
   operators:
+    # inline if statements
+    - match: if\b
+      scope: keyword.control.conditional.if.jinja
+    - match: else\b
+      scope: keyword.control.conditional.else.jinja
+    - match: for\b
+      scope: keyword.control.loop.for.jinja
+      push: for-expression
     # alphanumeric operators
     - match: as\b
       scope: keyword.operator.word.jinja keyword.operator.assignment.as.jinja
diff --git a/Syntaxes/Text/syntax_test_scopes.jinja.txt b/Syntaxes/Text/syntax_test_scopes.jinja.txt
@@ -119,7 +119,9 @@ not a # for statement:
 ##    ^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.jinja.embedded
 ##                               ^^ punctuation.section.embedded.end.jinja - source.jinja.embedded
 ##     ^^ keyword.control.conditional.if.jinja
-##        ^^^^^^^^^^^^^^^^^^^^^^ - keyword
+##       ^^^^^^ - keyword
+##             ^^^^ keyword.control.conditional.else.jinja
+##                 ^^^^^^^^^^^^^ - keyword
 
     {% for item in items endfor %}
 ##  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.statement.jinja
@@ -718,6 +720,28 @@ not a # for statement:
 ##                                    ^^^^^^ variable.other.readwrite.jinja
 ##                                          ^ punctuation.section.arguments.end.jinja
 
+    {% inlineif(arg = ("a" if True else "b")) %}
+##                    ^^^^^^^^^^^^^^^^^^^^^^ meta.group.jinja
+##                     ^^^ meta.string.jinja string.quoted.double.jinja
+##                         ^^ keyword.control.conditional.if.jinja
+##                            ^^^^ constant.language.boolean.true.jinja
+##                                 ^^^^ keyword.control.conditional.else.jinja
+##                                      ^^^ meta.string.jinja string.quoted.double.jinja
+
+    {% inlinefor(arg = (a for a in ("a", "b"))) %}
+##                     ^^^^^^^^^^^^^^^^^^^^^^^ meta.group.jinja
+##                      ^ variable.other.readwrite.jinja
+##                        ^^^ keyword.control.loop.for.jinja
+##                            ^ variable.other.readwrite.jinja
+##                              ^^ keyword.control.loop.in.jinja
+##                                 ^^^^^^^^^^ meta.sequence.tuple.jinja
+##                                 ^ punctuation.section.sequence.begin.jinja
+##                                  ^^^ meta.string.jinja string.quoted.double.jinja
+##                                     ^ punctuation.separator.sequence.jinja
+##                                       ^^^ meta.string.jinja string.quoted.double.jinja
+##                                          ^ punctuation.section.sequence.end.jinja
+##                                           ^ punctuation.section.group.end.jinja
+##                                            ^ punctuation.section.arguments.end.jinja
 
 ### [ EXPRESSION BLOCKS ] #####################################################
 
