diff options
3 files changed, 49 insertions, 2 deletions
diff --git a/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp b/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp index d3980b7b4e2..8a6c8c47598 100644 --- a/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp +++ b/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp @@ -17,7 +17,22 @@ namespace clang { namespace tidy { namespace readability { +static const IfStmt *getPrecedingIf(const SourceManager &SM, + ASTContext *Context, const IfStmt *If) { + auto parents = Context->getParents(*If); + if (parents.size() != 1) + return nullptr; + if (const auto *PrecedingIf = parents[0].get<IfStmt>()) { + SourceLocation PreviousElseLoc = PrecedingIf->getElseLoc(); + if (SM.getExpansionLineNumber(PreviousElseLoc) == + SM.getExpansionLineNumber(If->getIfLoc())) + return PrecedingIf; + } + return nullptr; +} + void MisleadingIndentationCheck::danglingElseCheck(const SourceManager &SM, + ASTContext *Context, const IfStmt *If) { SourceLocation IfLoc = If->getIfLoc(); SourceLocation ElseLoc = If->getElseLoc(); @@ -29,6 +44,11 @@ void MisleadingIndentationCheck::danglingElseCheck(const SourceManager &SM, SM.getExpansionLineNumber(ElseLoc)) return; + // Find location of first 'if' in a 'if else if' chain. + for (auto PrecedingIf = getPrecedingIf(SM, Context, If); PrecedingIf; + PrecedingIf = getPrecedingIf(SM, Context, PrecedingIf)) + IfLoc = PrecedingIf->getIfLoc(); + if (SM.getExpansionColumnNumber(IfLoc) != SM.getExpansionColumnNumber(ElseLoc)) diag(ElseLoc, "different indentation for 'if' and corresponding 'else'"); @@ -92,7 +112,7 @@ void MisleadingIndentationCheck::registerMatchers(MatchFinder *Finder) { void MisleadingIndentationCheck::check(const MatchFinder::MatchResult &Result) { if (const auto *If = Result.Nodes.getNodeAs<IfStmt>("if")) - danglingElseCheck(*Result.SourceManager, If); + danglingElseCheck(*Result.SourceManager, Result.Context, If); if (const auto *CStmt = Result.Nodes.getNodeAs<CompoundStmt>("compound")) missingBracesCheck(*Result.SourceManager, CStmt); diff --git a/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.h b/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.h index fd5d089531b..0ca50bb03e5 100644 --- a/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.h +++ b/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.h @@ -30,7 +30,8 @@ public: void check(const ast_matchers::MatchFinder::MatchResult &Result) override; private: - void danglingElseCheck(const SourceManager &SM, const IfStmt *If); + void danglingElseCheck(const SourceManager &SM, ASTContext *Context, + const IfStmt *If); void missingBracesCheck(const SourceManager &SM, const CompoundStmt *CStmt); }; diff --git a/clang-tools-extra/test/clang-tidy/readability-misleading-indentation.cpp b/clang-tools-extra/test/clang-tidy/readability-misleading-indentation.cpp index cb81a57f609..ef94229fcb0 100644 --- a/clang-tools-extra/test/clang-tidy/readability-misleading-indentation.cpp +++ b/clang-tools-extra/test/clang-tidy/readability-misleading-indentation.cpp @@ -76,5 +76,31 @@ int main() { } + if(cond1) { + } + else if (cond2) { + } + else { + } + + if(cond1) { + } + else if (cond2) { + } + else { + } + // CHECK-MESSAGES: :[[@LINE-2]]:8: warning: different indentation for 'if' and corresponding 'else' [readability-misleading-indentation] + + if (cond1) { + if (cond1) { + } + else if (cond2) { + } + else { + } + } + else if (cond2) { + } + BLOCK } |
