Add arrow_function (JS) in function detector

mozilla · Dec 18, 2019 · 56c0f67 · 56c0f67
1 parent cfeb938
commit 56c0f67
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/src/checker.rs b/src/checker.rs
@@ -139,7 +139,8 @@ impl Checker for MozjsCode {
         GeneratorFunction,
         FunctionDeclaration,
         GeneratorFunctionDeclaration,
-        MethodDefinition
+        MethodDefinition,
+        ArrowFunction
     );
     mk_checker!(
         is_func_space,
@@ -150,7 +151,8 @@ impl Checker for MozjsCode {
         FunctionDeclaration,
         MethodDefinition,
         GeneratorFunctionDeclaration,
-        ClassDeclaration
+        ClassDeclaration,
+        ArrowFunction
     );
 }
 
@@ -164,7 +166,8 @@ impl Checker for JavascriptCode {
         GeneratorFunction,
         FunctionDeclaration,
         GeneratorFunctionDeclaration,
-        MethodDefinition
+        MethodDefinition,
+        ArrowFunction
     );
     mk_checker!(
         is_func_space,
@@ -175,7 +178,8 @@ impl Checker for JavascriptCode {
         FunctionDeclaration,
         MethodDefinition,
         GeneratorFunctionDeclaration,
-        ClassDeclaration
+        ClassDeclaration,
+        ArrowFunction
     );
 }
 
@@ -189,7 +193,8 @@ impl Checker for TypescriptCode {
         GeneratorFunction,
         FunctionDeclaration,
         GeneratorFunctionDeclaration,
-        MethodDefinition
+        MethodDefinition,
+        ArrowFunction
     );
     mk_checker!(
         is_func_space,
@@ -200,7 +205,8 @@ impl Checker for TypescriptCode {
         FunctionDeclaration,
         MethodDefinition,
         GeneratorFunctionDeclaration,
-        ClassDeclaration
+        ClassDeclaration,
+        ArrowFunction
     );
 }
 
@@ -214,7 +220,8 @@ impl Checker for TsxCode {
         GeneratorFunction,
         FunctionDeclaration,
         GeneratorFunctionDeclaration,
-        MethodDefinition
+        MethodDefinition,
+        ArrowFunction
     );
     mk_checker!(
         is_func_space,
@@ -226,7 +233,8 @@ impl Checker for TsxCode {
         MethodDefinition,
         GeneratorFunction,
         GeneratorFunctionDeclaration,
-        ClassDeclaration
+        ClassDeclaration,
+        ArrowFunction
     );
 }
 

diff --git a/src/getter.rs b/src/getter.rs
@@ -47,7 +47,8 @@ impl Getter for MozjsCode {
             | MethodDefinition
             | GeneratorFunction
             | FunctionDeclaration
-            | GeneratorFunctionDeclaration => NodeKind::Function,
+            | GeneratorFunctionDeclaration
+            | ArrowFunction => NodeKind::Function,
             Class | ClassDeclaration => NodeKind::Class,
             Program => NodeKind::Unit,
             _ => NodeKind::Unknown,
@@ -93,7 +94,8 @@ impl Getter for JavascriptCode {
             | MethodDefinition
             | GeneratorFunction
             | FunctionDeclaration
-            | GeneratorFunctionDeclaration => NodeKind::Function,
+            | GeneratorFunctionDeclaration
+            | ArrowFunction => NodeKind::Function,
             Class | ClassDeclaration => NodeKind::Class,
             Program => NodeKind::Unit,
             _ => NodeKind::Unknown,
@@ -139,7 +141,8 @@ impl Getter for TypescriptCode {
             | MethodDefinition
             | GeneratorFunction
             | FunctionDeclaration
-            | GeneratorFunctionDeclaration => NodeKind::Function,
+            | GeneratorFunctionDeclaration
+            | ArrowFunction => NodeKind::Function,
             Class | ClassDeclaration => NodeKind::Class,
             Program => NodeKind::Unit,
             _ => NodeKind::Unknown,
@@ -185,7 +188,8 @@ impl Getter for TsxCode {
             | MethodDefinition
             | GeneratorFunction
             | FunctionDeclaration
-            | GeneratorFunctionDeclaration => NodeKind::Function,
+            | GeneratorFunctionDeclaration
+            | ArrowFunction => NodeKind::Function,
             Class | ClassDeclaration => NodeKind::Class,
             Program => NodeKind::Unit,
             _ => NodeKind::Unknown,