[clang-tidy] Add some more tests

Author: capitan-davide

clang-tools-extra/clang-tidy/readability/InconsistentIfElseBracesCheck.cpp

@@ -9,7 +9,10 @@
 #include "InconsistentIfElseBracesCheck.h"
 #include "../utils/BracesAroundStatement.h"
 #include "clang/AST/ASTContext.h"
+#include "clang/AST/Stmt.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
+#include "clang/Basic/SourceLocation.h"
+#include "clang/Lex/Lexer.h"
 
 using namespace clang::ast_matchers;
 
@@ -55,17 +58,19 @@ void InconsistentIfElseBracesCheck::checkIfStmt(
     // If the then-branch is a nested IfStmt, first we need to add braces to
     // it, then we need to check the inner IfStmt.
     emitDiagnostic(Result, If->getThen(), If->getRParenLoc(), If->getElseLoc());
+
     if (shouldHaveBraces(NestedIf))
       checkIfStmt(Result, NestedIf);
   } else if (!isa<CompoundStmt>(Then)) {
-    emitDiagnostic(Result, If->getThen(), If->getRParenLoc(), If->getElseLoc());
+    emitDiagnostic(Result, Then, If->getRParenLoc(), If->getElseLoc());
   }
 
   if (const Stmt *const Else = If->getElse()) {
     if (const auto *NestedIf = dyn_cast<const IfStmt>(Else))
       checkIfStmt(Result, NestedIf);
-    else if (!isa<CompoundStmt>(Else))
+    else if (!isa<CompoundStmt>(Else)) {
       emitDiagnostic(Result, If->getElse(), If->getElseLoc());
+    }
   }
 }
 
@@ -74,7 +79,6 @@ void InconsistentIfElseBracesCheck::emitDiagnostic(
     SourceLocation StartLoc, SourceLocation EndLocHint) {
   const SourceManager &SM = *Result.SourceManager;
   const LangOptions &LangOpts = Result.Context->getLangOpts();
-
   if (!StartLoc.isMacroID()) {
     const utils::BraceInsertionHints Hints =
         utils::getBraceInsertionsHints(S, LangOpts, SM, StartLoc, EndLocHint);

clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-ifelse-braces-attributes.cpp

@@ -0,0 +1,42 @@
+// RUN: %check_clang_tidy  -std=c++20-or-later %s readability-inconsistent-ifelse-braces %t
+
+// Positive tests.
+void f(bool b) {
+  if (b) [[likely]] return;
+  else {
+  }
+  // CHECK-MESSAGES: :[[@LINE-3]]:9: warning: <message> [readability-inconsistent-ifelse-braces]
+  // CHECK-FIXES: if (b) { {{[[][[]}}likely{{[]][]]}} return;
+  // CHECK-FIXES: } else {
+
+  if (b) {
+  } else [[unlikely]]
+    return;
+  // CHECK-MESSAGES: :[[@LINE-2]]:9: warning: <message> [readability-inconsistent-ifelse-braces]
+  // CHECK-FIXES: } else { {{[[][[]}}unlikely{{[]][]]}}
+}
+
+// Negative tests.
+void g(bool b) {
+  if (b) {
+    return;
+  }
+
+  if (b) { [[likely]]
+    return;
+  }
+
+  if (b) { [[unlikely]]
+    return;
+  } else { [[likely]]
+    return;
+  }
+
+  if (b) [[likely]]
+    return;
+
+  if (b) [[unlikely]]
+    return;
+  else [[likely]]
+    return;
+}

clang-tools-extra/test/clang-tidy/checkers/readability/inconsistent-ifelse-braces.cpp

@@ -1,5 +1,8 @@
 // RUN: %check_clang_tidy -std=c++98-or-later %s readability-inconsistent-ifelse-braces %t
 
+#define MACRO_COND(x) cond(x)
+#define MACRO_FUN (void)0
+
 bool cond(const char *) { return false; }
 void do_something(const char *) {}
 
@@ -101,6 +104,18 @@ void f() {
   // CHECK-MESSAGES: :[[@LINE-2]]:28: warning: <message> [readability-inconsistent-ifelse-braces]
   // CHECK-FIXES: } else if (cond("if5.1")) {
   // CHECK-FIXES: }
+
+  if (MACRO_COND("if6")) MACRO_FUN;
+  else {
+  }
+  // CHECK-MESSAGES: :[[@LINE-3]]:20: warning: <message> [readability-inconsistent-ifelse-braces]
+  // CHECK-FIXES: if (MACRO_COND("if6")) { MACRO_FUN;
+  // CHECK-FIXES: } else {
+
+  if (MACRO_COND("if6")) {
+  } else MACRO_FUN;
+  // CHECK-MESSAGES: :[[@LINE-1]]:9: warning: <message> [readability-inconsistent-ifelse-braces]
+  // CHECK-FIXES: } else { MACRO_FUN;
 }
 
 // Negative tests.