[refactor][selection] canonicalize member expr callee to the full

member call expression

We would like to extract the full call when just the callee is selected.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@318205 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 12 insertions, 1 deletions

diff --git a/lib/Tooling/Refactoring/ASTSelection.cpp b/lib/Tooling/Refactoring/ASTSelection.cpp
index 4f1168becf..ae8a3cb7c5 100644
--- a/lib/Tooling/Refactoring/ASTSelection.cpp
+++ b/lib/Tooling/Refactoring/ASTSelection.cpp
@@ -115,6 +115,11 @@ public:
       return true;
     if (auto *Opaque = dyn_cast<OpaqueValueExpr>(S))
       return TraverseOpaqueValueExpr(Opaque);
+    // Avoid selecting implicit 'this' expressions.
+    if (auto *TE = dyn_cast<CXXThisExpr>(S)) {
+      if (TE->isImplicit())
+        return true;
+    }
     // FIXME (Alex Lorenz): Improve handling for macro locations.
     SourceSelectionKind SelectionKind =
         selectionKindFor(CharSourceRange::getTokenRange(S->getSourceRange()));
@@ -268,9 +273,15 @@ void SelectedNodeWithParents::canonicalize() {
   //      ~~~~~~             ~~~~~~~
   if (isa<StringLiteral>(S) && isa<ObjCStringLiteral>(Parent))
     Node = Parents.pop_back_val();
+  // The entire call should be selected when just the member expression
+  // that refers to the method is selected.
+  //    f.call(args)  becomes  f.call(args)
+  //      ~~~~                 ~~~~~~~~~~~~
+  else if (isa<MemberExpr>(S) && isa<CXXMemberCallExpr>(Parent) &&
+           cast<CXXMemberCallExpr>(Parent)->getCallee() == S)
+    Node = Parents.pop_back_val();
   // FIXME: Syntactic form -> Entire pseudo-object expr.
   // FIXME: Callee -> Call.
-  // FIXME: Callee member expr -> Call.
 }
 
 /// Finds the set of bottom-most selected AST nodes that are in the selection