[language-php] Highlight null-safe property access correctly

ForestryAILab · Sep 19, 2024 · 22a23ed · 22a23ed
1 parent 433cf8f
commit 22a23ed
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/packages/language-php/grammars/tree-sitter/queries/highlights.scm b/packages/language-php/grammars/tree-sitter/queries/highlights.scm
@@ -302,21 +302,33 @@
 ; The "bar" in `$foo->bar()`.
 (member_call_expression
   name: (name) @support.other.function.method.php)
+(nullsafe_member_call_expression
+  name: (name) @support.other.function.method.php)
 
 ; The "bar" in `$foo->bar`.
 (member_access_expression
   name: (name) @support.other.property.php
   (#set! capture.final true))
+(nullsafe_member_access_expression
+  name: (name) @support.other.property.php
+  (#set! capture.final true))
 
 ; The "$bar" in `$foo->$bar()`.
 (member_call_expression
   name: (variable_name) @variable.other.method.php
   (#set! capture.final true))
+(nullsafe_member_call_expression
+  name: (variable_name) @variable.other.method.php
+  (#set! capture.final true))
 
 ; The "$bar" in `$foo->$bar`.
 (member_access_expression
   name: (variable_name) @variable.other.property.php
   (#set! capture.final true))
+; The "$bar" in `$foo->$bar`.
+(nullsafe_member_access_expression
+  name: (variable_name) @variable.other.property.php
+  (#set! capture.final true))
 
 ; The "Foo" in `new Foo();`.
 (object_creation_expression
@@ -638,6 +650,7 @@
 ] @keyword.operator.assignment.compound.php
 
 "->" @keyword.operator.class.php
+"?->" @keyword.operator.class.null-safe.php
 "=>" @punctuation.separator.key-value.php
 
 "\\" @keyword.operator.namespace.php