fix(predicates): Fix #446: highlight property only if not a method

lua/nvim-treesitter/query_predicates.lua

@@ -54,6 +54,7 @@ local function has_ancestor(match, pattern, bufnr, pred)
   end
   return false
 end
+
 query.add_predicate('has-ancestor?', has_ancestor)
 
 query.add_predicate('has-parent?', has_ancestor)

queries/c/highlights.scm

@@ -119,7 +119,9 @@
 ]  @function.macro
 ; TODO (preproc_arg)  @embedded
 
-(field_identifier) @property
+(((field_expression
+     (field_identifier) @property)) @_parent
+ (not-has-parent? @_parent template_method function_declarator call_expression))
 (statement_identifier) @label
 
 [

queries/cpp/highlights.scm

@@ -23,8 +23,9 @@
 (template_function
   name: (identifier) @function)
 
-(template_method
-  name: (field_identifier) @method)
+(((field_expression
+     (field_identifier) @method)) @_parent
+ (has-parent? @_parent template_method function_declarator call_expression))
 
 (template_function
   name: (scoped_identifier