poelmanc updated this revision to Diff 228556.
poelmanc edited the summary of this revision.
Repository:
rCTE Clang Tools Extra
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D69238/new/
https://reviews.llvm.org/D69238
Files:
clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp
clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
Index:
clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
===================================================================
---
clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
+++
clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.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>
@@ -131,6 +130,11 @@
// 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.
Index:
clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
===================================================================
---
clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
+++
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>
Index: clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp
@@ -46,23 +46,23 @@
// string bar("");
Finder->addMatcher(
namedDecl(
- varDecl(hasType(hasUnqualifiedDesugaredType(recordType(
-
hasDeclaration(cxxRecordDecl(hasName("basic_string")))))),
- hasInitializer(expr(ignoringImplicit(anyOf(
- EmptyStringCtorExpr,
- EmptyStringCtorExprWithTemporaries)))
- .bind("expr"))),
- unless(parmVarDecl()))
- .bind("decl"),
+ varDecl(
+ hasType(hasUnqualifiedDesugaredType(recordType(
+ hasDeclaration(cxxRecordDecl(hasName("basic_string")))))),
+ hasInitializer(expr(ignoringImplicit(anyOf(
+ EmptyStringCtorExpr, EmptyStringCtorExprWithTemporaries)))))
+ .bind("vardecl"),
+ unless(parmVarDecl())),
this);
}
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
Index: clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
===================================================================
--- clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.cpp
+++ clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init.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>
@@ -131,6 +130,11 @@
// 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.
Index: clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
===================================================================
--- clang-tools-extra/test/clang-tidy/checkers/readability-redundant-string-init-msvc.cpp
+++ 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>
Index: clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/RedundantStringInitCheck.cpp
@@ -46,23 +46,23 @@
// string bar("");
Finder->addMatcher(
namedDecl(
- varDecl(hasType(hasUnqualifiedDesugaredType(recordType(
- hasDeclaration(cxxRecordDecl(hasName("basic_string")))))),
- hasInitializer(expr(ignoringImplicit(anyOf(
- EmptyStringCtorExpr,
- EmptyStringCtorExprWithTemporaries)))
- .bind("expr"))),
- unless(parmVarDecl()))
- .bind("decl"),
+ varDecl(
+ hasType(hasUnqualifiedDesugaredType(recordType(
+ hasDeclaration(cxxRecordDecl(hasName("basic_string")))))),
+ hasInitializer(expr(ignoringImplicit(anyOf(
+ EmptyStringCtorExpr, EmptyStringCtorExprWithTemporaries)))))
+ .bind("vardecl"),
+ unless(parmVarDecl())),
this);
}
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
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
