Merge remote-tracking branch 'origin/master'

Author: illia-romanenko

.gitignore

@@ -1,5 +1,6 @@
 #IDEA Files
 /.idea/
+solid_lints.iml
 
 # Files and directories created by pub.
 .dart_tool/

lib/lints/function_lines_of_code/function_lines_of_code_metric.dart

@@ -46,23 +46,33 @@ class FunctionLinesOfCodeMetric
     ErrorReporter reporter,
     CustomLintContext context,
   ) {
-    context.registry.addDeclaration((node) {
-      if (node
-          case FunctionDeclaration() ||
-              MethodDeclaration() ||
-              FunctionExpression() ||
-              FunctionBody()) {
-        final visitor = FunctionLinesOfCodeVisitor(resolver.lineInfo);
-        node.visitChildren(visitor);
+    void checkNode(AstNode node) => _checkNode(resolver, reporter, node);
 
-        if (visitor.linesWithCode.length > config.parameters.maxLines) {
-          reporter.reportErrorForOffset(
-            code,
-            node.firstTokenAfterCommentAndMetadata.offset,
-            node.end,
-          );
-        }
+    context.registry.addMethodDeclaration(checkNode);
+    context.registry.addFunctionExpression(checkNode);
+  }
+
+  void _checkNode(
+    CustomLintResolver resolver,
+    ErrorReporter reporter,
+    AstNode node,
+  ) {
+    final visitor = FunctionLinesOfCodeVisitor(resolver.lineInfo);
+    node.visitChildren(visitor);
+
+    if (visitor.linesWithCode.length > config.parameters.maxLines) {
+      if (node is! AnnotatedNode) {
+        return reporter.reportErrorForNode(code, node);
       }
-    });
+
+      final startOffset = node.firstTokenAfterCommentAndMetadata.offset;
+      final lengthDifference = startOffset - node.offset;
+
+      reporter.reportErrorForOffset(
+        code,
+        startOffset,
+        node.length - lengthDifference,
+      );
+    }
   }
 }

lint_test/lines_of_code_test.dart

@@ -126,6 +126,7 @@ class A {
 class B {
   /// expect_lint: function_lines_of_code
   void anon() {
+    /// expect_lint: function_lines_of_code
     test("addition", () {
       expect(1 + 1, equals(2));
       test("addition", () {

pubspec.yaml

@@ -9,9 +9,9 @@ environment:
   sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  analyzer: ^6.0.0
+  analyzer: ^6.2.0
   collection: ^1.17.2
-  custom_lint_builder: ^0.5.6
+  custom_lint_builder: ^0.5.8
   glob: ^2.1.2
   path: ^1.8.3
   yaml: ^3.1.2