Merge branch 'main' into update/sbt-scala-native-crossproject-1.3.1

Author: armanbilge

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.7.1
+version = 3.7.3
 
 runner.dialect = Scala213Source3
 

build.sbt

@@ -83,7 +83,7 @@ lazy val testing = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     }
   )
   .platformsSettings(JSPlatform, NativePlatform)(
-    libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.5.0"
+    libraryDependencies += "io.github.cquiroz" %%% "scala-java-locales" % "1.5.1"
   )
   .nativeSettings(
     tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "1.3.0").toMap

core/src/main/scala/org/typelevel/ci/CIString.scala

@@ -41,8 +41,8 @@ import scala.math.Ordered
   * val x: org.typelevel.ci.CIString = woof
   * scala> val y = CIString("WOOF")
   * val y: org.typelevel.ci.CIString = WOOF
-  * scala> def f(ci: String): CIString = ci.toString
-  * def f(s: String): org.typelevel.ci.CIString
+  * scala> def f(ci: CIString): String = ci.toString
+  * def f(ci: org.typelevel.ci.CIString): String
   * scala> x == y
   * val res0: Boolean = true
   * scala> f(x) == f(y)
@@ -98,6 +98,17 @@ final class CIString private (override val toString: String)
 
   def length: Int = toString.length
 
+  def contains(needle: CIString): Boolean = {
+    val needleLength = needle.toString.length
+    val haystack = toString
+    // There's no point searching haystack indexes beyond which the substring is too small to ever match the needle
+    val maxHaystackStartingIndex = haystack.length - needleLength
+
+    (0 to maxHaystackStartingIndex).exists { i =>
+      haystack.regionMatches(true, i, needle.toString, 0, needleLength)
+    }
+  }
+
   @deprecated("Use toString", "0.1.0")
   def value: String = toString
 }

flake.lock

@@ -1,7 +1,7 @@
-val sbtTypelevelVersion = "0.4.19"
+val sbtTypelevelVersion = "0.4.20"
 addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")

project/plugins.sbt

@@ -183,6 +183,31 @@ class CIStringSuite extends DisciplineSuite {
     })
   }
 
+  test("contains lowercase to lowercase is true if matching") {
+    assert(CIString("hello there").contains(CIString("hello there")))
+    assert(CIString("hello there").contains(CIString("hello")))
+  }
+
+  test("contains lowercase to lowercase is false if not matching") {
+    assertEquals(CIString("hello there").contains(CIString("guten arben")), false)
+  }
+
+  test("contains lowercase to mixed case is false if not matching") {
+    assertEquals(CIString("hello there").contains(CIString("GUTEN ARBEN")), false)
+  }
+
+  test("contains mixed to mixed case is true if matching") {
+    assert(CIString("HELLO there").contains(CIString("hellO ThErE")))
+  }
+
+  test("contains uppercase to mixed case is true if matching") {
+    assert(CIString("HELLO THERE").contains(CIString("hellO ThErE")))
+  }
+
+  test("contains uppercase to mixed case is false if not matching") {
+    assertEquals(CIString("HELLO THERE").contains(CIString("GUTEN arben")), false)
+  }
+
   checkAll("Order[CIString]", OrderTests[CIString].order)
   checkAll("Hash[CIString]", HashTests[CIString].hash)
   checkAll("LowerBounded[CIString]", LowerBoundedTests[CIString].lowerBounded)

tests/shared/src/test/scala/org/typelevel/ci/CIStringSuite.scala

@@ -19,7 +19,12 @@ package org.typelevel.ci
 import munit.FunSuite
 
 class TurkeySuite extends FunSuite {
-  test("passes the Turkey test") {
+  test("equals passes the Turkey test") {
     assertEquals(CIString("i"), CIString("I"))
   }
+
+  test("contains passes the Turkey test") {
+    assert(CIString("i").contains(CIString("I")))
+    assert(CIString("I").contains(CIString("i")))
+  }
 }