kbobyrev updated this revision to Diff 303980.
kbobyrev added a comment.
Move NewName constant to class field.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D91102/new/
https://reviews.llvm.org/D91102
Files:
clang-tools-extra/clangd/unittests/RenameTests.cpp
Index: clang-tools-extra/clangd/unittests/RenameTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/RenameTests.cpp
+++ clang-tools-extra/clangd/unittests/RenameTests.cpp
@@ -90,10 +90,38 @@
return Result;
}
-TEST(RenameTest, WithinFileRename) {
- // rename is runnning on all "^" points, and "[[]]" ranges point to the
- // identifier that is being renamed.
- llvm::StringRef Tests[] = {
+class WithinFileRenameTest : public ::testing::Test {
+public:
+ void check() {
+ for (llvm::StringRef T : Tests) {
+ SCOPED_TRACE(T);
+ Annotations Code(T);
+ auto TU = TestTU::withCode(Code.code());
+ TU.ExtraArgs.push_back("-fno-delayed-template-parsing");
+ auto AST = TU.build();
+ for (const auto &RenamePos : Code.points()) {
+ auto RenameResult =
+ rename({RenamePos, NewName, AST, testPath(TU.Filename)});
+ ASSERT_TRUE(bool(RenameResult)) << RenameResult.takeError();
+ ASSERT_EQ(1u, RenameResult->GlobalChanges.size());
+ EXPECT_EQ(
+ applyEdits(std::move(RenameResult->GlobalChanges)).front().second,
+ expectedResult(Code, NewName));
+ }
+ }
+ }
+
+protected:
+ // For each "^" test moves cursor to its location and applies renaming while
+ // checking that all identifiers enclosed in [[]] ranges are also renamed.
+ std::vector<llvm::StringRef> Tests;
+
+private:
+ llvm::StringRef NewName = "NewName";
+};
+
+TEST_F(WithinFileRenameTest, Generic) {
+ Tests = {
// Function.
R"cpp(
void [[foo^]]() {
@@ -119,28 +147,28 @@
}
)cpp",
- // Rename class, including constructor/destructor.
+ // Class, its constructor and destructor.
R"cpp(
class [[F^oo]] {
[[F^oo]]();
- ~[[Foo]]();
+ ~[[F^oo]]();
void foo(int x);
};
- [[Foo]]::[[Fo^o]]() {}
- void [[Foo]]::foo(int x) {}
+ [[F^oo]]::[[Fo^o]]() {}
+ void [[F^oo]]::foo(int x) {}
)cpp",
- // Rename template class, including constructor/destructor.
+ // Template class, its constructor and destructor.
R"cpp(
template <typename T>
class [[F^oo]] {
[[F^oo]]();
~[[F^oo]]();
- void f([[Foo]] x);
+ void f([[F^oo]] x);
};
)cpp",
- // Rename template class constructor.
+ // Template class constructor.
R"cpp(
class [[F^oo]] {
template<typename T>
@@ -166,7 +194,7 @@
// Forward class declaration without definition.
R"cpp(
class [[F^oo]];
- [[Foo]] *f();
+ [[F^oo]] *f();
)cpp",
// Class methods overrides.
@@ -199,9 +227,9 @@
class [[F^oo]]<T*> {};
void test() {
- [[Foo]]<int> x;
- [[Foo]]<bool> y;
- [[Foo]]<int*> z;
+ [[F^oo]]<int> x;
+ [[F^oo]]<bool> y;
+ [[F^oo]]<int*> z;
}
)cpp",
@@ -209,7 +237,7 @@
R"cpp(
template <typename T>
class [[Fo^o]] {};
- void func([[Foo]]<int>);
+ void func([[F^oo]]<int>);
)cpp",
// Template class instantiations.
@@ -242,7 +270,7 @@
[[F^oo]]<bool> b;
b.member = false;
- [[Foo]]<bool>::foo(false);
+ [[F^oo]]<bool>::foo(false);
}
)cpp",
@@ -271,9 +299,9 @@
class [[F^oo]] : public Baz {
public:
- [[Foo]](int value = 0) : x(value) {}
+ [[F^oo]](int value = 0) : x(value) {}
- [[Foo]] &operator++(int);
+ [[F^oo]] &operator++(int);
bool operator<([[Foo]] const &rhs);
int getValue() const;
@@ -282,12 +310,12 @@
};
void func() {
- [[Foo]] *Pointer = 0;
- [[Foo]] Variable = [[Foo]](10);
- for ([[Foo]] it; it < Variable; it++);
- const [[Foo]] *C = new [[Foo]]();
- const_cast<[[Foo]] *>(C)->getValue();
- [[Foo]] foo;
+ [[F^oo]] *Pointer = 0;
+ [[F^oo]] Variable = [[Foo]](10);
+ for ([[F^oo]] it; it < Variable; it++);
+ const [[F^oo]] *C = new [[Foo]]();
+ const_cast<[[F^oo]] *>(C)->getValue();
+ [[F^oo]] foo;
const Baz &BazReference = foo;
const Baz *BazPointer = &foo;
reinterpret_cast<const [[^Foo]] *>(BazPointer)->getValue();
@@ -360,11 +388,11 @@
void boo(int);
void qoo() {
- [[foo]]();
- boo([[foo]]());
+ [[f^oo]]();
+ boo([[f^oo]]());
M1();
boo(M1());
- M2([[foo]]());
+ M2([[f^oo]]());
M2(M1()); // foo is inside the nested macro body.
}
)cpp",
@@ -380,9 +408,9 @@
int main() {
Baz baz;
- baz.[[Foo]] = 1;
- MACRO(baz.[[Foo]]);
- int y = baz.[[Foo]];
+ baz.[[F^oo]] = 1;
+ MACRO(baz.[[F^oo]]);
+ int y = baz.[[F^oo]];
}
)cpp",
@@ -390,15 +418,15 @@
R"cpp(
template <typename [[^T]]>
class Foo {
- [[T]] foo([[T]] arg, [[T]]& ref, [[^T]]* ptr) {
+ [[T^]] foo([[T^]] arg, [[T^]]& ref, [[^T]]* ptr) {
[[T]] value;
int number = 42;
- value = ([[T]])number;
+ value = ([[T^]])number;
value = static_cast<[[^T]]>(number);
return value;
}
- static void foo([[T]] value) {}
- [[T]] member;
+ static void foo([[T^]] value) {}
+ [[T^]] member;
};
)cpp",
@@ -441,7 +469,7 @@
namespace a { namespace b { void foo(); } }
namespace [[^x]] = a::b;
void bar() {
- [[x]]::foo();
+ [[x^]]::foo();
}
)cpp",
@@ -450,16 +478,16 @@
enum class [[K^ind]] { ABC };
void ff() {
[[K^ind]] s;
- s = [[Kind]]::ABC;
+ s = [[K^ind]]::ABC;
}
)cpp",
- // template class in template argument list.
+ // Template class in template argument list.
R"cpp(
template<typename T>
class [[Fo^o]] {};
template <template<typename> class Z> struct Bar { };
- template <> struct Bar<[[Foo]]> {};
+ template <> struct Bar<[[F^oo]]> {};
)cpp",
// Designated initializer.
@@ -491,23 +519,40 @@
Bar bar { .Foo.[[^Field]] = 42 };
)cpp",
};
- for (llvm::StringRef T : Tests) {
- SCOPED_TRACE(T);
- Annotations Code(T);
- auto TU = TestTU::withCode(Code.code());
- TU.ExtraArgs.push_back("-fno-delayed-template-parsing");
- auto AST = TU.build();
- llvm::StringRef NewName = "abcde";
- for (const auto &RenamePos : Code.points()) {
- auto RenameResult =
- rename({RenamePos, NewName, AST, testPath(TU.Filename)});
- ASSERT_TRUE(bool(RenameResult)) << RenameResult.takeError();
- ASSERT_EQ(1u, RenameResult->GlobalChanges.size());
- EXPECT_EQ(
- applyEdits(std::move(RenameResult->GlobalChanges)).front().second,
- expectedResult(Code, NewName));
- }
- }
+ check();
+}
+
+TEST_F(WithinFileRenameTest, Member) {
+ Tests = {
+ R"cpp(
+ struct X {
+ int [[M^oo]];
+ void Baz() { [[M^oo]] = 1; }
+ };
+ )cpp",
+
+ R"cpp(
+ struct X {
+ void [[F^oo]]() {}
+ void Baz() { [[F^oo]](); }
+ };
+ )cpp",
+
+ R"cpp(
+ struct A {};
+ struct B {};
+ class X {
+ public:
+ X();
+ A [[a^]];
+ A a2;
+ B b;
+ };
+
+ X::X() : [[a^]](), b() {}
+ )cpp",
+ };
+ check();
}
TEST(RenameTest, Renameable) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
