migrator: teach the tool to handle qualified replacement. rdar://32466196

Author: nkcsgexi

lib/IDE/APIDigesterData.cpp

@@ -119,7 +119,10 @@ swift::ide::api::TypeMemberDiffItem::getSubKind() const {
   DeclNameViewer NewName = getNewName();
   if (!OldName.isFunction()) {
     assert(!NewName.isFunction());
-    return TypeMemberDiffItemSubKind::SimpleReplacement;
+    if (oldTypeName.empty())
+      return TypeMemberDiffItemSubKind::SimpleReplacement;
+    else
+      return TypeMemberDiffItemSubKind::QualifiedReplacement;
   }
   assert(OldName.isFunction());
   bool ToProperty = !NewName.isFunction();
@@ -145,9 +148,12 @@ swift::ide::api::TypeMemberDiffItem::getSubKind() const {
     assert(OldName.argSize() == 0);
     assert(!removedIndex);
     return TypeMemberDiffItemSubKind::GlobalFuncToStaticProperty;
-  } else {
+  } else if (oldTypeName.empty()){
     assert(NewName.argSize() == OldName.argSize());
     return TypeMemberDiffItemSubKind::SimpleReplacement;
+  } else {
+    assert(NewName.argSize() == OldName.argSize());
+    return TypeMemberDiffItemSubKind::QualifiedReplacement;
   }
 }
 

lib/Migrator/APIDiffMigratorPass.cpp

@@ -366,6 +366,25 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
     }
   }
 
+  bool handleQualifiedReplacement(Expr* Call) {
+    if (auto *DSC = dyn_cast<DotSyntaxCallExpr>(Call)) {
+      if (auto FD = DSC->getFn()->getReferencedDecl().getDecl()) {
+        for (auto *I :getRelatedDiffItems(FD)) {
+          if (auto *Item = dyn_cast<TypeMemberDiffItem>(I)) {
+            if (Item->Subkind == TypeMemberDiffItemSubKind::
+                QualifiedReplacement) {
+              Editor.replace(Call->getSourceRange(),
+                (llvm::Twine(Item->newTypeName) + "." +
+                  Item->getNewName().base()).str());
+              return true;
+            }
+          }
+        }
+      }
+    }
+    return false;
+  }
+
   bool handleSpecialCases(ValueDecl *FD, CallExpr* Call, Expr *Arg) {
     SpecialCaseDiffItem *Item = nullptr;
     for (auto *I: getRelatedDiffItems(FD)) {
@@ -548,8 +567,9 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
   }
 
   bool walkToExprPre(Expr *E) override {
+    if (handleQualifiedReplacement(E))
+      return false;
     if (auto *CE = dyn_cast<CallExpr>(E)) {
-
       auto Fn = CE->getFn();
       auto Args = CE->getArg();
       switch (Fn->getKind()) {

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

@@ -24,6 +24,8 @@ enum BarForwardDeclaredEnum {
 @interface PropertyUserInterface
 - (int) field;
 - (void) setField:(int)info;
++ (int) fieldPlus;
++ (void) methodPlus:(int)info;
 @end
 
 #define BAR_MACRO_1 0
@@ -34,3 +36,12 @@ typedef struct {
 } SomeItemSet;
 
 typedef SomeItemSet SomeEnvironment;
+
+#define CF_ENUM(_type, _name) enum _name : _type _name; enum _name : _type
+#define NS_ENUM(_type, _name) CF_ENUM(_type, _name)
+
+typedef NS_ENUM(long, FooComparisonResult) {
+  FooOrderedAscending = -1L,
+  FooOrderedSame,
+  FooOrderedDescending
+};

test/Migrator/qualified-replacement.swift

@@ -0,0 +1,11 @@
+// REQUIRES: objc_interop
+// RUN: rm -rf %t && mkdir -p %t && %target-swift-frontend -c -update-code -primary-file %s -F %S/mock-sdk -api-diff-data-file %S/qualified.json -emit-migrated-file-path %t/qualified-replacement.swift.result -emit-remap-file-path %t/qualified-replacement.swift.remap -o /dev/null
+// RUN: diff -u %S/qualified-replacement.swift.expected %t/qualified-replacement.swift.result
+
+import Bar
+func foo() {
+  _ = PropertyUserInterface.fieldPlus
+  PropertyUserInterface.methodPlus(1)
+  _ = FooComparisonResult.orderedSame
+  let _ : FooComparisonResult = .orderedSame
+}

test/Migrator/qualified-replacement.swift.expected

@@ -0,0 +1,11 @@
+// REQUIRES: objc_interop
+// RUN: rm -rf %t && mkdir -p %t && %target-swift-frontend -c -update-code -primary-file %s -F %S/mock-sdk -api-diff-data-file %S/qualified.json -emit-migrated-file-path %t/qualified-replacement.swift.result -emit-remap-file-path %t/qualified-replacement.swift.remap -o /dev/null
+// RUN: diff -u %S/qualified-replacement.swift.expected %t/qualified-replacement.swift.result
+
+import Bar
+func foo() {
+  _ = NewPropertyUserInterface.newFieldPlus
+  NewPropertyUserInterface.newMethodPlus(1)
+  _ = NewFooComparisonResult.NewFooOrderedSame
+  let _ : FooComparisonResult = NewFooComparisonResult.NewFooOrderedSame
+}

test/Migrator/qualified.json

@@ -0,0 +1,26 @@
+[
+  {
+    "DiffItemKind": "TypeMemberDiffItem",
+    "Usr": "c:objc(cs)PropertyUserInterface(cm)fieldPlus",
+    "OldPrintedName": "fieldPlus",
+    "OldTypeName": "PropertyUserInterface",
+    "NewPrintedName": "newFieldPlus",
+    "NewTypeName": "NewPropertyUserInterface"
+  },
+  {
+    "DiffItemKind": "TypeMemberDiffItem",
+    "Usr": "c:objc(cs)PropertyUserInterface(cm)methodPlus:",
+    "OldPrintedName": "methodPlus(_:)",
+    "OldTypeName": "PropertyUserInterface",
+    "NewPrintedName": "newMethodPlus(_:)",
+    "NewTypeName": "NewPropertyUserInterface"
+  },
+  {
+    "DiffItemKind": "TypeMemberDiffItem",
+    "Usr": "c:@E@FooComparisonResult@FooOrderedSame",
+    "OldPrintedName": "FooOrderedSame",
+    "OldTypeName": "FooComparisonResult",
+    "NewPrintedName": "NewFooOrderedSame",
+    "NewTypeName": "NewFooComparisonResult"
+  }
+]