Merge pull request #16011 from nkcsgexi/att-assign-migration

Author: swift-ci

lib/Migrator/APIDiffMigratorPass.cpp

@@ -686,16 +686,15 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
       return false;
     for (auto *Item: getRelatedDiffItems(RD)) {
       if (auto *CI = dyn_cast<CommonDiffItem>(Item)) {
-        switch(CI->DiffKind) {
-        case NodeAnnotation::SimpleStringRepresentableUpdate: {
-          Editor.insertBefore(ASE->getSrc()->getStartLoc(),
-            (Twine(CI->RightComment) + "(rawValue: ").str());
+        if (CI->isStringRepresentableChange() &&
+            CI->NodeKind == SDKNodeKind::DeclVar) {
+          SmallString<256> Buffer;
+          auto Func = insertHelperFunction(CI->DiffKind, CI->RightComment,
+                                           Buffer, true);
+          Editor.insert(ASE->getSrc()->getStartLoc(), (Twine(Func) + "(").str());
           Editor.insertAfterToken(ASE->getSrc()->getEndLoc(), ")");
           return true;
         }
-        default:
-          continue;
-        }
       }
     }
     return false;

test/Migrator/Inputs/Cities.swift

@@ -36,6 +36,8 @@ public func globalCityPointerTaker(_ c : UnsafePointer<Cities>, _ p : Int, _ q:
 
 public class Container {
   public var Value: String = ""
+  public var attrDict: [String: Any] = [:]
+  public var attrArr: [String] = []
   public func addingAttributes(_ input: [String: Any]) {}
   public func adding(attributes: [String: Any]) {}
   public func adding(optionalAttributes: [String: Any]?) {}

test/Migrator/Inputs/string-representable.json

@@ -164,4 +164,26 @@
     "RightComment": "SimpleAttribute",
     "ModuleName": "Cities"
   },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Var",
+    "NodeAnnotation": "DictionaryKeyUpdate",
+    "ChildIndex": "0",
+    "LeftUsr": "s:6Cities9ContainerC8attrDicts10DictionaryVySSypGvp",
+    "LeftComment": "",
+    "RightUsr": "",
+    "RightComment": "SimpleAttribute",
+    "ModuleName": "Cities"
+  },
+    {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Var",
+    "NodeAnnotation": "ArrayMemberUpdate",
+    "ChildIndex": "0",
+    "LeftUsr": "s:6Cities9ContainerC7attrArrSaySSGvp",
+    "LeftComment": "",
+    "RightUsr": "",
+    "RightComment": "SimpleAttribute",
+    "ModuleName": "Cities"
+  },
 ]

test/Migrator/string-representable.swift

@@ -27,5 +27,7 @@ func foo(_ c: Container) -> String {
   c.addingAttributes(c.getAttrDictionary())
   c.adding(optionalAttributes: c.getAttrDictionary())
 
+  c.attrDict = ["a": "b", "a": "b", "a": "b"]
+  c.attrArr = ["key1", "key2"]
   return c.Value
 }

test/Migrator/string-representable.swift.expected

@@ -7,7 +7,7 @@
 import Cities
 
 func foo(_ c: Container) -> String {
-  c.Value = NewAttribute(rawValue: "")
+  c.Value = convertToNewAttribute("")
   c.addingAttributes(convertToCitiesContainerAttributeDictionary(["a": "b", "a": "b", "a": "b"]))
   c.addingAttributes(convertToCitiesContainerAttributeDictionary(["a": "b", "a": "b", "a": "b"]))
   c.adding(attributes: convertToSimpleAttributeDictionary(["a": 1, "a": 2, "a": 3]))
@@ -27,9 +27,16 @@ func foo(_ c: Container) -> String {
   c.addingAttributes(convertToCitiesContainerAttributeDictionary(convertFromSimpleAttributeDictionary(c.getAttrDictionary())))
   c.adding(optionalAttributes: convertToOptionalSimpleAttributeDictionary(convertFromSimpleAttributeDictionary(c.getAttrDictionary())))
 
+  c.attrDict = convertToSimpleAttributeDictionary(["a": "b", "a": "b", "a": "b"])
+  c.attrArr = convertToSimpleAttributeArray(["key1", "key2"])
   return c.Value.rawValue
 }
 
+// Helper function inserted by Swift 4.2 migrator.
+fileprivate func convertToNewAttribute(_ input: String) -> NewAttribute {
+	return NewAttribute(rawValue: input)
+}
+
 // Helper function inserted by Swift 4.2 migrator.
 fileprivate func convertToCitiesContainerAttributeDictionary(_ input: [String: Any]) -> [Cities.Container.Attribute: Any] {
 	return Dictionary(uniqueKeysWithValues: input.map { key, value in (Cities.Container.Attribute(rawValue: key), value)})