Bump PHP & update highlights (#53)

* feat(php): Bump PHP & update highlights

Update the PHP repo, and update the highlights to reflect changes

* doc: Add CHANGELOG entry for php bumps

Author: elken

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## Unreleased
+- Updated `php` highlighting to support php8 changes
+- Resolve bugs with `php` preventing `evil-textobj-tree-sitter` motions from working
 
 ## 0.10.9 - 2021-12-05
 

queries/php/highlights.scm

@@ -1,11 +1,17 @@
 (php_tag) @tag
 "?>" @tag
+; Variables
+
+(variable_name) @variable
 
 ; Types
 
-(primitive_type) @type.builtin
-(cast_type) @type.builtin
-(type_name (name) @type)
+[
+ (primitive_type)
+ (cast_type)
+ ] @type.builtin
+(named_type (name)) @type
+(named_type (qualified_name)) @type
 
 ; Functions
 
@@ -27,13 +33,17 @@
 (function_definition
   name: (name) @function)
 
+(nullsafe_member_call_expression
+  name: (name) @function.method)
+
 ; Member
 
 (property_element
   (variable_name) @property)
 
 (member_access_expression
   name: (variable_name (name)) @property)
+
 (member_access_expression
   name: (name) @property)
 
@@ -42,7 +52,7 @@
 (relative_scope) @variable.builtin
 
 ((name) @constant
- (.match? @constant "^[A-Z_][A-Z_\\d]*$"))
+ (.match? @constant "^_?[A-Z][A-Z\d_]+$"))
 
 ((name) @constructor
  (.match? @constructor "^[A-Z]"))
@@ -54,61 +64,152 @@
 
 ; Basic tokens
 
-(string) @string
-(heredoc) @string
-(boolean) @constant.builtin
+[
+ (string)
+ (heredoc)
+ ] @string
+
+(boolean) @constant.boolean
 (null) @constant.builtin
 (integer) @number
-(float) @number
+(float) @float
 (comment) @comment
 
-"$" @operator
-
 ; Keywords
 
-"abstract" @keyword
-"as" @keyword
-"break" @keyword
-"case" @keyword
-"catch" @keyword
-"class" @keyword
-"const" @keyword
-"continue" @keyword
-"declare" @keyword
-"default" @keyword
-"do" @keyword
-"echo" @keyword
-"else" @keyword
-"elseif" @keyword
-"enddeclare" @keyword
-"endforeach" @keyword
-"endif" @keyword
-"endswitch" @keyword
-"endwhile" @keyword
-"extends" @keyword
-"final" @keyword
-"finally" @keyword
-"foreach" @keyword
-"function" @keyword
-"global" @keyword
-"if" @keyword
-"implements" @keyword
-"include_once" @keyword
-"include" @keyword
-"insteadof" @keyword
-"interface" @keyword
-"namespace" @keyword
-"new" @keyword
-"private" @keyword
-"protected" @keyword
-"public" @keyword
-"require_once" @keyword
-"require" @keyword
-"return" @keyword
-"static" @keyword
-"switch" @keyword
-"throw" @keyword
-"trait" @keyword
-"try" @keyword
-"use" @keyword
-"while" @keyword
+[
+ "as"
+] @keyword.operator
+
+[
+ "fn"
+ "function"
+] @keyword.function
+
+[
+ "$"
+ "abstract"
+ "break"
+ "class"
+ "const"
+ "continue"
+ "declare"
+ "default"
+ "echo"
+ "enddeclare"
+ "extends"
+ "final"
+ "global"
+ "implements"
+ "insteadof"
+ "instanceof"
+ "interface"
+ "namespace"
+ "new"
+ "private"
+ "protected"
+ "public"
+ "static"
+ "trait"
+ ] @keyword
+
+"return" @keyword.return
+
+[
+ "case"
+ "else"
+ "elseif"
+ "endif"
+ "endswitch"
+ "if"
+ "switch"
+ "match"
+ ] @conditional
+
+[
+ "do"
+ "endfor"
+ "endforeach"
+ "endwhile"
+ "for"
+ "foreach"
+ "while"
+ ] @repeat
+
+[
+ "catch"
+ "finally"
+ "throw"
+ "try"
+ ] @exception
+
+[
+ "include_once"
+ "include"
+ "require_once"
+ "require"
+ "use"
+ ] @include
+
+[
+ ","
+ ";"
+ "."
+ ] @punctuation.delimiter
+
+[
+ (php_tag)
+ "?>"
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+ ] @punctuation.bracket
+
+[
+  "="
+
+  "-"
+  "*"
+  "/"
+  "+"
+  "%"
+
+  "~"
+  "|"
+  "&"
+  "<<"
+  ">>"
+
+  "->"
+  "?->"
+
+  "=>"
+
+  "<"
+  "<="
+  ">="
+  ">"
+  "=="
+  "!="
+  "==="
+  "!=="
+
+  "!"
+  "&&"
+  "||"
+
+  "-="
+  "+="
+  "*="
+  "/="
+  "%="
+  "|="
+  "&="
+  "--"
+  "++"
+] @operator
+
+(ERROR) @error