Merge pull request #82478 from swiftlang/jepa3

AST: Fix out of sync diagnostic

Author: AnthonyLatsis

include/swift/AST/DeclContext.h

@@ -114,21 +114,20 @@ enum class DeclContextKind : unsigned {
 /// Describes the kind of a particular conformance.
 ///
 /// The following code involves conformances of the three different kinds:
-/// \code
-/// protocol P { }
-/// protocol P2 : P { }
 ///
-/// class Super : P2 { }
-/// class Sub : Super { }
-/// \endcode
+///     protocol P { }
+///     protocol P2 : P { }
 ///
-/// \c Super conforms to \c P2 via an explicit conformance,
+///     class Super : P2 { }
+///     class Sub : Super { }
+///
+/// `Super` conforms to `P2` via an explicit conformance,
 /// specified on the class declaration itself.
 ///
-/// \c Super conforms to \c P via an implied conformance, whose
-/// origin is the explicit conformance to \c P2.
+/// `Super` conforms to `P` via an implied conformance, whose
+/// origin is the explicit conformance to `P2`.
 ///
-/// \c Sub conforms to \c P2 and \c P via inherited conformances,
+/// `Sub` conforms to `P2` and `P` via inherited conformances,
 /// which link back to the conformances described above.
 ///
 /// The enumerators are ordered in terms of decreasing preference:
@@ -137,22 +136,28 @@ enum class DeclContextKind : unsigned {
 /// conformance kinds supersede later conformance kinds, possibly with a
 /// diagnostic (e.g., if an inherited conformance supersedes an
 /// explicit conformance).
+///
+/// - Important: The raw values of these cases are relied upon by
+///   `declared_protocol_conformance_here`.
+///   - If you add a new case, give it an explicit raw value.
+///   - If you change the cases, make sure they remain in sync with the
+///     aforementioned diagnostic.
 enum class ConformanceEntryKind : unsigned {
   /// Inherited from a superclass conformance.
-  Inherited,
+  Inherited = 0,
 
   /// Explicitly specified.
-  Explicit,
+  Explicit = 1,
 
   /// The conformance is generated by a macro that has not been
   /// expanded yet.
-  PreMacroExpansion,
+  PreMacroExpansion = 2,
 
   /// Implicitly synthesized.
-  Synthesized,
+  Synthesized = 3,
 
   /// Implied by an explicitly-specified conformance.
-  Implied,
+  Implied = 4,
 
   Last_Kind = Implied
 };

include/swift/AST/DiagnosticsSema.def

@@ -3274,9 +3274,9 @@ NOTE(protocol_conformance_here,none,
 NOTE(declared_protocol_conformance_here,none,
      "%select{%0 inherits conformance to protocol %2 from superclass|"
      "%0 declares conformance to protocol %2|"
-     "%0 implicitly conforms to protocol %2 (via conformance to %3)|"
-     "%0 implicitly conforms to protocol %2 |"
-     "conformance to %2 generated by macro }1 here",
+     "conformance to %2 generated by macro|"
+     "%0 implicitly conforms to protocol %2|"
+     "%0 implicitly conforms to protocol %2 (via conformance to %3)}1 here",
      (Type, unsigned, Identifier, Identifier))
 
 ERROR(witness_unavailable,none,