Merge pull request #16821 from nkcsgexi/api-diff-enh-revert

Author: swift-ci

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

@@ -5,9 +5,9 @@
     "NodeAnnotation": "RevertSimpleStringRepresentableUpdate",
     "ChildIndex": "1",
     "LeftUsr": "c:objc(cs)AnimalStatusDescriptor(cm)animalStatusSingleAttribute:",
-    "LeftComment": "",
+    "LeftComment": "AnimalAttributeName",
     "RightUsr": "",
-    "RightComment": "",
+    "RightComment": "String",
     "ModuleName": "APINotesTest"
   },
   {
@@ -27,9 +27,9 @@
     "NodeAnnotation": "RevertSimpleOptionalStringRepresentableUpdate",
     "ChildIndex": "1",
     "LeftUsr": "c:objc(cs)AnimalStatusDescriptor(cm)animalStatusSingleOptionalAttribute:",
-    "LeftComment": "",
+    "LeftComment": "AnimalAttributeName",
     "RightUsr": "",
-    "RightComment": "",
+    "RightComment": "String",
     "ModuleName": "APINotesTest"
   },
   {
@@ -49,9 +49,9 @@
     "NodeAnnotation": "RevertDictionaryKeyUpdate",
     "ChildIndex": "1",
     "LeftUsr": "c:objc(cs)AnimalStatusDescriptor(im)animalStatusDescriptorByAddingAttributes:",
-    "LeftComment": "",
+    "LeftComment": "AnimalAttributeName",
     "RightUsr": "",
-    "RightComment": "",
+    "RightComment": "String",
     "ModuleName": "APINotesTest"
   },
   {
@@ -71,9 +71,9 @@
     "NodeAnnotation": "RevertArrayMemberUpdate",
     "ChildIndex": "1",
     "LeftUsr": "c:objc(cs)AnimalStatusDescriptor(im)animalStatusDescriptorByAddingAttributesArray:",
-    "LeftComment": "",
+    "LeftComment": "AnimalAttributeName",
     "RightUsr": "",
-    "RightComment": "",
+    "RightComment": "String",
     "ModuleName": "APINotesTest"
   },
   {
@@ -93,9 +93,9 @@
     "NodeAnnotation": "RevertOptionalDictionaryKeyUpdate",
     "ChildIndex": "1",
     "LeftUsr": "c:objc(cs)AnimalStatusDescriptor(im)animalStatusDescriptorByAddingOptionalAttributes:",
-    "LeftComment": "",
+    "LeftComment": "AnimalAttributeName",
     "RightUsr": "",
-    "RightComment": "",
+    "RightComment": "String",
     "ModuleName": "APINotesTest"
   },
   {
@@ -115,9 +115,9 @@
     "NodeAnnotation": "RevertOptionalArrayMemberUpdate",
     "ChildIndex": "1",
     "LeftUsr": "c:objc(cs)AnimalStatusDescriptor(im)animalStatusDescriptorByAddingOptionalAttributesArray:",
-    "LeftComment": "",
+    "LeftComment": "AnimalAttributeName",
     "RightUsr": "",
-    "RightComment": "",
+    "RightComment": "String",
     "ModuleName": "APINotesTest"
   },
   {

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

@@ -2704,7 +2704,8 @@ class InterfaceTypeChangeDetector {
 
   bool detectTypeRewritten(SDKNodeType *Node, SDKNodeType *Counter) {
     if (IsVisitingLeft &&
-        (Node->getName() != Counter->getName()||
+        Node->getPrintedName() != Counter->getPrintedName() &&
+        (Node->getName() != Counter->getName() ||
         Node->getChildrenCount() != Counter->getChildrenCount())) {
       Node->annotate(NodeAnnotation::TypeRewritten);
       Node->annotate(NodeAnnotation::TypeRewrittenLeft, Node->getPrintedName());
@@ -2794,6 +2795,8 @@ class InterfaceTypeChangeDetector {
         R->annotate(HasOptional ?
                     NodeAnnotation::RevertOptionalDictionaryKeyUpdate :
                     NodeAnnotation::RevertDictionaryKeyUpdate);
+        R->annotate(NodeAnnotation::RawTypeLeft, KeyChangedTo);
+        R->annotate(NodeAnnotation::RawTypeRight, Raw);
       }
       return true;
     }
@@ -2843,6 +2846,8 @@ class InterfaceTypeChangeDetector {
         R->annotate(HasOptional ?
                     NodeAnnotation::RevertOptionalArrayMemberUpdate :
                     NodeAnnotation::RevertArrayMemberUpdate);
+        R->annotate(NodeAnnotation::RawTypeLeft, KeyChangedTo);
+        R->annotate(NodeAnnotation::RawTypeRight, Raw);
       }
       return true;
     }
@@ -2874,6 +2879,8 @@ class InterfaceTypeChangeDetector {
                     NodeAnnotation::SimpleOptionalStringRepresentableUpdate:
                     NodeAnnotation::SimpleStringRepresentableUpdate);
       } else {
+        R->annotate(NodeAnnotation::RawTypeLeft, KeyChangedTo);
+        R->annotate(NodeAnnotation::RawTypeRight, Raw);
         R->annotate(HasOptional ?
                     NodeAnnotation::RevertSimpleOptionalStringRepresentableUpdate:
                     NodeAnnotation::RevertSimpleStringRepresentableUpdate);
@@ -3051,6 +3058,12 @@ class DiffItemEmitter : public SDKNodeVisitor {
       case NodeAnnotation::OptionalDictionaryKeyUpdate:
       case NodeAnnotation::SimpleStringRepresentableUpdate:
       case NodeAnnotation::SimpleOptionalStringRepresentableUpdate:
+      case NodeAnnotation::RevertArrayMemberUpdate:
+      case NodeAnnotation::RevertOptionalArrayMemberUpdate:
+      case NodeAnnotation::RevertDictionaryKeyUpdate:
+      case NodeAnnotation::RevertOptionalDictionaryKeyUpdate:
+      case NodeAnnotation::RevertSimpleStringRepresentableUpdate:
+      case NodeAnnotation::RevertSimpleOptionalStringRepresentableUpdate:
         return Node->getAnnotateComment(NodeAnnotation::RawTypeLeft);
       case NodeAnnotation::TypeRewritten:
         return Node->getAnnotateComment(NodeAnnotation::TypeRewrittenLeft);
@@ -3069,6 +3082,12 @@ class DiffItemEmitter : public SDKNodeVisitor {
       case NodeAnnotation::OptionalDictionaryKeyUpdate:
       case NodeAnnotation::SimpleStringRepresentableUpdate:
       case NodeAnnotation::SimpleOptionalStringRepresentableUpdate:
+      case NodeAnnotation::RevertArrayMemberUpdate:
+      case NodeAnnotation::RevertOptionalArrayMemberUpdate:
+      case NodeAnnotation::RevertDictionaryKeyUpdate:
+      case NodeAnnotation::RevertOptionalDictionaryKeyUpdate:
+      case NodeAnnotation::RevertSimpleStringRepresentableUpdate:
+      case NodeAnnotation::RevertSimpleOptionalStringRepresentableUpdate:
         return Node->getAnnotateComment(NodeAnnotation::RawTypeRight);
       case NodeAnnotation::TypeRewritten:
         return Node->getAnnotateComment(NodeAnnotation::TypeRewrittenRight);