Fix RadixNode.matchAt

typelevel · Jan 28, 2022 · e04b9c9 · e04b9c9
1 parent 828ff4b
commit e04b9c9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/core/shared/src/main/scala/cats/parse/RadixNode.scala b/core/shared/src/main/scala/cats/parse/RadixNode.scala
@@ -67,7 +67,7 @@ private[parse] final class RadixNode(
   def matchAt(str: String, off: Int): Int =
     matchAtOrNull(str, off) match {
       case null => -1
-      case nonNull => nonNull.length
+      case nonNull => off + nonNull.length
     }
 
   final def matchAtOrNull(str: String, offset: Int): String =

diff --git a/core/shared/src/test/scala/cats/parse/ParserTest.scala b/core/shared/src/test/scala/cats/parse/ParserTest.scala
@@ -2587,4 +2587,16 @@ class ParserTest extends munit.ScalaCheckSuite {
     assertEquals((Parser.pure(1) ~ Parser.pure(3)).as(42), Parser.pure(42))
     assertEquals((Parser.pure(1).soft ~ Parser.pure(3)).as(42), Parser.pure(42))
   }
+
+  property("stringIn after skipping test") {
+    forAll { (first: String, oneOf0: List[String], content0: String) =>
+      val oneOf = oneOf0.filter(_.nonEmpty)
+      forAll(Gen.oneOf(content0 :: oneOf0)) { content =>
+        assertEquals(
+          Parser.stringIn(oneOf).parse(content).toOption,
+          (Parser.string0(first) *> Parser.stringIn(oneOf)).parse(first + content).toOption
+        )
+      }
+    }
+  }
 }
diff --git a/core/shared/src/test/scala/cats/parse/RadixNodeTest.scala b/core/shared/src/test/scala/cats/parse/RadixNodeTest.scala
@@ -173,7 +173,8 @@ class RadixNodeTest extends munit.ScalaCheckSuite {
         radix.matchAt(targ, off) match {
           case x if x < 0 =>
             assertEquals(radix.matchAtOrNull(targ, off), null)
-          case len =>
+          case off1 =>
+            val len = off1 - off
             val left = radix.matchAtOrNull(targ, off)
             assert(off + len <= targ.length, s"len = $len, off = $off")
             assertEquals(left, targ.substring(off, off + len), s"len = $len, left = $left")