From db31158fdaa0e25a1e09a5a8091d6d3bbb316735 Mon Sep 17 00:00:00 2001
From: Akin Sowemimo <akin.sowemimo@gmail.com>
Date: Tue, 18 May 2021 20:52:57 +0100
Subject: fix: uppercase variables being highlighted as type

---
 queries/dart/highlights.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index ba3e91f93..1c9538073 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -2,10 +2,10 @@
 
 ; Methods
 ; --------------------
-;; TODO: does not work
-;(function_type
-  ;name: (identifier) @method)
 (super) @function
+; TODO: add method/call_expression to grammar and
+; distinguish method call from variable access
+(function_expression_body (identifier) @function)
 
 ; Annotations
 ; --------------------
@@ -105,13 +105,11 @@
 (final_builtin) @constant.builtin
 
 ((identifier) @type
- (#match? @type "^_?[A-Z]"))
+ (#match? @type "^_?[A-Z].*[a-z]")) ; catch Classes or IClasses not CLASSES
 
 ("Function" @type)
 
 ; properties
-; TODO: add method/call_expression to grammar and
-; distinguish method call from variable access
 (unconditional_assignable_selector
   (identifier) @property)
 (assignable_selector
@@ -156,9 +154,14 @@
 ["import" "library" "export"] @include
 
 ; Reserved words (cannot be used as identifiers)
-; TODO: "rethrow" @keyword
 [
-    ; "assert"
+    ; TODO:
+    ; "rethrow" cannot be targeted at all and seems to be an invisible node
+    ; TODO:
+    ; the assert keyword cannot be specifically targeted
+    ; because the grammar selects the whole node or the content
+    ; of the assertion not just the keyword
+    ; assert
     (case_builtin)
     "extension"
     "on"
-- 
cgit v1.2.3-70-g09d2