- Fixed mr comments

solid-software · Mar 13, 2024 · f9686f2 · f9686f2
1 parent a5d7936
commit f9686f2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/lib/src/lints/function_lines_of_code/function_lines_of_code_metric.dart b/lib/src/lints/function_lines_of_code/function_lines_of_code_metric.dart
@@ -60,19 +60,9 @@ class FunctionLinesOfCodeMetric
     ErrorReporter reporter,
     AstNode node,
   ) {
-    final name = () {
-      if (node is FunctionDeclaration) {
-        return node.name.lexeme;
-      } else if (node is MethodDeclaration) {
-        return node.name.lexeme;
-      } else if (node is FunctionExpression) {
-        return node.declaredElement?.name;
-      } else {
-        return null;
-      }
-    }();
-
-    if (name != null && config.parameters.excludeNames.contains(name)) {
+    final functionName = _getFunctionName(node);
+    if (functionName != null &&
+        config.parameters.excludeNames.contains(functionName)) {
       return;
     }
 
@@ -94,4 +84,16 @@ class FunctionLinesOfCodeMetric
       );
     }
   }
+
+  String? _getFunctionName(AstNode node) {
+    if (node is FunctionDeclaration) {
+      return node.name.lexeme;
+    } else if (node is MethodDeclaration) {
+      return node.name.lexeme;
+    } else if (node is FunctionExpression) {
+      return node.declaredElement?.name;
+    } else {
+      return null;
+    }
+  }
 }
diff --git a/lib/src/lints/function_lines_of_code/models/function_lines_of_code_parameters.dart b/lib/src/lints/function_lines_of_code/models/function_lines_of_code_parameters.dart
@@ -5,7 +5,7 @@ class FunctionLinesOfCodeParameters {
   /// exceeding this limit triggers a warning.
   final int maxLines;
 
-  /// Method names to be excluded from the rule check
+  /// Function names to be excluded from the rule check
   final List<String> excludeNames;
 
   static const _defaultMaxLines = 200;

diff --git a/lint_test/function_lines_of_code_test/function_lines_of_code_test.dart b/lint_test/function_lines_of_code_test/function_lines_of_code_test.dart
@@ -1,4 +1,12 @@
 class ClassWithLongMethods {
+  int notLongMethod() {
+    var i = 0;
+    i++;
+    i++;
+    i++;
+    return i;
+  }
+
   // expect_lint: function_lines_of_code
   int longMethod() {
     var i = 0;
@@ -20,6 +28,14 @@ class ClassWithLongMethods {
   }
 }
 
+int notLongFunction() {
+  var i = 0;
+  i++;
+  i++;
+  i++;
+  return i;
+}
+
 // expect_lint: function_lines_of_code
 int longFunction() {
   var i = 0;