diff options
3 files changed, 18 insertions, 9 deletions
diff --git a/clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp b/clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp index 42f802cd0af..6bf0edb7231 100644 --- a/clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp +++ b/clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp @@ -73,7 +73,7 @@ void RedundantStringInitCheck::registerMatchers(MatchFinder *Finder) { namedDecl( varDecl( hasType(hasUnqualifiedDesugaredType(recordType( - hasDeclaration(cxxRecordDecl(hasName("basic_string")))))), + hasDeclaration(cxxRecordDecl(hasStringTypeName))))), hasInitializer(expr(ignoringImplicit(anyOf( EmptyStringCtorExpr, EmptyStringCtorExprWithTemporaries))))) .bind("vardecl"), @@ -82,11 +82,12 @@ void RedundantStringInitCheck::registerMatchers(MatchFinder *Finder) { } void RedundantStringInitCheck::check(const MatchFinder::MatchResult &Result) { - const auto *CtorExpr = Result.Nodes.getNodeAs<Expr>("expr"); - const auto *Decl = Result.Nodes.getNodeAs<NamedDecl>("decl"); - diag(CtorExpr->getExprLoc(), "redundant string initialization") - << FixItHint::CreateReplacement(CtorExpr->getSourceRange(), - Decl->getName()); + const auto *VDecl = Result.Nodes.getNodeAs<VarDecl>("vardecl"); + // VarDecl's getSourceRange() spans 'string foo = ""' or 'string bar("")'. + // So start at getLocation() to span just 'foo = ""' or 'bar("")'. + SourceRange ReplaceRange(VDecl->getLocation(), VDecl->getEndLoc()); + diag(VDecl->getLocation(), "redundant string initialization") + << FixItHint::CreateReplacement(ReplaceRange, VDecl->getName()); } } // namespace readability diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp index fe05845db66..0299519a508 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp @@ -1,5 +1,4 @@ -// RUN: %check_clang_tidy -std=c++11,c++14 %s readability-redundant-string-init %t -// FIXME: Fix the checker to work in C++17 mode. +// RUN: %check_clang_tidy %s readability-redundant-string-init %t namespace std { template <typename T> diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp index f8e97545354..15df753ece3 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp @@ -1,4 +1,8 @@ -// RUN: %check_clang_tidy -std=c++11,c++14 %s readability-redundant-string-init %t +// RUN: %check_clang_tidy -std=c++11,c++14 %s readability-redundant-string-init %t \ +// RUN: -config="{CheckOptions: \ +// RUN: [{key: readability-redundant-string-init.StringNames, \ +// RUN: value: '::std::basic_string;our::TestString'}] \ +// RUN: }" // FIXME: Fix the checker to work in C++17 mode. namespace std { @@ -131,6 +135,11 @@ void k() { // CHECK-FIXES: std::string a, b, c; std::string d = "u", e = "u", f = "u"; + + std::string g = "u", h = "", i = "uuu", j = "", k; + // CHECK-MESSAGES: [[@LINE-1]]:24: warning: redundant string initialization + // CHECK-MESSAGES: [[@LINE-2]]:43: warning: redundant string initialization + // CHECK-FIXES: std::string g = "u", h, i = "uuu", j, k; } // These cases should not generate warnings. |
