chore(deps): update weapon-regex to 2.0.0 (#2026)

Author: hugo-vrijswijk

.scalafix.conf

@@ -1,3 +1,6 @@
+rules = [
+  OrganizeImports
+]
 OrganizeImports {
   coalesceToWildcardImportThreshold = 5
   groupedImports = Merge

modules/api/src/main/scala/stryker4s/log/Logger.scala

@@ -1,7 +1,7 @@
 package stryker4s.log
 
-import stryker4s.log.Level.*
 import fansi.Str
+import stryker4s.log.Level.*
 
 trait Logger {
 

modules/commandRunner/src/main/scala/stryker4s/log/Slf4jLogger.scala

@@ -1,7 +1,7 @@
 package stryker4s.log
 
-import org.slf4j.simple.SimpleLoggerFactory
 import org.slf4j.Logger as Slf4jInternalLogger
+import org.slf4j.simple.SimpleLoggerFactory
 
 class Slf4jLogger() extends Logger {
   private val slf4jLogger: Slf4jInternalLogger = new SimpleLoggerFactory().getLogger("Stryker4s")

modules/core/src/main/scala/stryker4s/extension/TreeExtensions.scala

@@ -4,7 +4,6 @@ import cats.Eval
 import cats.data.{Chain, OptionT}
 import cats.syntax.all.*
 import mutationtesting.Location
-import weaponregex.model.Location as RegexLocation
 
 import scala.annotation.tailrec
 import scala.meta.*
@@ -160,11 +159,12 @@ object TreeExtensions {
       end = mutationtesting.Position(line = pos.endLine + 1, column = pos.endColumn + 1)
     )
   }
-  implicit final class RegexLocationExtension(val pos: RegexLocation) extends AnyVal {
 
-    /** Map a `weaponregex.model.Location` to a `mutationtesting.Location`
+  implicit final class LocationExtension(val pos: Location) extends AnyVal {
+
+    /** Adds an offset to a `mutationtesting.Location`
       */
-    def toLocation(offset: Location, stringValue: Lit.String): Location = {
+    def withOffset(offset: Location, stringValue: Lit.String): Location = {
       val stringOffset = if (stringValue.text.startsWith("\"\"\"")) 3 else 1
       Location(
         start = mutationtesting

modules/core/src/main/scala/stryker4s/files/fileIO.scala

@@ -1,8 +1,8 @@
 package stryker4s.files
 
 import cats.effect.IO
-import fs2.io.file.{Files, Path}
 import fs2.*
+import fs2.io.file.{Files, Path}
 
 import java.io.IOException
 

modules/core/src/main/scala/stryker4s/model/Mutant.scala

@@ -1,6 +1,5 @@
 package stryker4s.model
 
-import cats.Show
 import cats.syntax.all.*
 import mutationtesting.{Location, MutantResult, MutantStatus}
 import stryker4s.extension.TreeExtensions.PositionExtension
@@ -49,13 +48,7 @@ final case class MutantMetadata(
     mutatorName: String,
     location: Location,
     description: Option[String]
-) {
-  def showLocation: String = {
-    import MutantMetadata.locationShow
-
-    location.show
-  }
-}
+)
 
 object MutantMetadata {
   def apply(
@@ -67,7 +60,4 @@ object MutantMetadata {
   ): MutantMetadata =
     MutantMetadata(original, replacement, mutatorName, position.toLocation, description)
 
-  implicit def locationShow: Show[Location] = Show.show(location =>
-    s"${location.start.line}:${location.start.column} to ${location.end.line}:${location.end.column}"
-  )
 }

modules/core/src/main/scala/stryker4s/mutants/findmutants/MutantMatcher.scala

@@ -2,6 +2,7 @@ package stryker4s.mutants.findmutants
 
 import cats.data.NonEmptyVector
 import cats.syntax.all.*
+import mutationtesting.cats.*
 import stryker4s.config.{Config, ExcludedMutation}
 import stryker4s.extension.PartialFunctionOps.*
 import stryker4s.extension.TreeExtensions.{IsEqualExtension, PositionExtension, TransformOnceExtension}
@@ -11,6 +12,7 @@ import stryker4s.mutation.*
 
 import scala.annotation.tailrec
 import scala.meta.*
+import scala.meta.prettyprinters.XtensionReprint
 
 import MutantMatcher.MutationMatcher
 
@@ -164,15 +166,15 @@ class MutantMatcherImpl()(implicit config: Config) extends MutantMatcher {
         }
         .getOrElse(
           throw new RuntimeException(
-            s"Could not transform '$original' in ${placeableTree.tree} (${metadata.showLocation})"
+            show"Could not transform '${original.text}' in ${placeableTree.tree.text} (${metadata.location})"
           )
         )
 
       mutatedTopStatement match {
         case t: Term => MutatedCode(t, metadata)
         case t       =>
           throw new RuntimeException(
-            s"Could not transform '$original' in ${placeableTree.tree} (${metadata.showLocation}). Expected a Term, but was a ${t.getClass().getSimpleName}"
+            show"Could not transform '${original.text}' in ${placeableTree.tree.text} (${metadata.location}). Expected a Term, but was a ${t.getClass().getSimpleName}"
           )
       }
 

modules/core/src/main/scala/stryker4s/mutation/RegexMutator.scala

@@ -1,9 +1,9 @@
 package stryker4s.mutation
 
-import cats.data.NonEmptyVector
+import cats.data.{NonEmptySet, NonEmptyVector}
 import cats.syntax.all.*
 import mutationtesting.Location
-import stryker4s.extension.TreeExtensions.{PositionExtension, RegexLocationExtension}
+import stryker4s.extension.TreeExtensions.{LocationExtension, PositionExtension}
 import stryker4s.model.{MutantMetadata, MutatedCode, NoRegexMutationsFound, RegexParseError}
 import stryker4s.mutants.tree.IgnoredMutation
 
@@ -83,7 +83,7 @@ case object PatternConstructor {
 object RegexMutations {
   def apply(lit: Lit.String): Either[IgnoredMutation, NonEmptyVector[RegularExpression]] = {
     weaponregex.WeaponRegeX
-      .mutate(lit.value, mutationLevels = Seq(1))
+      .mutate(lit.value, mutationLevels = NonEmptySet.one(1).some)
       .leftMap(e => (ignoredMutationMetadata(lit), RegexParseError(lit.value, e)))
       .map(_.toVector)
       .flatMap(
@@ -93,7 +93,7 @@ object RegexMutations {
             _.map(r =>
               RegularExpression(
                 pattern = r.pattern,
-                location = r.location.toLocation(offset = lit.pos.toLocation, lit),
+                location = r.location.withOffset(offset = lit.pos.toLocation, lit),
                 replacement = r.replacement,
                 description = r.description
               )

modules/core/src/test/scala/stryker4s/extension/TreeExtensionsTest.scala

@@ -4,7 +4,6 @@ import cats.syntax.option.*
 import mutationtesting.{Location, Position}
 import stryker4s.extension.TreeExtensions.*
 import stryker4s.testkit.Stryker4sSuite
-import weaponregex.model as wrx
 
 import scala.collection.mutable.ListBuffer
 import scala.meta.*
@@ -228,17 +227,17 @@ class TreeExtensionsTest extends Stryker4sSuite {
     }
   }
 
-  describe("toLocation") {
-    val wrxLocation = wrx.Location(wrx.Position(1, 2), wrx.Position(3, 4))
+  describe("withOffset") {
+    val wrxLocation = Location(Position(1, 2), Position(3, 4))
     val offset = Location(Position(5, 6), Position(7, 8))
-    test("should map a weaponregex.Location to a mutationtesting.Location") {
-      val result = wrxLocation.toLocation(offset, Lit.String("foo")) // single double-quote string "foo"
+    test("uses correct offset for regular string") {
+      val result = wrxLocation.withOffset(offset, Lit.String("foo")) // single double-quote string "foo"
 
       assertEquals(result, mutationtesting.Location(mutationtesting.Position(6, 9), mutationtesting.Position(8, 11)))
     }
 
     test("uses correct offset for triple double-quote strings") {
-      val result = wrxLocation.toLocation(
+      val result = wrxLocation.withOffset(
         offset,
         "\"\"\"foo\"\"\"".parse[Term].get.asInstanceOf[Lit.String]
       ) // triple double-quote string """foo"""