From 568f2a3b7d610c4922b7d7aa0cd67c45b5158ed5 Mon Sep 17 00:00:00 2001
From: Manfred Egger <github@tmk-stgeorgen.at>
Date: Wed, 17 Dec 2025 11:48:06 +0100
Subject: feat(typoscript)!: update grammar and queries (#8341)

Breaking change: `(condition_bool)` renamed to `(condition_bool_legacy)`
---
 runtime/queries/typoscript/highlights.scm | 81 +++++++++++++++++++++++++++----
 1 file changed, 71 insertions(+), 10 deletions(-)

(limited to 'runtime/queries/typoscript/highlights.scm')

diff --git a/runtime/queries/typoscript/highlights.scm b/runtime/queries/typoscript/highlights.scm
index 63327f178..bc214cba0 100644
--- a/runtime/queries/typoscript/highlights.scm
+++ b/runtime/queries/typoscript/highlights.scm
@@ -1,10 +1,28 @@
 (identifier) @variable.member
 
+(symfony_variable) @variable
+
 (constant) @constant
 
-(modifier_function) @function
+(symfony_method) @function.method.call
+
+[
+  (modifier_function)
+  (symfony_function)
+] @function.call
+
+[
+  (modifier_predefined)
+  (symfony_predefined_function)
+] @function.builtin
+
+(modifier_parameter) @variable.parameter
+
+(symfony_function_parameter
+  (symfony_variable) @variable.parameter)
 
-(modifier_predefined) @function.builtin
+(symfony_method_parameter
+  (symfony_variable) @variable.parameter)
 
 [
   (condition)
@@ -12,13 +30,19 @@
   (condition_else)
 ] @keyword.conditional
 
-(cobject) @type.builtin
-
 [
   "@import"
   "INCLUDE_TYPOSCRIPT"
 ] @keyword.import
 
+(condition_attribute) @tag.attribute
+
+(cobject) @type.builtin
+
+(symfony_built_in_variable) @variable.builtin
+
+(symfony_property) @variable.member
+
 [
   (comment)
   (single_line_comment)
@@ -26,22 +50,59 @@
 
 [
   (string)
-  (multiline_value)
+  (multiline_value_content)
+  (symfony_string)
 ] @string
 
+(deletion_line
+  ">" @operator)
+
+(copy_line
+  "<" @operator)
+
 [
   "="
-  ">"
-  "<"
-  ":="
   "=<"
-  (condition_bool)
+  ":="
+  "?."
+  (symfony_condition_operator)
+  (condition_bool_legacy)
+  (constant_null_coalescing)
 ] @operator
 
-"," @punctuation.delimiter
+(symfony_ternary_operator) @keyword.conditional.ternary
+
+((symfony_condition_operator) @keyword.operator
+  (#any-of? @keyword.operator
+    "and" "or" "xor" "not" "not in" "in" "contains" "starts with" "ends with" "matches"))
+
+[
+  ","
+  "."
+] @punctuation.delimiter
+
+(symfony_property_access
+  "." @operator)
+
+(symfony_method_call
+  "." @operator)
 
 [
   "("
   ")"
+  "["
+  "]"
   (block_punctuation)
 ] @punctuation.bracket
+
+(condition
+  "[" @punctuation.special)
+
+(condition
+  "]" @punctuation.special)
+
+(symfony_number) @number
+
+(symfony_boolean) @boolean
+
+(symfony_null) @constant.builtin
-- 
cgit v1.2.3-70-g09d2