From 7f81196612f99a764abfe255318c01ce0119d1ac Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Tue, 31 Dec 2024 09:53:41 +0100
Subject: [PATCH] nvim: php: set proper names for custom treesitter highligt
 tags

---
 nvim/lua/user/plugins/core/colorscheme.lua | 12 +++++++-----
 nvim/queries/php_only/highlights.scm       | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/nvim/lua/user/plugins/core/colorscheme.lua b/nvim/lua/user/plugins/core/colorscheme.lua
index d069bda..0c3d2e8 100644
--- a/nvim/lua/user/plugins/core/colorscheme.lua
+++ b/nvim/lua/user/plugins/core/colorscheme.lua
@@ -201,12 +201,14 @@ local options = {
 
                 -- PHP
                 ["@keyword.import.php"] = { link = "@keyword" },
-                ["@class_name.php"] = { link = "@text" },
-                ["@extend_name.php"] = { link = "@text" },
-                ["@implement_name.php"] = { link = "@text" },
-                ["@namespace_name.php"] = { link = "@text" },
-                ["@namespace_alias.php"] = { link = "@text" },
                 ["@function.builtin.php"] = { fg = colors.blue },
+                ["@class.name.php"] = { link = "@text" },
+                ["@class.inherit.name.php"] = { link = "@text" },
+                ["@class.implements.name.php"] = { link = "@text" },
+                ["@interface.name.php"] = { link = "@text" },
+                ["@namespace.name.php"] = { link = "@text" },
+                ["@namespace.alias.name.php"] = { link = "@text" },
+                ["@use.trait.name.php"] = { link = "@text" },
 
                 -- Blade
                 ["@tag.blade"] = { fg = colors.mauve },
diff --git a/nvim/queries/php_only/highlights.scm b/nvim/queries/php_only/highlights.scm
index 608d819..1538933 100644
--- a/nvim/queries/php_only/highlights.scm
+++ b/nvim/queries/php_only/highlights.scm
@@ -3,22 +3,22 @@
 ; php tags should be tagged as preprocessor tokens
 (php_tag) @preproc
 
-; Tag names in class definition as regular text.
+; Tag names in class definition
 (class_declaration [
-	name: (name) @class_name
-	(base_clause (name) @extend_name)
-	(class_interface_clause (name) @implement_name)
+	name: (name) @class.name
+	(base_clause (name) @class.inherit.name)
+	(class_interface_clause (name) @class.implements.name)
 ])
 
-(interface_declaration (name) @class_name)
+(interface_declaration (name) @interface.name)
 
-; tag "use" traits as text
-(use_declaration (name) @text)
+; tag trait name in use declaration
+(use_declaration (name) @use.trait.name)
 
-; tag namespace classes in "use" as text
+; tag name token in "use" use namespace declaration
 (namespace_use_declaration (namespace_use_clause [
 	(qualified_name [
-		(name) @namespace_name
+		(name) @namespace.name
 	])
-    alias: (name) @namespace_name
+    alias: (name) @namespace.alias.name
 ]))