From 788d212ab3d249a673160779528fe6b03eff93a4 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Wed, 28 Apr 2021 14:39:14 +0200
Subject: locals(js,ts): Add parameters again (#1231)

---
 queries/ecma/locals.scm       | 28 ----------------------------
 queries/javascript/locals.scm | 32 ++++++++++++++++++++++++++++++++
 queries/typescript/locals.scm | 24 ++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/queries/ecma/locals.scm b/queries/ecma/locals.scm
index 663f9a582..08c9b8e7d 100644
--- a/queries/ecma/locals.scm
+++ b/queries/ecma/locals.scm
@@ -13,34 +13,6 @@
 ; 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)
 
diff --git a/queries/javascript/locals.scm b/queries/javascript/locals.scm
index b6d9b28bf..f4f0e92de 100644
--- a/queries/javascript/locals.scm
+++ b/queries/javascript/locals.scm
@@ -1 +1,33 @@
 ; inherits: ecma,jsx
+
+(formal_parameters
+  (identifier) @definition.parameter)
+
+; function(arg = []) {
+(formal_parameters
+  (assignment_pattern
+    left: (identifier) @definition.parameter))
+
+; x => x
+(arrow_function
+  parameter: (identifier) @definition.parameter)
+
+;; ({ a }) => null
+(formal_parameters
+  (object_pattern
+    (shorthand_property_identifier_pattern) @definition.parameter))
+
+;; ({ a: b }) => null
+(formal_parameters
+  (object_pattern
+    (pair_pattern
+      value: (identifier) @definition.parameter)))
+
+;; ([ a ]) => null
+(formal_parameters
+  (array_pattern
+    (identifier) @definition.parameter))
+
+(formal_parameters
+  (rest_pattern
+    (identifier) @definition.parameter))
diff --git a/queries/typescript/locals.scm b/queries/typescript/locals.scm
index 0f0789f5a..efbcaecaa 100644
--- a/queries/typescript/locals.scm
+++ b/queries/typescript/locals.scm
@@ -1,3 +1,27 @@
 ; inherits: ecma
 (required_parameter (identifier) @definition)
 (optional_parameter (identifier) @definition)
+
+; x => x
+(arrow_function
+  parameter: (identifier) @definition.parameter)
+
+;; ({ a }) => null
+(required_parameter
+  (object_pattern
+    (shorthand_property_identifier_pattern) @definition.parameter))
+
+;; ({ a: b }) => null
+(required_parameter
+  (object_pattern
+    (pair_pattern
+      value: (identifier) @definition.parameter)))
+
+;; ([ a ]) => null
+(required_parameter
+  (array_pattern
+    (identifier) @definition.parameter))
+
+(required_parameter
+  (rest_pattern
+    (identifier) @definition.parameter))
-- 
cgit v1.2.3-70-g09d2