[Diagnostics] NFC: Align diagnoseAsNote with diagnoseAsError for AbstractRawRepresentableFailure

Author: xedin

lib/Sema/CSDiagnostics.cpp

@@ -6279,6 +6279,35 @@ bool AbstractRawRepresentableFailure::diagnoseAsError() {
   return true;
 }
 
+bool AbstractRawRepresentableFailure::diagnoseAsNote() {
+  auto *locator = getLocator();
+
+  Optional<InFlightDiagnostic> diagnostic;
+  if (locator->isForContextualType()) {
+    auto overload = getCalleeOverloadChoiceIfAvailable(locator);
+    if (!overload)
+      return false;
+
+    if (auto *decl = overload->choice.getDeclOrNull()) {
+      diagnostic.emplace(emitDiagnosticAt(
+          decl, diag::cannot_convert_candidate_result_to_contextual_type,
+          decl->getName(), ExpectedType, RawReprType));
+    }
+  } else if (auto argConv =
+                 locator->getLastElementAs<LocatorPathElt::ApplyArgToParam>()) {
+    diagnostic.emplace(
+        emitDiagnostic(diag::candidate_has_invalid_argument_at_position,
+                       RawReprType, argConv->getParamIdx(), /*inOut=*/false));
+  }
+
+  if (diagnostic) {
+    fixIt(*diagnostic);
+    return true;
+  }
+
+  return false;
+}
+
 void MissingRawRepresentativeInitFailure::fixIt(
     InFlightDiagnostic &diagnostic) const {
   if (auto *E = getAsExpr(getAnchor())) {
@@ -6330,35 +6359,6 @@ void MissingRawRepresentativeInitFailure::fixIt(
   }
 }
 
-bool AbstractRawRepresentableFailure::diagnoseAsNote() {
-  auto *locator = getLocator();
-
-  Optional<InFlightDiagnostic> diagnostic;
-  if (locator->isForContextualType()) {
-    auto overload = getCalleeOverloadChoiceIfAvailable(locator);
-    if (!overload)
-      return false;
-
-    if (auto *decl = overload->choice.getDeclOrNull()) {
-      diagnostic.emplace(emitDiagnosticAt(
-          decl, diag::cannot_convert_candidate_result_to_contextual_type,
-          decl->getName(), ExpectedType, RawReprType));
-    }
-  } else if (auto argConv =
-                 locator->getLastElementAs<LocatorPathElt::ApplyArgToParam>()) {
-    diagnostic.emplace(
-        emitDiagnostic(diag::candidate_has_invalid_argument_at_position,
-                       RawReprType, argConv->getParamIdx(), /*inOut=*/false));
-  }
-
-  if (diagnostic) {
-    fixIt(*diagnostic);
-    return true;
-  }
-
-  return false;
-}
-
 void UseOfRawRepresentableInsteadOfItsRawValueFailure::fixIt(
     InFlightDiagnostic &diagnostic) const {
   auto *E = getAsExpr(getAnchor());