Abstract check to another function

Author: LucianoPAlmeida

lib/Sema/CSSimplify.cpp

@@ -2793,6 +2793,26 @@ bool ConstraintSystem::repairFailures(
   return !conversionsOrFixes.empty();
 }
 
+static bool
+shouldDiagnoseUnecessaryExplicityCoercion(ConstraintSystem &CS,
+                                          ConstraintKind kind,
+                                          ConstraintLocatorBuilder locator) {
+  auto locatorPtr = locator.getBaseLocator();
+  if (kind >= ConstraintKind::Conversion) {
+    if (locator.last().hasValue() &&
+        locator.last().getValue().getKind()
+            == ConstraintLocator::PathElementKind::ExplicityTypeCoercion) {
+      
+      return !llvm::any_of(CS.getFixes(), [&locatorPtr](const ConstraintFix *fix) -> bool {
+        if (fix->getLocator() == locatorPtr)
+          return true;
+        return fix->getLocator()->getAnchor() == locatorPtr->getAnchor();
+      });
+    }
+  }
+  return false;
+}
+
 ConstraintSystem::TypeMatchResult
 ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
                              TypeMatchOptions flags,
@@ -2808,22 +2828,11 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
   // If the types are obviously equivalent, we're done.
   if (desugar1->isEqual(desugar2)) {
     auto locatorPtr = locator.getBaseLocator();
-    if (kind >= ConstraintKind::Conversion) {
-      if (locator.last().hasValue() &&
-          locator.last().getValue().getKind()
-              == ConstraintLocator::PathElementKind::ExplicityTypeCoercion) {
-        
-        if (!llvm::any_of(getFixes(), [&locatorPtr](const ConstraintFix *fix) -> bool {
-          if (fix->getLocator() == locatorPtr)
-            return true;
-          return fix->getLocator()->getAnchor() == locatorPtr->getAnchor();
-        })) {
-          auto *fix = RemoveUnecessaryCoercion::create(*this, type2,
-                                                       locatorPtr);
-          recordFix(fix);
-        }
-      }
-
+    if (shouldDiagnoseUnecessaryExplicityCoercion(*this, kind, locator)) {
+      auto *fix = RemoveUnecessaryCoercion::create(*this, type2,
+                                                   locatorPtr);
+      recordFix(fix);
+      
     }
     if (!isa<InOutType>(desugar2))
       return getTypeMatchSuccess();