migrator: handle argument renames when a global function is hoisted to a static member function. rdar://40145590

Author: nkcsgexi

include/swift/IDE/APIDigesterData.h

@@ -247,6 +247,7 @@ enum class TypeMemberDiffItemSubKind {
   HoistSelfOnly,
   HoistSelfAndRemoveParam,
   HoistSelfAndUseProperty,
+  FuncRename,
 };
 
 struct TypeMemberDiffItem: public APIDiffItem {

lib/IDE/APIDigesterData.cpp

@@ -148,9 +148,10 @@ swift::ide::api::TypeMemberDiffItem::getSubKind() const {
     assert(OldName.argSize() == 0);
     assert(!removedIndex);
     return TypeMemberDiffItemSubKind::GlobalFuncToStaticProperty;
-  } else if (oldTypeName.empty()){
+  } else if (oldTypeName.empty()) {
+    // we can handle this as a simple function rename.
     assert(NewName.argSize() == OldName.argSize());
-    return TypeMemberDiffItemSubKind::SimpleReplacement;
+    return TypeMemberDiffItemSubKind::FuncRename;
   } else {
     assert(NewName.argSize() == OldName.argSize());
     return TypeMemberDiffItemSubKind::QualifiedReplacement;

lib/Migrator/APIDiffMigratorPass.cpp

@@ -266,7 +266,8 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
     return results;
   }
 
-  DeclNameViewer getFuncRename(ValueDecl *VD, bool &IgnoreBase) {
+  DeclNameViewer getFuncRename(ValueDecl *VD, llvm::SmallString<32> &Buffer,
+                               bool &IgnoreBase) {
     for (auto *Item: getRelatedDiffItems(VD)) {
       if (auto *CI = dyn_cast<CommonDiffItem>(Item)) {
         if (CI->isRename()) {
@@ -282,6 +283,13 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
           }
         }
       }
+      if (auto *MI = dyn_cast<TypeMemberDiffItem>(Item)) {
+        if (MI->Subkind == TypeMemberDiffItemSubKind::FuncRename) {
+          llvm::raw_svector_ostream OS(Buffer);
+          OS << MI->newTypeName << "." << MI->newPrintedName;
+          return DeclNameViewer(OS.str());
+        }
+      }
     }
     return DeclNameViewer();
   }
@@ -413,7 +421,8 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
 
   void handleFuncRename(ValueDecl *FD, Expr* FuncRefContainer, Expr *Arg) {
     bool IgnoreBase = false;
-    if (auto View = getFuncRename(FD, IgnoreBase)) {
+    llvm::SmallString<32> Buffer;
+    if (auto View = getFuncRename(FD, Buffer, IgnoreBase)) {
       if (!IgnoreBase) {
         ReferenceCollector Walker(FD);
         Walker.walk(FuncRefContainer);
@@ -575,7 +584,8 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
     if (!Item)
       return false;
     if (Item->Subkind == TypeMemberDiffItemSubKind::SimpleReplacement ||
-        Item->Subkind == TypeMemberDiffItemSubKind::QualifiedReplacement)
+        Item->Subkind == TypeMemberDiffItemSubKind::QualifiedReplacement ||
+        Item->Subkind == TypeMemberDiffItemSubKind::FuncRename)
       return false;
 
     if (Item->Subkind == TypeMemberDiffItemSubKind::GlobalFuncToStaticProperty) {
@@ -624,6 +634,7 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
     }
 
     switch (Item->Subkind) {
+    case TypeMemberDiffItemSubKind::FuncRename:
     case TypeMemberDiffItemSubKind::GlobalFuncToStaticProperty:
     case TypeMemberDiffItemSubKind::SimpleReplacement:
     case TypeMemberDiffItemSubKind::QualifiedReplacement:
@@ -904,7 +915,8 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
   void handleFuncDeclRename(AbstractFunctionDecl *AFD,
                             CharSourceRange NameRange) {
     bool IgnoreBase = false;
-    if (auto View = getFuncRename(AFD, IgnoreBase)) {
+    llvm::SmallString<32> Buffer;
+    if (auto View = getFuncRename(AFD, Buffer, IgnoreBase)) {
       if (!IgnoreBase)
         Editor.replace(NameRange, View.base());
       unsigned Index = 0;

test/Migrator/Inputs/API.json

@@ -509,5 +509,13 @@
     "RightUsr": "",
     "RightComment": "BarBase.Nested",
     "ModuleName": "bar"
-  }
+  },
+  {
+    "DiffItemKind": "TypeMemberDiffItem",
+    "Usr": "c:@F@barGlobalHoistedFuncOldName",
+    "OldPrintedName": "barGlobalHoistedFuncOldName(_:_:_:)",
+    "OldTypeName": "",
+    "NewPrintedName": "newName(is:at:for:)",
+    "NewTypeName": "AwesomeWrapper"
+  },
 ]

test/Migrator/mock-sdk/Bar.framework/Headers/Bar.h

@@ -10,6 +10,8 @@ int barGlobalVariableOldEnumElement = 1;
 
 int barGlobalFuncOldName(int a);
 
+int barGlobalHoistedFuncOldName(int a, int b, int c);
+
 @interface BarForwardDeclaredClass
 - (id _Nonnull)initWithOldLabel0:(int)frame;
 - (void) barInstanceFunc0;

test/Migrator/rename.swift

@@ -18,6 +18,7 @@ func foo(_ b: BarForwardDeclaredClass) {
   _ = barGlobalVariableOldEnumElement
   _ = PropertyUserInterface.methodPlus()
   let _: BarBaseNested
+  _ = barGlobalHoistedFuncOldName(0, 1, 2)
 }
 
 func foo1(_ b: BarForwardDeclaredClass) {

test/Migrator/rename.swift.expected

@@ -18,6 +18,7 @@ func foo(_ b: BarForwardDeclaredClass) {
   _ = NewEnum.enumElement
   _ = PropertyUserInterface.newMethodPlus()
   let _: BarBase.Nested
+  _ = AwesomeWrapper.newName(is: 0, at: 1, for: 2)
 }
 
 func foo1(_ b: BarForwardDeclaredClass) {