migrator: support the migration from member variables to global ones. rdar://41658300

Author: nkcsgexi

include/swift/IDE/APIDigesterData.h

@@ -260,11 +260,10 @@ struct TypeMemberDiffItem: public APIDiffItem {
   Optional<uint8_t> removedIndex;
   StringRef oldTypeName;
   StringRef oldPrintedName;
-
 private:
   DeclNameViewer OldNameViewer;
   DeclNameViewer NewNameViewer;
-
+  std::string NewTypeDot;
 public:
   TypeMemberDiffItemSubKind Subkind;
 
@@ -276,7 +275,9 @@ struct TypeMemberDiffItem: public APIDiffItem {
     newTypeName(newTypeName), newPrintedName(newPrintedName),
     selfIndex(selfIndex), removedIndex(removedIndex), oldTypeName(oldTypeName),
     oldPrintedName(oldPrintedName), OldNameViewer(oldPrintedName),
-    NewNameViewer(newPrintedName), Subkind(getSubKind()) {}
+    NewNameViewer(newPrintedName),
+    NewTypeDot(newTypeName.empty() ? "" : (llvm::Twine(newTypeName) + ".").str()),
+    Subkind(getSubKind()) {}
   static StringRef head();
   static void describe(llvm::raw_ostream &os);
   static void undef(llvm::raw_ostream &os);
@@ -286,6 +287,7 @@ struct TypeMemberDiffItem: public APIDiffItem {
   StringRef getKey() const override { return usr; }
   const DeclNameViewer &getOldName() const { return OldNameViewer; }
   const DeclNameViewer &getNewName() const { return NewNameViewer; }
+  StringRef getNewTypeAndDot() const { return NewTypeDot; }
   APIDiffItemKind getKind() const override {
     return APIDiffItemKind::ADK_TypeMemberDiffItem;
   }

lib/Migrator/APIDiffMigratorPass.cpp

@@ -329,7 +329,7 @@ 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;
+          OS << MI->getNewTypeAndDot() << MI->newPrintedName;
           return DeclNameViewer(OS.str());
         }
       }
@@ -343,7 +343,7 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
       if (MD->Subkind == TypeMemberDiffItemSubKind::SimpleReplacement) {
         bool NeedNoTypeName = isDotMember &&
           MD->oldPrintedName == MD->newPrintedName;
-        Text = (llvm::Twine(NeedNoTypeName ? "" : MD->newTypeName) + "." +
+        Text = (llvm::Twine(NeedNoTypeName ? "." : MD->getNewTypeAndDot()) +
           MD->getNewName().base()).str();
         return true;
       }
@@ -541,7 +541,7 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
             bool NeedNoTypeName = isDotMember(ToReplace) &&
               Item->oldPrintedName == Item->newPrintedName;
             Editor.replace(ToReplace,
-              (llvm::Twine(NeedNoTypeName ? "" : Item->newTypeName) + "." +
+              (llvm::Twine(NeedNoTypeName ? "." : Item->getNewTypeAndDot()) +
                Item->getNewName().base()).str());
             return true;
           }
@@ -693,8 +693,8 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
       return false;
 
     if (Item->Subkind == TypeMemberDiffItemSubKind::GlobalFuncToStaticProperty) {
-      Editor.replace(Call->getSourceRange(), (llvm::Twine(Item->newTypeName) +
-        "." + Item->getNewName().base()).str());
+      Editor.replace(Call->getSourceRange(),
+        (llvm::Twine(Item->getNewTypeAndDot()) + Item->getNewName().base()).str());
       return true;
     }
     if (*Item->selfIndex)

test/Migrator/Inputs/Cities.swift

@@ -11,6 +11,7 @@ open class Cities {
   open func maroochy(x: Int?, y: Int?) {}
   public struct CityKind {
     public static let Town = 1
+    public static let Village = 1
   }
 }
 

test/Migrator/Inputs/qualified.json

@@ -31,6 +31,14 @@
     "NewPrintedName": "NewTown",
     "NewTypeName": "NewCityKind"
   },
+  {
+    "DiffItemKind": "TypeMemberDiffItem",
+    "Usr": "s:6CitiesAAC8CityKindV7VillageSivpZ",
+    "OldPrintedName": "Village",
+    "OldTypeName": "Cities.CityKind",
+    "NewPrintedName": "GlobalCityKindVillage",
+    "NewTypeName": ""
+  },
   {
     "DiffItemKind": "TypeMemberDiffItem",
     "Usr": "s:6Cities12ToplevelTypeC",

test/Migrator/qualified-replacement.swift

@@ -12,6 +12,7 @@ func foo() {
   _ = FooComparisonResult.orderedSame
   let _ : FooComparisonResult = .orderedSame
   _ = Cities.CityKind.Town
+  _ = Cities.CityKind.Village
   _ = ToplevelType()
   _ = ToplevelType(recordName: "")
   bar(.orderedSame)

test/Migrator/qualified-replacement.swift.expected

@@ -12,6 +12,7 @@ func foo() {
   _ = NewFooComparisonResult.NewFooOrderedSame
   let _ : FooComparisonResult = NewFooComparisonResult.NewFooOrderedSame
   _ = NewCityKind.NewTown
+  _ = GlobalCityKindVillage
   _ = ToplevelWrapper.internalType()
   _ = ToplevelWrapper.internalType(recordName: "")
   bar(NewFooComparisonResult.NewFooOrderedSame)