Merge branch 'develop'

Author: santalu

README.md

@@ -100,7 +100,7 @@ allprojects {
 
 ```
 dependencies {
-  implementation 'com.github.santalu:textmatcher:1.0.5'
+  implementation 'com.github.santalu:textmatcher:1.0.6'
 }
 ```
 ## License

library/build.gradle

@@ -8,8 +8,8 @@ android {
   defaultConfig {
     minSdkVersion versions.minSdk
     targetSdkVersion versions.targetSdk
-    versionCode 6
-    versionName "1.0.5"
+    versionCode 7
+    versionName "1.0.6"
     consumerProguardFiles 'consumer-rules.pro'
   }
 

library/src/main/java/com/santalu/textmatcher/TextMatcher.kt

@@ -33,9 +33,12 @@ class TextMatcher(
     if (!isMatchingEnabled) return
 
     rules.forEach {
-      if (text.isNullOrEmpty()) return@forEach action(it, null)
+      if (text.isNullOrEmpty()) {
+        action(it, null)
+        return@forEach
+      }
 
-      val position = if (before > count) start - 1 else start
+      val position = if (start > 0 && before > count) start - 1 else start
 
       // find closest target's boundaries from selection
       val targetStart = it.getTargetStart(text, position)