ymandel created this revision.
ymandel added a reviewer: ilya-biryukov.
Herald added a project: clang.
`change()` is an all purpose function; the revision adds simple shortcuts for
the specific operations of inserting (before/after) or removing source.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D62621
Files:
clang/include/clang/Tooling/Refactoring/Transformer.h
clang/unittests/Tooling/TransformerTest.cpp
Index: clang/unittests/Tooling/TransformerTest.cpp
===================================================================
--- clang/unittests/Tooling/TransformerTest.cpp
+++ clang/unittests/Tooling/TransformerTest.cpp
@@ -349,6 +349,64 @@
Input, Expected);
}
+TEST_F(TransformerTest, InsertBeforeEdit) {
+ std::string Input = R"cc(
+ int f() {
+ return 7;
+ }
+ )cc";
+ std::string Expected = R"cc(
+ int f() {
+ int y = 3;
+ return 7;
+ }
+ )cc";
+
+ StringRef Ret = "return";
+ testRule(makeRule(returnStmt().bind(Ret),
+ insertBefore(statement(Ret), text("int y = 3;"))),
+ Input, Expected);
+}
+
+TEST_F(TransformerTest, InsertAfterEdit) {
+ std::string Input = R"cc(
+ int f() {
+ int x = 5;
+ return 7;
+ }
+ )cc";
+ std::string Expected = R"cc(
+ int f() {
+ int x = 5;
+ int y = 3;
+ return 7;
+ }
+ )cc";
+
+ StringRef Decl = "decl";
+ testRule(makeRule(declStmt().bind(Decl),
+ insertAfter(statement(Decl), text("int y = 3;"))),
+ Input, Expected);
+}
+
+TEST_F(TransformerTest, RemoveEdit) {
+ std::string Input = R"cc(
+ int f() {
+ int x = 5;
+ return 7;
+ }
+ )cc";
+ std::string Expected = R"cc(
+ int f() {
+ return 7;
+ }
+ )cc";
+
+ StringRef Decl = "decl";
+ testRule(makeRule(declStmt().bind(Decl), remove(statement(Decl))), Input,
+ Expected);
+}
+
TEST_F(TransformerTest, MultiChange) {
std::string Input = R"cc(
void foo() {
Index: clang/include/clang/Tooling/Refactoring/Transformer.h
===================================================================
--- clang/include/clang/Tooling/Refactoring/Transformer.h
+++ clang/include/clang/Tooling/Refactoring/Transformer.h
@@ -193,6 +193,18 @@
return change(node(RewriteRule::RootID), std::move(Replacement));
}
+inline ASTEdit insertBefore(RangeSelector S, TextGenerator Replacement) {
+ return change(before(std::move(S)), std::move(Replacement));
+}
+
+inline ASTEdit insertAfter(RangeSelector S, TextGenerator Replacement) {
+ return change(after(std::move(S)), std::move(Replacement));
+}
+
+inline ASTEdit remove(RangeSelector S) {
+ return change(std::move(S), text(""));
+}
+
/// The following three functions are a low-level part of the RewriteRule
/// API. We expose them for use in implementing the fixtures that interpret
/// RewriteRule, like Transformer and TransfomerTidy, or for more advanced
Index: clang/unittests/Tooling/TransformerTest.cpp
===================================================================
--- clang/unittests/Tooling/TransformerTest.cpp
+++ clang/unittests/Tooling/TransformerTest.cpp
@@ -349,6 +349,64 @@
Input, Expected);
}
+TEST_F(TransformerTest, InsertBeforeEdit) {
+ std::string Input = R"cc(
+ int f() {
+ return 7;
+ }
+ )cc";
+ std::string Expected = R"cc(
+ int f() {
+ int y = 3;
+ return 7;
+ }
+ )cc";
+
+ StringRef Ret = "return";
+ testRule(makeRule(returnStmt().bind(Ret),
+ insertBefore(statement(Ret), text("int y = 3;"))),
+ Input, Expected);
+}
+
+TEST_F(TransformerTest, InsertAfterEdit) {
+ std::string Input = R"cc(
+ int f() {
+ int x = 5;
+ return 7;
+ }
+ )cc";
+ std::string Expected = R"cc(
+ int f() {
+ int x = 5;
+ int y = 3;
+ return 7;
+ }
+ )cc";
+
+ StringRef Decl = "decl";
+ testRule(makeRule(declStmt().bind(Decl),
+ insertAfter(statement(Decl), text("int y = 3;"))),
+ Input, Expected);
+}
+
+TEST_F(TransformerTest, RemoveEdit) {
+ std::string Input = R"cc(
+ int f() {
+ int x = 5;
+ return 7;
+ }
+ )cc";
+ std::string Expected = R"cc(
+ int f() {
+ return 7;
+ }
+ )cc";
+
+ StringRef Decl = "decl";
+ testRule(makeRule(declStmt().bind(Decl), remove(statement(Decl))), Input,
+ Expected);
+}
+
TEST_F(TransformerTest, MultiChange) {
std::string Input = R"cc(
void foo() {
Index: clang/include/clang/Tooling/Refactoring/Transformer.h
===================================================================
--- clang/include/clang/Tooling/Refactoring/Transformer.h
+++ clang/include/clang/Tooling/Refactoring/Transformer.h
@@ -193,6 +193,18 @@
return change(node(RewriteRule::RootID), std::move(Replacement));
}
+inline ASTEdit insertBefore(RangeSelector S, TextGenerator Replacement) {
+ return change(before(std::move(S)), std::move(Replacement));
+}
+
+inline ASTEdit insertAfter(RangeSelector S, TextGenerator Replacement) {
+ return change(after(std::move(S)), std::move(Replacement));
+}
+
+inline ASTEdit remove(RangeSelector S) {
+ return change(std::move(S), text(""));
+}
+
/// The following three functions are a low-level part of the RewriteRule
/// API. We expose them for use in implementing the fixtures that interpret
/// RewriteRule, like Transformer and TransfomerTidy, or for more advanced
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
