Merge pull request #16463 from benlangmuir/mig-type-rename-42

[4.2] [migrator] Handle simple renames for TypeDecl

Author: benlangmuir

lib/Migrator/APIDiffMigratorPass.cpp

@@ -295,7 +295,8 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
 
     // Simple rename.
     if (auto CI = dyn_cast<CommonDiffItem>(Item)) {
-      if (CI->NodeKind == SDKNodeKind::DeclVar && CI->isRename()) {
+      if (CI->isRename() && (CI->NodeKind == SDKNodeKind::DeclVar ||
+                             CI->NodeKind == SDKNodeKind::DeclType)) {
         Text = CI->getNewName();
         return true;
       }

test/Migrator/Inputs/API.json

@@ -498,5 +498,16 @@
     "NewTypeName": "example",
     "SelfIndex": 0,
     "RemovedIndex": 1
+  },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "TypeDecl",
+    "NodeAnnotation": "Rename",
+    "ChildIndex": "0",
+    "LeftUsr": "c:objc(cs)BarBaseNested",
+    "LeftComment": "BarBaseNested",
+    "RightUsr": "",
+    "RightComment": "BarBase.Nested",
+    "ModuleName": "bar"
   }
 ]

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

@@ -53,3 +53,8 @@ typedef NS_ENUM(long, FooComparisonResult) {
   FooOrderedSame,
   FooOrderedDescending
 };
+
+@interface BarBase
+@end
+@interface BarBaseNested
+@end

test/Migrator/rename.swift

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

test/Migrator/rename.swift.expected

@@ -17,6 +17,7 @@ func foo(_ b: BarForwardDeclaredClass) {
   barGlobalFuncNewName(newlabel: 2)
   _ = NewEnum.enumElement
   _ = PropertyUserInterface.newMethodPlus()
+  let _: BarBase.Nested
 }
 
 func foo1(_ b: BarForwardDeclaredClass) {