swift-api-digester: detected getter/setter function to property updates should be explicit about the new property names instead of inferring them from old function name.

Author: nkcsgexi

include/swift/IDE/DigesterEnums.def

@@ -56,6 +56,7 @@ NODE_ANNOTATION(GenericParamDownCast)
 NODE_ANNOTATION(TypeAliasChangeFromInt)
 NODE_ANNOTATION(GetterToProperty)
 NODE_ANNOTATION(SetterToProperty)
+NODE_ANNOTATION(PropertyName)
 NODE_ANNOTATION(TypeRewritten)
 NODE_ANNOTATION(TypeRewrittenLeft)
 NODE_ANNOTATION(TypeRewrittenRight)

test/api-digester/Inputs/APINotesLeft/APINotesTest.h

@@ -8,4 +8,5 @@ extern int ANTGlobalValue;
 @protocol TypeWithMethod
   -(void) minusPrint;
   +(void) plusPrint;
+  -(int) getPropertyA;
 @end

test/api-digester/Inputs/APINotesRight/APINotesTest.h

@@ -8,4 +8,5 @@ extern int ANTGlobalValue;
 @protocol TypeWithMethod
   -(void) minusPrint;
   +(void) plusPrint;
+  @property int PropertyA;
 @end

test/api-digester/Outputs/apinotes-migrator-gen.json

@@ -1,4 +1,26 @@
 [
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Function",
+    "NodeAnnotation": "GetterToProperty",
+    "ChildIndex": "0",
+    "LeftUsr": "c:objc(pl)TypeWithMethod(im)getPropertyA",
+    "LeftComment": "",
+    "RightUsr": "",
+    "RightComment": "propertyA",
+    "ModuleName": "APINotesTest"
+  },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "TypeDecl",
+    "NodeAnnotation": "Rename",
+    "ChildIndex": "0",
+    "LeftUsr": "c:objc(pl)TypeWithMethod",
+    "LeftComment": "SwiftTypeWithMethodLeft",
+    "RightUsr": "",
+    "RightComment": "SwiftTypeWithMethodRight",
+    "ModuleName": "APINotesTest"
+  },
   {
     "DiffItemKind": "TypeMemberDiffItem",
     "Usr": "c:@ANTGlobalValue",

tools/swift-api-digester/swift-api-digester.cpp

@@ -1637,6 +1637,8 @@ class RemovedAddedNodeMatcher : public NodeMatcher, public MatchedNodeListener {
         } else {
           return false;
         }
+        R->annotate(NodeAnnotation::PropertyName);
+        R->addAnnotateComment(NodeAnnotation::PropertyName, A->getPrintedName());
         foundMatch(R, A);
         return true;
       }
@@ -1867,7 +1869,8 @@ class SameNameNodeMatcher : public NodeMatcher {
       return FuncPriority;
     } else {
       static NameMatchKind OtherPriority[] = { NameMatchKind::PrintedNameAndUSR,
-                                               NameMatchKind::PrintedName };
+                                               NameMatchKind::PrintedName,
+                                               NameMatchKind::USR };
       return OtherPriority;
     }
   }
@@ -2455,6 +2458,9 @@ class DiffItemEmitter : public SDKNodeVisitor {
         return Node->getAnnotateComment(NodeAnnotation::ModernizeEnum);
       case NodeAnnotation::Rename:
         return Node->getAnnotateComment(NodeAnnotation::RenameNewName);
+      case NodeAnnotation::GetterToProperty:
+      case NodeAnnotation::SetterToProperty:
+        return Node->getAnnotateComment(NodeAnnotation::PropertyName);
       default:
         return StringRef();
     }