Add String.removeIf

Author: JavierSegoviaCordoba

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### Added
 
+- `String.removeIf`
+
 ### Changed
 
 ### Deprecated

kotlin-stdlib/api/android/kotlin-stdlib.api

@@ -170,9 +170,12 @@ public final class com/javiersc/kotlin/stdlib/StringsKt {
 	public static final fun notContain (Ljava/lang/CharSequence;Lkotlin/text/Regex;)Z
 	public static synthetic fun notContain$default (Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
 	public static final fun remove (Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
-	public static final fun remove (Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
+	public static final fun remove (Ljava/lang/String;[Ljava/lang/String;Z)Ljava/lang/String;
 	public static synthetic fun remove$default (Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/String;
+	public static synthetic fun remove$default (Ljava/lang/String;[Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/String;
 	public static final fun removeDuplicateEmptyLines (Ljava/lang/String;)Ljava/lang/String;
+	public static final fun removeIf (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ljava/lang/String;
+	public static synthetic fun removeIf$default (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/String;
 	public static final fun replace (Ljava/lang/String;[Lkotlin/Pair;)Ljava/lang/String;
 }
 

kotlin-stdlib/api/jvm/kotlin-stdlib.api

@@ -176,9 +176,12 @@ public final class com/javiersc/kotlin/stdlib/StringsKt {
 	public static final fun notContain (Ljava/lang/CharSequence;Lkotlin/text/Regex;)Z
 	public static synthetic fun notContain$default (Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZILjava/lang/Object;)Z
 	public static final fun remove (Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;
-	public static final fun remove (Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String;
+	public static final fun remove (Ljava/lang/String;[Ljava/lang/String;Z)Ljava/lang/String;
 	public static synthetic fun remove$default (Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/String;
+	public static synthetic fun remove$default (Ljava/lang/String;[Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/String;
 	public static final fun removeDuplicateEmptyLines (Ljava/lang/String;)Ljava/lang/String;
+	public static final fun removeIf (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ljava/lang/String;
+	public static synthetic fun removeIf$default (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/lang/String;
 	public static final fun replace (Ljava/lang/String;[Lkotlin/Pair;)Ljava/lang/String;
 }
 

kotlin-stdlib/common/main/kotlin/com/javiersc/kotlin/stdlib/Strings.kt

@@ -16,23 +16,27 @@ public fun String.replace(vararg oldToNewValues: Pair<String, String>): String {
 public inline fun String.remove(value: String, ignoreCase: Boolean = false): String =
     replace(oldValue = value, newValue = "", ignoreCase = ignoreCase)
 
-public fun String.remove(vararg values: String): String {
+public fun String.remove(vararg values: String, ignoreCase: Boolean = false): String {
     var result = this
     for (value in values) {
-        result = result.replace(value, "")
+        result = result.remove(value = value, ignoreCase = ignoreCase)
     }
     return result
 }
 
+public fun String.removeIf(
+    value: String,
+    ignoreCase: Boolean = false,
+    block: (String) -> Boolean,
+): String = if (block(this)) remove(value = value, ignoreCase = ignoreCase) else this
+
 public inline fun CharSequence?.isNotNullNorBlank(): Boolean {
     contract { returns(true) implies (this@isNotNullNorBlank != null) }
-
     return !isNullOrBlank()
 }
 
 public inline fun CharSequence?.isNotNullNorEmpty(): Boolean {
     contract { returns(true) implies (this@isNotNullNorEmpty != null) }
-
     return !isNullOrEmpty()
 }
 
@@ -45,13 +49,11 @@ public inline fun CharSequence.notContain(regex: Regex): Boolean = !contains(reg
 
 public inline fun String?.isNotNullNorBlank(): Boolean {
     contract { returns(true) implies (this@isNotNullNorBlank != null) }
-
     return !isNullOrBlank()
 }
 
 public inline fun String?.isNotNullNorEmpty(): Boolean {
     contract { returns(true) implies (this@isNotNullNorEmpty != null) }
-
     return !isNullOrEmpty()
 }
 

kotlin-stdlib/common/test/kotlin/com/javiersc/kotlin/stdlib/StringsTest.kt

@@ -37,8 +37,13 @@ internal class StringsTest {
     @Test
     fun string_remove() {
         assertTrue { "Hello, World".remove("Hello, ") == "World" }
+        assertTrue { "Hello, World".remove("hello, ", ignoreCase = true) == "World" }
         assertTrue { "Hello, World".remove("bla") == "Hello, World" }
         assertTrue { "Hello, World".remove("llo", "rld") == "He, Wo" }
+        assertTrue { "Hello, World".remove("Hel", "Wor", ignoreCase = false) == "lo, ld" }
+        assertTrue { "Hello, World".removeIf("Hello, ") { it.startsWith("Hel") } == "World" }
+        assertTrue { "Hello, World".removeIf("H") { it.startsWith("W") } == "Hello, World" }
+        assertTrue { "Hello, World".removeIf("hello, ", true) { it.startsWith("Hel") } == "World" }
     }
 
     @Test