diff options
Diffstat (limited to 'clang-tools-extra')
3 files changed, 27 insertions, 5 deletions
diff --git a/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp b/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp index 6a95a5f2a6a..350fa8120f0 100644 --- a/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp +++ b/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp @@ -151,11 +151,15 @@ BracesAroundStatementsCheck::check(const MatchFinder::MatchResult &Result) { SourceLocation StartLoc = findRParenLoc(S, SM, Context); if (StartLoc.isInvalid()) return; + if (ForceBracesStmts.erase(S)) + ForceBracesStmts.insert(S->getThen()); bool BracedIf = checkStmt(Result, S->getThen(), StartLoc, S->getElseLoc()); const Stmt *Else = S->getElse(); + if (Else && BracedIf) + ForceBracesStmts.insert(Else); if (Else && !isa<IfStmt>(Else)) { // Omit 'else if' statements here, they will be handled directly. - checkStmt(Result, Else, S->getElseLoc(), SourceLocation(), BracedIf); + checkStmt(Result, Else, S->getElseLoc(), SourceLocation()); } } else { llvm_unreachable("Invalid match"); @@ -203,7 +207,7 @@ BracesAroundStatementsCheck::findRParenLoc(const IfOrWhileStmt *S, /// Returns true if braces where added. bool BracesAroundStatementsCheck::checkStmt( const MatchFinder::MatchResult &Result, const Stmt *S, - SourceLocation InitialLoc, SourceLocation EndLocHint, bool ForceBraces) { + SourceLocation InitialLoc, SourceLocation EndLocHint) { // 1) If there's a corresponding "else" or "while", the check inserts "} " // right before that token. // 2) If there's a multi-line block comment starting on the same line after @@ -241,7 +245,7 @@ bool BracesAroundStatementsCheck::checkStmt( assert(EndLoc.isValid()); // Don't require braces for statements spanning less than certain number of // lines. - if (ShortStatementLines && !ForceBraces) { + if (ShortStatementLines && !ForceBracesStmts.erase(S)) { unsigned StartLine = SM.getSpellingLineNumber(StartLoc); unsigned EndLine = SM.getSpellingLineNumber(EndLoc); if (EndLine - StartLine < ShortStatementLines) @@ -254,6 +258,10 @@ bool BracesAroundStatementsCheck::checkStmt( return true; } +void BracesAroundStatementsCheck::onEndOfTranslationUnit() { + ForceBracesStmts.clear(); +} + } // namespace readability } // namespace tidy } // namespace clang diff --git a/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.h b/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.h index 609c6c01d96..4ff0aca5652 100644 --- a/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.h +++ b/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.h @@ -41,17 +41,18 @@ public: void storeOptions(ClangTidyOptions::OptionMap &Opts) override; void registerMatchers(ast_matchers::MatchFinder *Finder) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override; + void onEndOfTranslationUnit() override; private: bool checkStmt(const ast_matchers::MatchFinder::MatchResult &Result, const Stmt *S, SourceLocation StartLoc, - SourceLocation EndLocHint = SourceLocation(), - bool ForceBraces = false); + SourceLocation EndLocHint = SourceLocation()); template <typename IfOrWhileStmt> SourceLocation findRParenLoc(const IfOrWhileStmt *S, const SourceManager &SM, const ASTContext *Context); private: + std::set<const Stmt*> ForceBracesStmts; const unsigned ShortStatementLines; }; diff --git a/clang-tools-extra/unittests/clang-tidy/ReadabilityModuleTest.cpp b/clang-tools-extra/unittests/clang-tidy/ReadabilityModuleTest.cpp index 1da7206c276..9b44ac55917 100644 --- a/clang-tools-extra/unittests/clang-tidy/ReadabilityModuleTest.cpp +++ b/clang-tools-extra/unittests/clang-tidy/ReadabilityModuleTest.cpp @@ -254,6 +254,19 @@ TEST(BracesAroundStatementsCheck, IfElseWithShortStatements) { " else return -3;\n" "}", nullptr, "input.cc", None, Options)); + + // If the last else is an else-if, we also force it. + EXPECT_EQ("int main() {\n" + " if (false) { return -1;\n" + " } else if (1 == 2) { return -2;\n" + "}\n" + "}", + runCheckOnCode<BracesAroundStatementsCheck>( + "int main() {\n" + " if (false) return -1;\n" + " else if (1 == 2) return -2;\n" + "}", + nullptr, "input.cc", None, Options)); } TEST(BracesAroundStatementsCheck, For) { |
