Improve code

JavierSegoviaCordoba · Dec 3, 2024 · fa8b09e · fa8b09e
1 parent 86d6d56
commit fa8b09e
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 689 deletions.
diff --git a/kotlin-stdlib/api/android/kotlin-stdlib.api b/kotlin-stdlib/api/android/kotlin-stdlib.api
@@ -143,6 +143,14 @@ public final class com/javiersc/kotlin/stdlib/BooleanKt {
 	public static final fun ifTrue (ZLkotlin/jvm/functions/Function0;)Z
 }
 
+public final class com/javiersc/kotlin/stdlib/CharSequenceKt {
+	public static final fun isNotNullNorBlank (Ljava/lang/CharSequence;)Z
+	public static final fun isNotNullNorEmpty (Ljava/lang/CharSequence;)Z
+	public static final fun notContain (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+	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 final class com/javiersc/kotlin/stdlib/CollectionsKt {
 	public static final fun capitalize (Ljava/lang/String;)Ljava/lang/String;
 	public static final fun decapitalize (Ljava/lang/String;)Ljava/lang/String;
@@ -238,13 +246,8 @@ public final class com/javiersc/kotlin/stdlib/IdentityKt {
 public final class com/javiersc/kotlin/stdlib/StringsKt {
 	public static final fun endWithNewLine (Ljava/lang/String;)Ljava/lang/String;
 	public static final fun getEmpty (Lkotlin/jvm/internal/StringCompanionObject;)Ljava/lang/String;
-	public static final fun isNotNullNorBlank (Ljava/lang/CharSequence;)Z
 	public static final fun isNotNullNorBlank (Ljava/lang/String;)Z
-	public static final fun isNotNullNorEmpty (Ljava/lang/CharSequence;)Z
 	public static final fun isNotNullNorEmpty (Ljava/lang/String;)Z
-	public static final fun notContain (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
-	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;Z)Ljava/lang/String;
 	public static synthetic fun remove$default (Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/String;

diff --git a/kotlin-stdlib/api/jvm/kotlin-stdlib.api b/kotlin-stdlib/api/jvm/kotlin-stdlib.api
@@ -143,6 +143,14 @@ public final class com/javiersc/kotlin/stdlib/BooleanKt {
 	public static final fun ifTrue (ZLkotlin/jvm/functions/Function0;)Z
 }
 
+public final class com/javiersc/kotlin/stdlib/CharSequenceKt {
+	public static final fun isNotNullNorBlank (Ljava/lang/CharSequence;)Z
+	public static final fun isNotNullNorEmpty (Ljava/lang/CharSequence;)Z
+	public static final fun notContain (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
+	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 final class com/javiersc/kotlin/stdlib/CollectionsKt {
 	public static final fun capitalize (Ljava/lang/String;)Ljava/lang/String;
 	public static final fun decapitalize (Ljava/lang/String;)Ljava/lang/String;
@@ -261,13 +269,8 @@ public final class com/javiersc/kotlin/stdlib/IdentityKt {
 public final class com/javiersc/kotlin/stdlib/StringsKt {
 	public static final fun endWithNewLine (Ljava/lang/String;)Ljava/lang/String;
 	public static final fun getEmpty (Lkotlin/jvm/internal/StringCompanionObject;)Ljava/lang/String;
-	public static final fun isNotNullNorBlank (Ljava/lang/CharSequence;)Z
 	public static final fun isNotNullNorBlank (Ljava/lang/String;)Z
-	public static final fun isNotNullNorEmpty (Ljava/lang/CharSequence;)Z
 	public static final fun isNotNullNorEmpty (Ljava/lang/String;)Z
-	public static final fun notContain (Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z
-	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;Z)Ljava/lang/String;
 	public static synthetic fun remove$default (Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Ljava/lang/String;

diff --git a/kotlin-stdlib/api/kotlin-stdlib.api b/kotlin-stdlib/api/kotlin-stdlib.api
diff --git a/kotlin-stdlib/common/main/kotlin/com/javiersc/kotlin/stdlib/CharSequence.kt b/kotlin-stdlib/common/main/kotlin/com/javiersc/kotlin/stdlib/CharSequence.kt
@@ -0,0 +1,20 @@
+package com.javiersc.kotlin.stdlib
+
+import kotlin.contracts.contract
+
+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()
+}
+
+public inline fun CharSequence.notContain(
+    other: CharSequence,
+    ignoreCase: Boolean = false,
+): Boolean = !contains(other, ignoreCase)
+
+public inline fun CharSequence.notContain(regex: Regex): Boolean = !contains(regex)
diff --git a/kotlin-stdlib/common/main/kotlin/com/javiersc/kotlin/stdlib/Strings.kt b/kotlin-stdlib/common/main/kotlin/com/javiersc/kotlin/stdlib/Strings.kt
@@ -30,23 +30,6 @@ public fun String.removeIf(
     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()
-}
-
-public inline fun CharSequence.notContain(
-    other: CharSequence,
-    ignoreCase: Boolean = false,
-): Boolean = !contains(other, ignoreCase)
-
-public inline fun CharSequence.notContain(regex: Regex): Boolean = !contains(regex)
-
 public inline fun String?.isNotNullNorBlank(): Boolean {
     contract { returns(true) implies (this@isNotNullNorBlank != null) }
     return !isNullOrBlank()

diff --git a/kotlin-stdlib/common/test/kotlin/com/javiersc/kotlin/stdlib/StringsTest.kt b/kotlin-stdlib/common/test/kotlin/com/javiersc/kotlin/stdlib/StringsTest.kt
@@ -64,6 +64,38 @@ internal class StringsTest {
 
         assertFalse { nullable.isNotNullNorEmpty() }
         assertFalse { nullableCharSequence.isNotNullNorEmpty() }
+        assertFalse {
+            val value: Boolean = nullableCharSequence.isNotNullNorEmpty()
+            value
+        }
+        assertTrue {
+            val value: Boolean = blankCharSequence.isNotNullNorEmpty()
+            value
+        }
+        assertFalse {
+            val value: Boolean = emptyCharSequence.isNotNullNorEmpty()
+            value
+        }
+        assertTrue {
+            val value: Boolean = notBlankCharSequence.isNotNullNorEmpty()
+            value
+        }
+        assertFalse {
+            val value: Boolean = nullableCharSequence.isNotNullNorBlank()
+            value
+        }
+        assertFalse {
+            val value: Boolean = blankCharSequence.isNotNullNorBlank()
+            value
+        }
+        assertFalse {
+            val value: Boolean = emptyCharSequence.isNotNullNorBlank()
+            value
+        }
+        assertTrue {
+            val value: Boolean = notBlankCharSequence.isNotNullNorBlank()
+            value
+        }
         assertTrue { blank.isNotNullNorEmpty() }
         assertTrue { blankCharSequence.isNotNullNorEmpty() }
         assertFalse { empty.isNotNullNorEmpty() }

diff --git a/kotlin-stdlib/jvm/main/kotlin/com/javiersc/kotlin/stdlib/Files.kt b/kotlin-stdlib/jvm/main/kotlin/com/javiersc/kotlin/stdlib/Files.kt
@@ -27,8 +27,8 @@ public open class DirScope(file: File) : FileScope(file) {
 }
 
 public fun File.root(name: String, block: DirScope.() -> Unit = {}): DirScope {
-    val dir = resolve(name).apply { mkdir() }
-    val scope = object : DirScope(dir) {}
+    val dir: File = resolve(name).apply(File::mkdir)
+    val scope: DirScope = object : DirScope(dir) {}
     block(scope)
     return scope
 }

diff --git a/kotlin-test-junit/api/kotlin-test-junit.api b/kotlin-test-junit/api/kotlin-test-junit.api