diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index d11fa6705..83a0bfd97 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -84,45 +84,6 @@
   function: (member_expression
     property: (property_identifier) @method))
 
-; 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))
-
-;; optional parameters
-;(formal_parameters
-  ;(assignment_pattern
-    ;(shorthand_property_identifier) @parameter))
-
-;; (a => null)
-;(arrow_function
-    ;parameter: (identifier) @parameter)
-
 ; Variables
 ;----------
 (namespace_import
diff --git a/queries/javascript/highlights.scm b/queries/javascript/highlights.scm
index b6d9b28bf..57634434e 100644
--- a/queries/javascript/highlights.scm
+++ b/queries/javascript/highlights.scm
@@ -1 +1,33 @@
 ; inherits: ecma,jsx
+
+;;; Parameters
+(formal_parameters (identifier) @parameter)
+
+(formal_parameters
+  (rest_pattern
+    (identifier) @parameter))
+
+;; ({ a }) => null
+(formal_parameters
+  (object_pattern
+    (shorthand_property_identifier_pattern) @parameter))
+
+;; ({ a: b }) => null
+(formal_parameters
+  (object_pattern
+    (pair_pattern
+      value: (identifier) @parameter)))
+
+;; ([ a ]) => null
+(formal_parameters
+  (array_pattern
+    (identifier) @parameter))
+
+;; a => null
+(arrow_function
+  parameter: (identifier) @parameter)
+
+;; optional parameters
+(formal_parameters
+  (assignment_pattern
+    left: (identifier) @parameter))
diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm
index 8b755ba73..0f318b66f 100644
--- a/queries/typescript/highlights.scm
+++ b/queries/typescript/highlights.scm
@@ -45,5 +45,30 @@
 
 (undefined) @variable.builtin
 
+;;; Parameters
 (required_parameter (identifier) @parameter)
 (optional_parameter (identifier) @parameter)
+
+(required_parameter
+  (rest_pattern
+    (identifier) @parameter))
+
+;; ({ a }) => null
+(required_parameter
+  (object_pattern
+    (shorthand_property_identifier_pattern) @parameter))
+
+;; ({ a: b }) => null
+(required_parameter
+  (object_pattern
+    (pair_pattern
+      value: (identifier) @parameter)))
+
+;; ([ a ]) => null
+(required_parameter
+  (array_pattern
+    (identifier) @parameter))
+
+;; a => null
+(arrow_function
+  parameter: (identifier) @parameter)