[Migrator] Handle getter/setter to property access migration. rdar://31766311 (#9083)

Author: nkcsgexi

lib/Migrator/SyntacticMigratorPass.cpp

@@ -152,6 +152,38 @@ struct SyntacticMigratorPass::Implementation : public SourceEntityWalker {
     }
   }
 
+  void handleFunctionCallToPropertyChange(ValueDecl *FD, Expr* FuncRefContainer,
+                                          Expr *Arg) {
+    for(auto *Item :getRelatedDiffItems(FD)) {
+      if (auto *CD = dyn_cast<CommonDiffItem>(Item)) {
+        switch (CD->DiffKind) {
+        case NodeAnnotation::GetterToProperty: {
+          // Remove "()"
+          Editor.remove(Lexer::getCharSourceRangeFromSourceRange(SM,
+                                                        Arg->getSourceRange()));
+          return;
+        }
+        case NodeAnnotation::SetterToProperty: {
+          ReferenceCollector Walker(FD);
+          Walker.walk(FuncRefContainer);
+          auto ReplaceRange = CharSourceRange(SM, Walker.Result.getStart(),
+                                          Arg->getStartLoc().getAdvancedLoc(1));
+
+          // Replace "x.getY(" with "x.Y =".
+          Editor.replace(ReplaceRange, (llvm::Twine(Walker.Result.str().
+                                                   substr(3)) + " = ").str());
+          // Remove ")"
+          Editor.remove(CharSourceRange(SM, Arg->getEndLoc(), Arg->getEndLoc().
+                                        getAdvancedLoc(1)));
+          return;
+        }
+        default:
+          break;
+        }
+      }
+    }
+  }
+
   bool walkToExprPre(Expr *E) override {
     if (auto *CE = dyn_cast<CallExpr>(E)) {
       auto Fn = CE->getFn();
@@ -164,8 +196,10 @@ struct SyntacticMigratorPass::Implementation : public SourceEntityWalker {
       }
       case ExprKind::DotSyntaxCall: {
         auto DSC = cast<DotSyntaxCallExpr>(Fn);
-        if (auto FD = DSC->getFn()->getReferencedDecl().getDecl())
+        if (auto FD = DSC->getFn()->getReferencedDecl().getDecl()) {
           handleFuncRename(FD, DSC->getFn(), Args);
+          handleFunctionCallToPropertyChange(FD, DSC->getFn(), Args);
+        }
         break;
       }
       case ExprKind::ConstructorRefCall: {

test/Migrator/API.json

@@ -60,5 +60,27 @@
     "RightUsr": "",
     "RightComment": "NewEnum.enumElement",
     "ModuleName": "bar"
+  },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Function",
+    "NodeAnnotation": "GetterToProperty",
+    "ChildIndex": "0",
+    "LeftUsr": "c:objc(cs)PropertyUserInterface(im)field",
+    "LeftComment": "",
+    "RightUsr": "",
+    "RightComment": "",
+    "ModuleName": "bar"
+  },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Function",
+    "NodeAnnotation": "SetterToProperty",
+    "ChildIndex": "0",
+    "LeftUsr": "c:objc(cs)PropertyUserInterface(im)setField:",
+    "LeftComment": "",
+    "RightUsr": "",
+    "RightComment": "",
+    "ModuleName": "bar"
   }
 ]

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

@@ -20,6 +20,11 @@ enum BarForwardDeclaredEnum {
   BarForwardDeclaredEnumValue = 42
 };
 
+@interface PropertyUserInterface
+- (int) field;
+- (void) setField:(int)info;
+@end
+
 #define BAR_MACRO_1 0
 
 typedef struct {

test/Migrator/property.swift

@@ -0,0 +1,10 @@
+// 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/API.json -emit-migrated-file-path %t/property.swift.result -disable-migrator-fixits
+// RUN: diff -u %S/property.swift.expected %t/property.swift.result
+
+import Bar
+
+func foo(_ a : PropertyUserInterface) {
+  a.setField(1)
+  _ = a.field()
+}

test/Migrator/property.swift.expected

@@ -0,0 +1,10 @@
+// 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/API.json -emit-migrated-file-path %t/property.swift.result -disable-migrator-fixits
+// RUN: diff -u %S/property.swift.expected %t/property.swift.result
+
+import Bar
+
+func foo(_ a : PropertyUserInterface) {
+  a.Field = 1
+  _ = a.field
+}