diff options
author | Alex Lorenz <arphaman@gmail.com> | 2017-11-01 01:12:56 +0000 |
---|---|---|
committer | Alex Lorenz <arphaman@gmail.com> | 2017-11-01 01:12:56 +0000 |
commit | 8ac52b01ceb1331c1642ac52b93229d038bf8df1 (patch) | |
tree | 49865d4707f113386248e5a7bb11c7562866994f /lib/Tooling/Refactoring | |
parent | 06b063e3bbf2ce05d25770a4c77cf1b748ce198c (diff) | |
download | clang-8ac52b01ceb1331c1642ac52b93229d038bf8df1.tar.gz |
[refactor][extract] code extracted from inline method should be placed
in a function defined before the outer class
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@317062 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Tooling/Refactoring')
-rw-r--r-- | lib/Tooling/Refactoring/Extract.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Tooling/Refactoring/Extract.cpp b/lib/Tooling/Refactoring/Extract.cpp index e81bb3ffe9..3f5a839318 100644 --- a/lib/Tooling/Refactoring/Extract.cpp +++ b/lib/Tooling/Refactoring/Extract.cpp @@ -15,6 +15,7 @@ #include "clang/Tooling/Refactoring/Extract/Extract.h" #include "clang/AST/ASTContext.h" +#include "clang/AST/DeclCXX.h" #include "clang/AST/Expr.h" #include "clang/AST/ExprObjC.h" #include "clang/Rewrite/Core/Rewriter.h" @@ -44,8 +45,12 @@ bool isSimpleExpression(const Expr *E) { } SourceLocation computeFunctionExtractionLocation(const Decl *D) { - // FIXME (Alex L): Method -> function extraction should place function before - // C++ record if the method is defined inside the record. + if (isa<CXXMethodDecl>(D)) { + // Code from method that is defined in class body should be extracted to a + // function defined just before the class. + while (const auto *RD = dyn_cast<CXXRecordDecl>(D->getLexicalDeclContext())) + D = RD; + } return D->getLocStart(); } |