Add Halstead test for JavaScript grammar

mozilla · Mar 23, 2021 · 5f3d087 · 5f3d087
1 parent 4c17538
commit 5f3d087
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/getter.rs b/src/getter.rs
@@ -196,11 +196,11 @@ impl Getter for JavascriptCode {
             | PERCENT | STARSTAR | PIPE | AMP | LTLT | TILDE | LT | LTEQ | EQEQ | BANGEQ | GTEQ
             | GT | PLUSEQ | BANG | BANGEQEQ | EQEQEQ | DASHEQ | STAREQ | SLASHEQ | PERCENTEQ
             | STARSTAREQ | GTGTEQ | GTGTGTEQ | LTLTEQ | AMPEQ | CARET | CARETEQ | PIPEEQ
-            | Yield | LBRACK | LBRACE | Await | QMARK | QMARKQMARK | New | Let | Var | Const => {
-                HalsteadType::Operator
-            }
-            Identifier | Identifier2 | String | Number | True | False | Null | Void | This
-            | Super | Undefined | Set | Get | Typeof | Instanceof => HalsteadType::Operand,
+            | Yield | LBRACK | LBRACE | Await | QMARK | QMARKQMARK | New | Let | Var | Const
+            | Function | Function2 | SEMI => HalsteadType::Operator,
+            Identifier | Identifier2 | MemberExpression | PropertyIdentifier | String | Number
+            | True | False | Null | Void | This | Super | Undefined | Set | Get | Typeof
+            | Instanceof => HalsteadType::Operand,
             _ => HalsteadType::Unknown,
         }
     }

diff --git a/src/metrics/halstead.rs b/src/metrics/halstead.rs
@@ -404,6 +404,27 @@ mod tests {
         );
     }
 
+    #[test]
+    fn javascript_operators_and_operands() {
+        check_metrics!(
+            "function main() {
+              var a, b, c, avg;
+              a = 5; b = 5; c = 5;
+              avg = (a + b + c) / 3;
+              console.log(\"{}\", avg);
+            }",
+            "foo.js",
+            JavascriptParser,
+            halstead,
+            [
+                (u_operators, 10, usize), // function, (), {}, var, =, +, /, ,, ., ;
+                (operators, 24, usize),
+                (u_operands, 11, usize), // main, a, b, c, avg, 3, 5, console.log, console, log, "{}"
+                (operands, 21, usize)
+            ]
+        );
+    }
+
     #[test]
     fn python_wrong_operators() {
         check_metrics!(