[Diagnostics] Share diagnoseAsNote for raw representable diagnostics

Author: xedin

lib/Sema/CSDiagnostics.cpp

@@ -6395,7 +6395,7 @@ void MissingRawRepresentativeInitFailure::fixIt(
   }
 }
 
-bool MissingRawRepresentativeInitFailure::diagnoseAsNote() {
+bool AbstractRawRepresentableFailure::diagnoseAsNote() {
   auto *locator = getLocator();
 
   Optional<InFlightDiagnostic> diagnostic;
@@ -6442,10 +6442,10 @@ void UseOfRawRepresentableInsteadOfItsRawValueFailure::fixIt(
   // out first and then, if destination is not optional, allow to specify
   // default value.
   if (RawReprType->getOptionalObjectType()) {
-    fix += ".map { $0.rawValue } ";
+    fix += ".map { $0.rawValue }";
 
     if (!ExpectedType->getOptionalObjectType())
-      fix += "?? <#default value#>";
+      fix += " ?? <#default value#>";
   } else {
     fix += ".rawValue";
   }

lib/Sema/CSDiagnostics.h

@@ -2118,7 +2118,7 @@ class AbstractRawRepresentableFailure : public FailureDiagnostic {
   virtual Type getToType() const = 0;
 
   bool diagnoseAsError() override;
-  bool diagnoseAsNote() override { return false; }
+  bool diagnoseAsNote() override;
 
 protected:
   Optional<Diag<Type, Type>> getDiagnostic() const;
@@ -2151,8 +2151,6 @@ class MissingRawRepresentativeInitFailure final
   Type getFromType() const override { return ExpectedType; }
   Type getToType() const override { return RawReprType; }
 
-  bool diagnoseAsNote() override;
-
 protected:
   void fixIt(InFlightDiagnostic &diagnostic) const override;
 };