Extend JavaScript ast-grep rules to match functions/methods in pairs and objects

lsproxy/Cargo.toml

@@ -23,8 +23,8 @@ serde_json = "1.0"
 strum = "0.25"
 strum_macros = "0.25"
 tokio = { version = "1.0", features = ["full", "process"] }
-utoipa = { version = "5.0", features = ["actix_extras"] }
-utoipa-swagger-ui = { version = "9.0.1", features = ["actix-web"] }
+utoipa = { git = "https://github.com/juhaku/utoipa.git", rev = "cecda0531bf7d90800af66b186055932ee730526", features = ["actix_extras"] }
+utoipa-swagger-ui = { git = "https://github.com/juhaku/utoipa.git", rev = "cecda0531bf7d90800af66b186055932ee730526", features = ["actix-web"] }
 rand = "0.8"
 async-trait = "0.1"
 futures = "0.3"

lsproxy/src/ast_grep/symbol/rules/javascript/function.yml

@@ -24,5 +24,7 @@ rule:
       inside:
         kind: pair
         has:
-          kind: arrow_function
+          any:
+            - kind: function_expression
+            - kind: arrow_function
         pattern: $CONTEXT

lsproxy/src/ast_grep/symbol/rules/javascript/method.yml

@@ -1,8 +1,13 @@
 id: method
 language: javascript
 rule:
-    kind: identifier
-    pattern: $NAME
-    inside:
-      kind: method_definition
-      pattern: $CONTEXT
+  pattern: $NAME
+  any:
+    - kind: identifier
+      inside:
+        kind: method_definition
+        pattern: $CONTEXT
+    - kind: property_identifier
+      inside:
+        kind: method_definition
+        pattern: $CONTEXT