diff options
Diffstat (limited to 'clang-tools-extra')
4 files changed, 13 insertions, 10 deletions
diff --git a/clang-tools-extra/clang-rename/USRFinder.cpp b/clang-tools-extra/clang-rename/USRFinder.cpp index 7f26945c329..2589be18df0 100644 --- a/clang-tools-extra/clang-rename/USRFinder.cpp +++ b/clang-tools-extra/clang-rename/USRFinder.cpp @@ -77,6 +77,10 @@ public: const auto TypeBeginLoc = Loc.getBeginLoc(); const auto TypeEndLoc = Lexer::getLocForEndOfToken( TypeBeginLoc, 0, Context.getSourceManager(), Context.getLangOpts()); + if (const auto *TemplateTypeParm = + dyn_cast<TemplateTypeParmType>(Loc.getType())) { + return setResult(TemplateTypeParm->getDecl(), TypeBeginLoc, TypeEndLoc); + } return setResult(Loc.getType()->getAsCXXRecordDecl(), TypeBeginLoc, TypeEndLoc); } diff --git a/clang-tools-extra/clang-rename/USRLocFinder.cpp b/clang-tools-extra/clang-rename/USRLocFinder.cpp index 394569a4a7d..d3c64baf742 100644 --- a/clang-tools-extra/clang-rename/USRLocFinder.cpp +++ b/clang-tools-extra/clang-rename/USRLocFinder.cpp @@ -104,6 +104,13 @@ public: USRSet.end()) { checkAndAddLocation(Loc.getBeginLoc()); } + if (const auto *TemplateTypeParm = + dyn_cast<TemplateTypeParmType>(Loc.getType())) { + if (USRSet.find(getUSRForDecl(TemplateTypeParm->getDecl())) != + USRSet.end()) { + checkAndAddLocation(Loc.getBeginLoc()); + } + } return true; } diff --git a/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTemplateParam.cpp b/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTemplateParam.cpp index 77b6b3e9f0f..8fdea18babb 100644 --- a/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTemplateParam.cpp +++ b/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTemplateParam.cpp @@ -1,11 +1,7 @@ // RUN: cat %s > %t.cpp -// RUN: clang-rename -offset=270 -new-name=U %t.cpp -i -- +// RUN: clang-rename -offset=147 -new-name=U %t.cpp -i -- // RUN: sed 's,//.*,,' %t.cpp | FileCheck %s -// Currently unsupported test. -// FIXME: clang-rename should be able to rename template parameters correctly. -// XFAIL: * - template <typename T> // CHECK: template <typename U> class Foo { T foo(T arg, T& ref, T* ptr) { // CHECK: U foo(U arg, U& ref, U* ptr) { diff --git a/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTypeInside.cpp b/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTypeInside.cpp index a7d822b99a5..ddab05f654e 100644 --- a/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTypeInside.cpp +++ b/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTypeInside.cpp @@ -1,11 +1,7 @@ // RUN: cat %s > %t.cpp -// RUN: clang-rename -offset=350 -new-name=U %t.cpp -i -- +// RUN: clang-rename -offset=227 -new-name=U %t.cpp -i -- // RUN: sed 's,//.*,,' %t.cpp | FileCheck %s -// Currently unsupported test. -// FIXME: clang-rename should be able to rename template parameters correctly. -// XFAIL: * - template <typename T> // CHECK: template <typename U> class Foo { T foo(T arg, T& ref, T* ptr) { // CHECK: U foo(U arg, U& ref, U* ptr) { |
