Merge pull request #1161 from fthomas/topic/move-removeCommonSuffix

Move Update.removeCommonSuffix to UpdateHeuristic

Author: fthomas

modules/core/src/main/scala/org/scalasteward/core/data/Update.scala

@@ -101,9 +101,6 @@ object Update {
   val commonSuffixes: List[String] =
     List("config", "contrib", "core", "extra", "server")
 
-  def removeCommonSuffix(str: String): String =
-    util.string.removeSuffix(str, commonSuffixes)
-
   def nameOf(groupId: GroupId, artifactId: String): String =
     if (commonSuffixes.contains(artifactId))
       util.string.rightmostLabel(groupId.value)

modules/core/src/main/scala/org/scalasteward/core/edit/UpdateHeuristic.scala

@@ -74,11 +74,10 @@ object UpdateHeuristic {
     }
 
     def mkRegex(update: Update): Option[Regex] =
-      searchTermsToAlternation(getSearchTerms(update).map(Update.removeCommonSuffix)).map {
-        searchTerms =>
-          val prefix = getPrefixRegex(update).getOrElse("")
-          val currentVersion = Regex.quote(update.currentVersion)
-          s"(?i)(.*)($prefix$searchTerms.*?)$currentVersion(.?)".r
+      searchTermsToAlternation(getSearchTerms(update).map(removeCommonSuffix)).map { searchTerms =>
+        val prefix = getPrefixRegex(update).getOrElse("")
+        val currentVersion = Regex.quote(update.currentVersion)
+        s"(?i)(.*)($prefix$searchTerms.*?)$currentVersion(.?)".r
       }
 
     def replaceF(update: Update): String => Option[String] =
@@ -112,6 +111,9 @@ object UpdateHeuristic {
     terms.map(Update.nameOf(update.groupId, _)).toList
   }
 
+  private def removeCommonSuffix(str: String): String =
+    util.string.removeSuffix(str, Update.commonSuffixes)
+
   val moduleId = UpdateHeuristic(
     name = "moduleId",
     replaceVersion = update =>