From e540399d4af4a068a1f42a31a97d4d0b5d14bec2 Mon Sep 17 00:00:00 2001 From: Dmitry Zhifarsky Date: Sun, 15 May 2022 21:50:23 +0400 Subject: [PATCH 1/2] fix: temporary remove enums support --- CHANGELOG.md | 4 ++++ .../rules/rules_list/prefer_trailing_comma/visitor.dart | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe602af1b6..2d7713f5eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Unreleased + +* fix: temporary remove enums support for [`prefer-trailing-comma`](https://dartcodemetrics.dev/docs/rules/common/prefer-trailing-comma). + ## 4.15.1 * chore: restrict `analyzer` version to `>=2.4.0 <4.1.0`. diff --git a/lib/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/visitor.dart b/lib/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/visitor.dart index 40a5d91141..6404c01fe7 100644 --- a/lib/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/visitor.dart +++ b/lib/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/visitor.dart @@ -28,13 +28,6 @@ class _Visitor extends RecursiveAstVisitor { ); } - @override - void visitEnumDeclaration(EnumDeclaration node) { - super.visitEnumDeclaration(node); - - _visitNodeList(node.constants, node.leftBracket, node.rightBracket); - } - @override void visitListLiteral(ListLiteral node) { super.visitListLiteral(node); From b3ede33002b5f9332d7e771dcd93cd15b9166496 Mon Sep 17 00:00:00 2001 From: Dmitry Zhifarsky Date: Sun, 15 May 2022 22:55:27 +0400 Subject: [PATCH 2/2] test: update tests --- .../examples/incorrect_example.dart | 2 +- .../prefer_trailing_comma_rule_test.dart | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/test/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/examples/incorrect_example.dart b/test/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/examples/incorrect_example.dart index 25b2d53b94..dd3c5b1150 100644 --- a/test/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/examples/incorrect_example.dart +++ b/test/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/examples/incorrect_example.dart @@ -35,7 +35,7 @@ enum FirstEnum { thirdItem, forthItem, fifthItem, - sixthItem // LINT + sixthItem } class FirstClass { diff --git a/test/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/prefer_trailing_comma_rule_test.dart b/test/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/prefer_trailing_comma_rule_test.dart index 650ee7335a..a609837dcb 100644 --- a/test/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/prefer_trailing_comma_rule_test.dart +++ b/test/src/analyzers/lint_analyzer/rules/rules_list/prefer_trailing_comma/prefer_trailing_comma_rule_test.dart @@ -30,8 +30,8 @@ void main() { RuleTestHelper.verifyIssues( issues: issues, - startLines: [3, 9, 13, 18, 24, 28, 38, 49, 58, 64, 70], - startColumns: [50, 7, 5, 52, 9, 8, 3, 59, 3, 3, 3], + startLines: [3, 9, 13, 18, 24, 28, 49, 58, 64, 70], + startColumns: [50, 7, 5, 52, 9, 8, 59, 3, 3, 3], locationTexts: [ 'String thirdArgument', "'and another string for length exceed'", @@ -39,7 +39,6 @@ void main() { 'String thirdArgument', "'and another string for length exceed'", "'some other string'", - 'sixthItem', 'this.forthField', "'and another string for length exceed'", "'and another string for length exceed'", @@ -56,7 +55,6 @@ void main() { 'Prefer trailing comma.', 'Prefer trailing comma.', 'Prefer trailing comma.', - 'Prefer trailing comma.', ], replacementComments: [ 'Add trailing comma.', @@ -69,7 +67,6 @@ void main() { 'Add trailing comma.', 'Add trailing comma.', 'Add trailing comma.', - 'Add trailing comma.', ], replacements: [ 'String thirdArgument,', @@ -78,7 +75,6 @@ void main() { 'String thirdArgument,', "'and another string for length exceed',", "'some other string',", - 'sixthItem,', 'this.forthField,', "'and another string for length exceed',", "'and another string for length exceed',", @@ -102,8 +98,8 @@ void main() { RuleTestHelper.verifyIssues( issues: issues, - startLines: [9, 17, 19, 37, 41, 75, 91, 99, 109, 119], - startColumns: [21, 33, 20, 23, 19, 18, 43, 21, 19, 19], + startLines: [9, 17, 19, 37, 41, 91, 99, 109, 119], + startColumns: [21, 33, 20, 23, 19, 43, 21, 19, 19], locationTexts: [ 'String arg1', 'void Function() callback', @@ -114,7 +110,6 @@ void main() { '() {\n' ' return;\n' ' }', - 'firstItem', '0', '\'some string\'', '\'some string\'', @@ -130,7 +125,6 @@ void main() { 'Prefer trailing comma.', 'Prefer trailing comma.', 'Prefer trailing comma.', - 'Prefer trailing comma.', ], ); });