7 files changed, 133 insertions, 66 deletions
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
index 65c5d6e2..43a5a21b 100644
--- a/queries/dart/highlights.scm
+++ b/queries/dart/highlights.scm
@@ -74,8 +74,9 @@
   name: (identifier) @type)
 (constructor_signature
   name: (identifier) @type)
-(type_identifier
-  (identifier) @type)
+;; TODO: does not work
+;(type_identifier
+  ;(identifier) @type)
 (scoped_identifier
   scope: (identifier) @type)
 (function_signature
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index 1fde75ef..3196fd93 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -83,41 +83,41 @@
 ; Variables
 ;----------
 
-(formal_parameters (identifier) @parameter)
-
-(formal_parameters
-  (rest_parameter
-    (identifier) @parameter))
-
-; ({ a }) => null
-(formal_parameters
-  (object_pattern
-    (shorthand_property_identifier) @parameter))
-
-; ({ a: b }) => null
-(formal_parameters
-  (object_pattern
-    (pair
-      value: (identifier) @parameter)))
-
-; ([ a ]) => null
-(formal_parameters
-  (array_pattern
-    (identifier) @parameter))
-
-; a => null
-(variable_declarator
-    value: (arrow_function
-      parameter: (identifier) @parameter))
-
-; (a => null)
-(arrow_function
-    parameter: (identifier) @parameter)
-
-; optional parameters
-(formal_parameters
-  (assignment_pattern
-    (shorthand_property_identifier) @parameter))
+;(formal_parameters (identifier) @parameter)
+
+;(formal_parameters
+  ;(rest_parameter
+    ;(identifier) @parameter))
+
+;; ({ a }) => null
+;(formal_parameters
+  ;(object_pattern
+    ;(shorthand_property_identifier) @parameter))
+
+;; ({ a: b }) => null
+;(formal_parameters
+  ;(object_pattern
+    ;(pair
+      ;value: (identifier) @parameter)))
+
+;; ([ a ]) => null
+;(formal_parameters
+  ;(array_pattern
+    ;(identifier) @parameter))
+
+;; a => null
+;(variable_declarator
+    ;value: (arrow_function
+      ;parameter: (identifier) @parameter))
+
+;; optional parameters
+;(formal_parameters
+  ;(assignment_pattern
+    ;(shorthand_property_identifier) @parameter))
+
+;; (a => null)
+;(arrow_function
+    ;parameter: (identifier) @parameter)
 
 ; Variables
 ;----------
diff --git a/queries/ecma/locals.scm b/queries/ecma/locals.scm
index 2f501f3a..663f9a58 100644
--- a/queries/ecma/locals.scm
+++ b/queries/ecma/locals.scm
@@ -13,33 +13,33 @@
 ; Definitions
 ;------------
 
-(formal_parameters
-  (identifier) @definition.parameter)
+;(formal_parameters
+  ;(identifier) @definition.parameter)
 
-(formal_parameters
-  (object_pattern
-    (identifier) @definition.parameter))
+;(formal_parameters
+  ;(object_pattern
+    ;(identifier) @definition.parameter))
 
-; function(arg = []) {
-(formal_parameters
-  (assignment_pattern
-    (shorthand_property_identifier) @definition.parameter))
+;; function(arg = []) {
+;(formal_parameters
+  ;(assignment_pattern
+    ;(shorthand_property_identifier) @definition.parameter))
 
-; x => x
-(arrow_function
-  parameter: (identifier) @definition.parameter)
+;; x => x
+;(arrow_function
+  ;parameter: (identifier) @definition.parameter)
 
-(formal_parameters
-  (object_pattern
-    (shorthand_property_identifier) @definition.parameter))
+;(formal_parameters
+  ;(object_pattern
+    ;(shorthand_property_identifier) @definition.parameter))
 
-(formal_parameters
-  (array_pattern
-    (identifier) @definition.parameter))
+;(formal_parameters
+  ;(array_pattern
+    ;(identifier) @definition.parameter))
 
-(formal_parameters
-  (rest_parameter
-    (identifier) @definition.parameter))
+;(formal_parameters
+  ;(rest_parameter
+    ;(identifier) @definition.parameter))
 
 (variable_declarator
   name: (identifier) @definition.var)
diff --git a/queries/glimmer/highlights.scm b/queries/glimmer/highlights.scm
index aa532c87..52c7becc 100644
--- a/queries/glimmer/highlights.scm
+++ b/queries/glimmer/highlights.scm
@@ -23,7 +23,8 @@
 ; Generic identifiers are variables
 (identifier) @variable
 ; Helpers are functions
-(helper_identifier) @function
+;TODO: does not exist
+;;(helper_identifier) @function
 
 (comment_statement) @comment
 
diff --git a/queries/php/locals.scm b/queries/php/locals.scm
index 1560a30a..7b1fb5a7 100644
--- a/queries/php/locals.scm
+++ b/queries/php/locals.scm
@@ -25,12 +25,13 @@
   (variable_name
     (name) @definition.var))
 
-(foreach_statement
-  (pair
-    (variable_name
-      (name) @definition.var))
-  (variable_name
-    (name) @definition.var))
+;;TODO
+;(foreach_statement
+  ;(pair
+    ;(variable_name
+      ;(name) @definition.var))
+  ;(variable_name
+    ;(name) @definition.var))
 
 (property_declaration
   (property_element
diff --git a/queries/ql/locals.scm b/queries/ql/locals.scm
index 42ccff13..e5fcb169 100644
--- a/queries/ql/locals.scm
+++ b/queries/ql/locals.scm
@@ -2,7 +2,8 @@
 (module) @scope
 (dataclass) @scope
 (datatype) @scope
-(classMember (body)  @scope)
+;; TODO does not work
+;(classMember (body)  @scope)
 (memberPredicate (body)  @scope)
 (classlessPredicate (body)  @scope)
 (quantified (conjunction) @scope)
diff --git a/queries/typescript/locals.scm b/queries/typescript/locals.scm
index 405f5c02..9127ac11 100644
--- a/queries/typescript/locals.scm
+++ b/queries/typescript/locals.scm
@@ -1,4 +1,67 @@
 ; inherits: ecma
 
+; inherits: (jsx)
+
+; Scopes
+;-------
+
+(statement_block) @scope
+(function) @scope
+(arrow_function) @scope
+(function_declaration) @scope
+(method_definition) @scope
+(for_statement) @scope
+(for_in_statement) @scope
+(catch_clause) @scope
+
+; Definitions
+;------------
+
+;(formal_parameters
+  ;(identifier) @definition.parameter)
+
+;(formal_parameters
+  ;(object_pattern
+    ;(identifier) @definition.parameter))
+
+;; function(arg = []) {
+;(formal_parameters
+  ;(assignment_pattern
+    ;(shorthand_property_identifier) @definition.parameter))
+
+;; x => x
+;(arrow_function
+  ;parameter: (identifier) @definition.parameter)
+
+;(formal_parameters
+  ;(object_pattern
+    ;(shorthand_property_identifier) @definition.parameter))
+
+;(formal_parameters
+  ;(array_pattern
+    ;(identifier) @definition.parameter))
+
+;(formal_parameters
+  ;(rest_parameter
+    ;(identifier) @definition.parameter))
+
+(variable_declarator
+  name: (identifier) @definition.var)
+
+(import_specifier
+  (identifier) @definition.import)
+
+(namespace_import
+  (identifier) @definition.import)
+
+(function_declaration
+  ((identifier) @definition.var)
+   (#set! definition.var.scope parent))
+
+; References
+;------------
+
+(identifier) @reference
+(shorthand_property_identifier) @reference
 (required_parameter (identifier) @definition)
 (optional_parameter (identifier) @definition)