allow chaining of tests with other logic

Sublime-Instincts · Jul 29, 2024 · 89b93e2 · 89b93e2
1 parent 876ad4f
commit 89b93e2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/resources/syntax/Twig.sublime-syntax b/resources/syntax/Twig.sublime-syntax
@@ -234,6 +234,8 @@ contexts:
  tests_body:
  - meta_scope: meta.function.test.twig
  - include: block_pop
+ - match: (?=\b(and|or|b-and|b-or|b-xor)\b)
+ pop: 1
  # builtin tests
  - match: '\bnot\b'
  scope: keyword.operator.word.logical.twig

diff --git a/resources/syntax/tests/syntax_test_html.twig b/resources/syntax/tests/syntax_test_html.twig
@@ -577,6 +577,19 @@
 | ^^^ support.function.test.twig
 | ^^ punctuation.definition.expression.end.twig
 
+{{ name is odd and name != '' }}
+|^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.expression.twig
+|^ punctuation.definition.expression.begin.twig
+| ^ - variable.function.test.twig
+
+{% if loop.index is divisible by(3) and foo == bar %}{% endif %}
+|^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.statement.twig
+| ^^ keyword.operator.comparison.test.twig
+| ^^^^^^^^^^^^ support.function.test.twig
+| ^^^ meta.function-call.arguments.twig
+| ^ constant.numeric.value.twig
+| ^^^ variable.other.twig
+
 {# Custom test #}
 {{ name is weird }}
 | ^^ keyword.operator.comparison.test.twig