Merge pull request swiftlang#19672 from nkcsgexi/diag-operator-change

Author: swift-ci

include/swift/AST/DiagnosticsModuleDiffer.def

@@ -74,7 +74,7 @@ ERROR(super_class_removed,none,"%0 has removed its super class %1", (StringRef,
 
 ERROR(super_class_changed,none,"%0 has changed its super class from %1 to %2", (StringRef, StringRef, StringRef))
 
-ERROR(nominal_type_kind_changed,none,"%0 has been changed to a %1", (StringRef, StringRef))
+ERROR(decl_kind_changed,none,"%0 has been changed to a %1", (StringRef, StringRef))
 
 ERROR(optional_req_changed,none,"%0 is %select{now|no longer}1 an optional requirement", (StringRef, bool))
 

test/api-digester/Inputs/cake1.swift

@@ -131,3 +131,5 @@ public class EscapingFunctionType {
   public func removedEscaping(_ a: @escaping ()->()) {}
   public func addedEscaping(_ a: ()->()) {}
 }
+
+infix operator ..*..

test/api-digester/Inputs/cake2.swift

@@ -141,3 +141,5 @@ public class EscapingFunctionType {
   public func removedEscaping(_ a: ()->()) {}
   public func addedEscaping(_ a: @escaping ()->()) {}
 }
+
+prefix operator ..*..

test/api-digester/Outputs/Cake-abi.txt

@@ -20,6 +20,7 @@ cake1: Var RequiementChanges.removedVar has been removed
 
 /* Moved Decls */
 cake1: Class ClassToStruct has been changed to a Struct
+cake1: InfixOperator ..*.. has been changed to a PrefixOperator
 cake1: Protocol ProtocolToEnum has been changed to a Enum
 
 /* Renamed Decls */

test/api-digester/Outputs/Cake.txt

@@ -19,6 +19,7 @@ cake1: Var RequiementChanges.removedVar has been removed
 
 /* Moved Decls */
 cake1: Class ClassToStruct has been changed to a Struct
+cake1: InfixOperator ..*.. has been changed to a PrefixOperator
 cake1: Protocol ProtocolToEnum has been changed to a Enum
 
 /* Renamed Decls */

tools/swift-api-digester/ModuleAnalyzerNodes.h

@@ -467,6 +467,7 @@ class SDKNodeDeclOperator : public SDKNodeDecl {
 public:
   SDKNodeDeclOperator(SDKNodeInitInfo Info);
   static bool classof(const SDKNode *N);
+  void diagnose(SDKNode *Right) override;
 };
 
 class SDKNodeDeclTypeAlias : public SDKNodeDecl {

tools/swift-api-digester/ModuleDiagsConsumer.cpp

@@ -36,7 +36,7 @@ static StringRef getCategoryName(uint32_t ID) {
   case LocalDiagID::removed_setter:
     return "/* Removed Decls */";
   case LocalDiagID::moved_decl:
-  case LocalDiagID::nominal_type_kind_changed:
+  case LocalDiagID::decl_kind_changed:
     return "/* Moved Decls */";
   case LocalDiagID::renamed_decl:
     return "/* Renamed Decls */";

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

@@ -667,8 +667,8 @@ void swift::ide::api::SDKNodeDeclType::diagnose(SDKNode *Right) {
   auto &Diags = Ctx.getDiags();
 
   if (getDeclKind() != R->getDeclKind()) {
-    Diags.diagnose(SourceLoc(), diag::nominal_type_kind_changed,
-      getScreenInfo(), getDeclKindStr(R->getDeclKind()));
+    Diags.diagnose(SourceLoc(), diag::decl_kind_changed, getScreenInfo(),
+                   getDeclKindStr(R->getDeclKind()));
     return;
   }
 
@@ -798,6 +798,17 @@ void swift::ide::api::SDKNodeDecl::diagnose(SDKNode *Right) {
   }
 }
 
+void swift::ide::api::SDKNodeDeclOperator::diagnose(SDKNode *Right) {
+  SDKNodeDecl::diagnose(Right);
+  auto *RO = dyn_cast<SDKNodeDeclOperator>(Right);
+  if (!RO)
+    return;
+  if (getDeclKind() != RO->getDeclKind()) {
+    Ctx.getDiags().diagnose(SourceLoc(), diag::decl_kind_changed, getScreenInfo(),
+                            getDeclKindStr(RO->getDeclKind()));
+  }
+}
+
 void swift::ide::api::SDKNodeDeclVar::diagnose(SDKNode *Right) {
   SDKNodeDecl::diagnose(Right);
   auto *RV = dyn_cast<SDKNodeDeclVar>(Right);