Merge pull request #2771 from asashour/2416

Fix curly_braces_in_flow_control_structures when "if" is "else" of previous "if"
dart-lang · Jul 16, 2021 · 495f3c4 · 495f3c4
2 parents efb0eec + d0e81b6
commit 495f3c4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # master
 
 - New lint: `eol_at_end_of_file`
+- Fix false negative case of else-if in `curly_braces_in_flow_control_structures.dart`
 - Update `analyzer` constraint to `>=2.0.0 <3.0.0`.
 
 # 1.7.1

diff --git a/lib/src/rules/curly_braces_in_flow_control_structures.dart b/lib/src/rules/curly_braces_in_flow_control_structures.dart
@@ -89,6 +89,11 @@ class _Visitor extends SimpleAstVisitor {
   void visitIfStatement(IfStatement node) {
     var elseStatement = node.elseStatement;
     if (elseStatement == null) {
+      var parent = node.parent;
+      if (parent is IfStatement && node == parent.elseStatement) {
+        _check(node.thenStatement);
+        return;
+      }
       if (node.thenStatement is Block) return;
 
       var unit = node.root as CompilationUnit;

diff --git a/test_data/rules/curly_braces_in_flow_control_structures.dart b/test_data/rules/curly_braces_in_flow_control_structures.dart
@@ -55,6 +55,13 @@ testIfElse() {
 
   if (false) { print('should be on next line'); // OK
   }
+
+  if (true) {
+  } else if (true) return; //LINT
+
+  if (true) {
+  } else if (true)
+    return; //LINT
 }
 
 testWhile() {