kbobyrev created this revision.
kbobyrev added a reviewer: hokein.
Herald added subscribers: cfe-commits, usaxena95, kadircet, arphaman.
Herald added a project: clang.
kbobyrev requested review of this revision.
Herald added subscribers: MaskRay, ilya-biryukov.
This adds a couple of missed tests from existing clang-rename ones and
introduces several new ones (e.g. static class member). This patch is required
to ensure feature parity for migration off Clang-Rename API D71880
<https://reviews.llvm.org/D71880>.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D91337
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
@@ -141,6 +141,12 @@
~[[F^oo]]();
void f([[F^oo]] x);
};
+
+ template<typename T>
+ [[F^oo]]<T>::[[Fo^o]]() {}
+
+ template<typename T>
+ [[F^oo]]<T>::~[[Fo^o]]() {}
)cpp",
// Template class constructor.
@@ -152,6 +158,9 @@
template<typename T>
[[F^oo]](T t);
};
+
+ template<typename T>
+ [[F^oo]]::[[Fo^o]]() {}
)cpp",
// Class in template argument.
@@ -191,11 +200,15 @@
struct C : B {
void [[f^oo]]() override {}
};
+ struct D : B {
+ void [[f^oo]]() override {}
+ };
void func() {
A().[[f^oo]]();
B().[[f^oo]]();
C().[[f^oo]]();
+ D().[[f^oo]]();
}
)cpp",
@@ -307,6 +320,19 @@
}
)cpp",
+ // Static class member.
+ R"cpp(
+ struct Foo {
+ static Foo *[[Static^Member]];
+ };
+
+ Foo* Foo::[[Static^Member]] = nullptr;
+
+ void foo() {
+ Foo* Pointer = Foo::[[Static^Member]];
+ }
+ )cpp",
+
// Reference in lambda parameters.
R"cpp(
template <class T>
@@ -588,6 +614,123 @@
ns::[[Old^Alias]] Bar;
}
)cpp",
+
+ // Templated method instantiation.
+ R"cpp(
+ template<typename T>
+ class Foo {
+ public:
+ static T [[f^oo]]() {}
+ };
+
+ void bar() {
+ Foo<int>::[[f^oo]]();
+ }
+ )cpp",
+ R"cpp(
+ template<typename T>
+ class Foo {
+ public:
+ T [[f^oo]]() {}
+ };
+
+ void bar() {
+ Foo<int>().[[f^oo]]();
+ }
+ )cpp",
+
+ // Templated class specialization.
+ R"cpp(
+ template<typename T, typename U=bool>
+ class [[Foo^]];
+
+ template<typename T, typename U>
+ class [[Foo^]] {};
+
+ template<typename T=int, typename U>
+ class [[Foo^]];
+ )cpp",
+ R"cpp(
+ template<typename T=float, typename U=int>
+ class [[Foo^]];
+
+ template<typename T, typename U>
+ class [[Foo^]] {};
+ )cpp",
+
+ // Function template specialization.
+ R"cpp(
+ template<typename T=int, typename U=bool>
+ U [[foo^]]();
+
+ template<typename T, typename U>
+ U [[foo^]]() {};
+ )cpp",
+ R"cpp(
+ template<typename T, typename U>
+ U [[foo^]]() {};
+
+ template<typename T=int, typename U=bool>
+ U [[foo^]]();
+ )cpp",
+ R"cpp(
+ template<typename T=int, typename U=bool>
+ U [[foo^]]();
+
+ template<typename T, typename U>
+ U [[foo^]]();
+ )cpp",
+
+ R"cpp(
+ template <typename T, int U>
+ bool [[F^oo]] = true;
+
+ // Explicit template specialization
+ template <>
+ bool [[F^oo]]<int, 0> = false;
+
+ // Partial template specialization
+ template <typename T>
+ bool [[F^oo]]<T, 1> = false;
+
+ void foo() {
+ // Ref to the explicit template specialization
+ [[F^oo]]<int, 0>;
+ // Ref to the primary template.
+ [[F^oo]]<double, 2>;
+ }
+ )cpp",
+ R"cpp(
+ template <typename T>
+ void [[f^oo]](T t);
+
+ template <>
+ void [[f^oo]](int a);
+
+ void test() {
+ [[f^oo]]<double>(1);
+ }
+ )cpp",
+
+ // User defined conversion.
+ R"cpp(
+ class [[F^oo]] {
+ public:
+ [[F^oo]]() {}
+ };
+
+ class Baz {
+ public:
+ operator [[F^oo]]() {
+ return [[F^oo]]();
+ }
+ };
+
+ int main() {
+ Baz boo;
+ [[F^oo]] foo = static_cast<[[F^oo]]>(boo);
+ }
+ )cpp",
};
llvm::StringRef NewName = "NewName";
for (llvm::StringRef T : Tests) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
