Add isNotNullNorBlank() and isNotNullNorEmpty()

Author: JavierSegoviaCordoba

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [Unreleased]
 
 ### Added
+- `isNotNullNorBlank()` and `isNotNullNorEmpty()`
 - `second()`, `third()`, `forth()`, `fifth()` and `penultimate()`
 
 ### Changed

kotlin-stdlib/api/kotlin-stdlib.api

@@ -152,6 +152,8 @@ public final class com/javiersc/kotlin/stdlib/CollectionsKt {
 }
 
 public final class com/javiersc/kotlin/stdlib/StringsKt {
+	public static final fun isNotNullNorBlank (Ljava/lang/CharSequence;)Z
+	public static final fun isNotNullNorEmpty (Ljava/lang/CharSequence;)Z
 	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;
 }

kotlin-stdlib/commonMain/kotlin/AnsiColors.kt

@@ -1,6 +1,6 @@
 package com.javiersc.kotlin.stdlib
 
-public fun String.ansiColor(color: AnsiColor): String = "${color}$this${AnsiColor.Reset}"
+public inline fun String.ansiColor(color: AnsiColor): String = "${color}$this${AnsiColor.Reset}"
 
 public abstract class AnsiColor {
 

kotlin-stdlib/commonMain/kotlin/Collections.kt

@@ -2,14 +2,39 @@
 
 package com.javiersc.kotlin.stdlib
 
+/**
+ * Returns second element.
+ *
+ * Throws: `NoSuchElementException` - if the list size is 1.
+ */
 public inline fun <T> Iterable<T>.second(): T = getIndex(2)
 
+/**
+ * Returns third element.
+ *
+ * Throws: `NoSuchElementException` - if the list size is 2.
+ */
 public inline fun <T> Iterable<T>.third(): T = getIndex(3)
 
+/**
+ * Returns forth element.
+ *
+ * Throws: `NoSuchElementException` - if the list size is 3.
+ */
 public inline fun <T> Iterable<T>.forth(): T = getIndex(4)
 
+/**
+ * Returns fifth element.
+ *
+ * Throws: `NoSuchElementException` - if the list size is 4.
+ */
 public inline fun <T> Iterable<T>.fifth(): T = getIndex(5)
 
+/**
+ * Returns penultimate element.
+ *
+ * Throws: `NoSuchElementException` - if the list size is 1.
+ */
 public inline fun <T> Iterable<T>.penultimate(): T {
     return when (this) {
         is List -> this[size - 2]
@@ -30,7 +55,8 @@ public inline fun <T> Iterable<T>.penultimate(): T {
     }
 }
 
-public inline fun <T> Iterable<T>.getIndex(index: Int): T {
+@PublishedApi
+internal inline fun <T> Iterable<T>.getIndex(index: Int): T {
     return when (this) {
         is List -> this[index - 1]
         else -> {
@@ -48,5 +74,5 @@ public inline fun <T> Iterable<T>.getIndex(index: Int): T {
 }
 
 @PublishedApi
-internal fun throwNoSuchElementException(size: Int): Unit =
+internal inline fun throwNoSuchElementException(size: Int): Unit =
     throw NoSuchElementException("Collection size is lower than $size.")

kotlin-stdlib/commonMain/kotlin/Strings.kt

@@ -1,7 +1,24 @@
 package com.javiersc.kotlin.stdlib
 
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
+
 /**
  * Returns a new string obtained by removing all occurrences of the [value] substring in this string
  */
-public fun String.remove(value: String, ignoreCase: Boolean = false): String =
+public inline fun String.remove(value: String, ignoreCase: Boolean = false): String =
     replace(oldValue = value, newValue = "", ignoreCase = ignoreCase)
+
+@OptIn(ExperimentalContracts::class)
+public inline fun CharSequence?.isNotNullNorBlank(): Boolean {
+    contract { returns(false) implies (this@isNotNullNorBlank == null) }
+
+    return this != null && isNotBlank()
+}
+
+@OptIn(ExperimentalContracts::class)
+public inline fun CharSequence?.isNotNullNorEmpty(): Boolean {
+    contract { returns(false) implies (this@isNotNullNorEmpty == null) }
+
+    return this != null && isNotEmpty()
+}

kotlin-stdlib/commonTest/kotlin/CollectionsTest.kt

@@ -1,6 +1,7 @@
 @file:Suppress("MagicNumber")
 
-import com.javiersc.kotlin.stdlib.second
+package com.javiersc.kotlin.stdlib
+
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
@@ -12,4 +13,24 @@ class CollectionsTest {
     fun collection_second() {
         assertTrue { numbers.second() == 2 }
     }
+
+    @Test
+    fun collection_third() {
+        assertTrue { numbers.third() == 3 }
+    }
+
+    @Test
+    fun collection_forth() {
+        assertTrue { numbers.forth() == 4 }
+    }
+
+    @Test
+    fun collection_fifth() {
+        assertTrue { numbers.forth() == 5 }
+    }
+
+    @Test
+    fun collection_penultimate() {
+        assertTrue { numbers.penultimate() == 9 }
+    }
 }

kotlin-stdlib/commonTest/kotlin/StringsTest.kt

@@ -0,0 +1,30 @@
+package com.javiersc.kotlin.stdlib
+
+import kotlin.test.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class StringsTest {
+
+    @Test
+    fun string_remove() {
+        assertTrue { "Hello, World".remove("Hello, ") == "World" }
+    }
+
+    @Test
+    fun string_isNotNullNorEmpty_and_string_isNotNullNorBlank() {
+        val nullable: String? = null
+        val blank = " "
+        val empty = ""
+        val notBlank = "Hello, World"
+
+        assertFalse { nullable.isNotNullNorBlank() }
+        assertFalse { nullable.isNotNullNorEmpty() }
+        assertFalse { blank.isNotNullNorBlank() }
+        assertTrue { blank.isNotNullNorEmpty() }
+        assertFalse { empty.isNotNullNorBlank() }
+        assertFalse { empty.isNotNullNorEmpty() }
+        assertTrue { notBlank.isNotNullNorBlank() }
+        assertTrue { notBlank.isNotNullNorEmpty() }
+    }
+}