fix: correcly handle - symbol (#895)

Co-authored-by: Dmitry Krutskikh <dmitry.krutskikh@gmail.com>

Author: incendial

CHANGELOG.md

@@ -2,15 +2,16 @@
 
 ## Unreleased
 
-* test: added test case in [`prefer-const-border-radius`](https://dartcodemetrics.dev/docs/rules/flutter/prefer-const-border-radius) rule.
-* chore: restrict `analyzer` version to `>=2.4.0 <4.2.0`.
+* feat: add [`avoid-banned-imports`](https://dartcodemetrics.dev/docs/rules/common/avoid-banned-imports) rule.
+* feat: add configuration to [`prefer-extracting-callbacks`](https://dartcodemetrics.dev/docs/rules/flutter/prefer-extracting-callbacks).
+* feat: improve [`checkstyle`](https://dartcodemetrics.dev/docs/cli/analyze#checkstyle) report, added metrics entries.
 * fix: normalize file paths after extraction from analyzed folder.
 * fix: improve context root included files calculation.
-* feat: add [`avoid-banned-imports`](https://dartcodemetrics.dev/docs/rules/common/avoid-banned-imports) rule
 * fix: resolve package with imported analysis options.
+* fix: correctly handle `-` symbol for [`prefer-commenting-analyzer-ignores`](https://dartcodemetrics.dev/docs/rules/common/prefer-commenting-analyzer-ignores).
 * fix: change elements equality check to overcome incorrect libs resolution.
-* feat: add configuration to [`prefer-extracting-callbacks`](https://dartcodemetrics.dev/docs/rules/flutter/prefer-extracting-callbacks)
-* feat: improve [`checkstyle`](https://dartcodemetrics.dev/docs/cli/analyze#checkstyle) report, added metrics entries.
+* chore: restrict `analyzer` version to `>=2.4.0 <4.2.0`.
+* test: added test case in [`prefer-const-border-radius`](https://dartcodemetrics.dev/docs/rules/flutter/prefer-const-border-radius) rule.
 
 ## 4.15.2
 

lib/src/analyzers/lint_analyzer/rules/rules_list/prefer_commenting_analyzer_ignores/visitor.dart

@@ -30,17 +30,25 @@ class _Visitor extends RecursiveAstVisitor<void> {
     if (node.type == TokenType.SINGLE_LINE_COMMENT) {
       final comment = node.toString();
 
-      final matches = _getIgnoreMatches(comment);
-      if (_hasNoDescription(matches, comment) && _hasNoPreviousComment(node)) {
+      if (_isIgnoreComment(comment) &&
+          _hasNoDescription(comment) &&
+          _hasNoPreviousComment(node)) {
         _comments.add(node);
       }
     }
   }
 
-  bool _hasNoDescription(Iterable<Match> matches, String comment) =>
-      matches.isNotEmpty &&
-      matches.first.groupCount > 0 &&
-      comment.trim().endsWith(matches.first.group(0)?.trim() ?? '');
+  bool _isIgnoreComment(String comment) {
+    final regExp = RegExp(r'(^//\s*ignore:\s*)', multiLine: true);
+
+    return regExp.allMatches(comment).isNotEmpty;
+  }
+
+  bool _hasNoDescription(String comment) {
+    final regExp = RegExp(r'(^//\s*ignore:.+?[^,\s]\s)', multiLine: true);
+
+    return regExp.allMatches(comment).isEmpty;
+  }
 
   bool _hasNoPreviousComment(Token node) {
     final previous = node.previous;
@@ -50,10 +58,4 @@ class _Visitor extends RecursiveAstVisitor<void> {
             _lineInfo.getLocation(node.offset).lineNumber - 1 !=
                 _lineInfo.getLocation(previous.offset).lineNumber);
   }
-
-  Iterable<Match> _getIgnoreMatches(String comment) {
-    final regExp = RegExp(r'ignore:[a-z_,-\s]*([a-z]*(-|_)[a-z]*)+');
-
-    return regExp.allMatches(comment);
-  }
 }

test/src/analyzers/lint_analyzer/rules/rules_list/prefer_commenting_analyzer_ignores/examples/example.dart

@@ -15,4 +15,7 @@ void main() {
 
   // ignore: deprecated_member_use, long-method multiple same line ignore
   final linkedList = LinkedList();
+
+  // ignore: avoid-non-null-assertion, checked for non-null
+  final hashMap = HashMap();
 }