Skip to content

Commit 32b4259

Browse files
authored
Merge pull request #662 from daniel-pichl/fix-string-ioobe
Fix StringIndexOutOfBoundsException in LintUtils
2 parents 135c186 + 9c41770 commit 32b4259

File tree

1 file changed

+6
-1
lines changed
  • lint/src/main/kotlin/kiwi/orbit/compose/lint/detectors

1 file changed

+6
-1
lines changed

lint/src/main/kotlin/kiwi/orbit/compose/lint/detectors/LintUtils.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.psi.KtParameter
2626
import org.jetbrains.kotlin.psi.KtSimpleNameExpression
2727
import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
2828
import org.jetbrains.kotlin.psi.psiUtil.isAncestor
29+
import org.jetbrains.kotlin.utils.addToStdlib.lastIndexOfOrNull
2930
import org.jetbrains.uast.UCallExpression
3031
import org.jetbrains.uast.ULambdaExpression
3132
import org.jetbrains.uast.toUElement
@@ -36,7 +37,11 @@ internal fun PsiMethod.isInPackageName(packageName: String): Boolean {
3637
}
3738

3839
internal fun PsiElement.getPackageName(): String? = when (this) {
39-
is PsiMember -> this.containingClass?.qualifiedName?.let { it.substring(0, it.lastIndexOf(".")) }
40+
is PsiMember -> this.containingClass?.qualifiedName?.let {
41+
it.lastIndexOfOrNull('.')?.let { endIndex ->
42+
it.substring(0, endIndex)
43+
}
44+
}
4045
else -> null
4146
}
4247

0 commit comments

Comments
 (0)