From 61f2c3f58c56b235dd0f04a72a7c05adeeb837d2 Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Wed, 1 Nov 2017 01:12:56 +0000 Subject: [refactor][extract] code extracted from inline method should be placed in a function defined before the outer class llvm-svn: 317062 --- clang/lib/Tooling/Refactoring/Extract.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'clang/lib/Tooling/Refactoring/Extract.cpp') diff --git a/clang/lib/Tooling/Refactoring/Extract.cpp b/clang/lib/Tooling/Refactoring/Extract.cpp index e81bb3ffe9b..3f5a839318b 100644 --- a/clang/lib/Tooling/Refactoring/Extract.cpp +++ b/clang/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(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(D->getLexicalDeclContext())) + D = RD; + } return D->getLocStart(); } -- cgit v1.2.3