jlengrand/detekt
1
0
Fork 0
mirror of https://github.com/jlengrand/detekt.git synced 2026-03-10 08:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address feedback on #4139 (#4143)

Browse Source 
* Reverse behaviour change introduced in #4139

https://github.com/detekt/detekt/pull/4139/files#r719991365

* Handle nullability at call site

https://github.com/detekt/detekt/pull/4139/files#r719992612
This commit is contained in:
Matthew Haughton
2021-10-02 18:19:42 +10:00
committed by GitHub
parent e05eec5b16
commit ee0ae169f8
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/Main.kt
View File

@@ -32,8 +32,9 @@ fun main(args: Array<String>) {
else -> cause.printStackTrace()
}
}
else -> exitProcess(result.exitCode())
else -> Unit // print nothing extra when there is no error
}
exitProcess(result.exitCode())
}
@NotApiButProbablyUsedByUsers

2
detekt-psi-utils/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/Junk.kt
View File

@@ -37,7 +37,7 @@ fun getIntValueForPsiElement(element: PsiElement): Int? {
fun KtClass.companionObject() = this.companionObjects.singleOrNull { it.isCompanion() }
inline fun <reified T : Any> Any?.safeAs(): T? = this as? T
inline fun <reified T : Any> Any.safeAs(): T? = this as? T
fun KtCallExpression.receiverIsUsed(context: BindingContext): Boolean =
(parent as? KtQualifiedExpression)?.let {

6
detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseIsNullOrEmpty.kt
View File

@@ -77,7 +77,7 @@ class UseIsNullOrEmpty(config: Config = Config.empty) : Rule(config) {
right.isNullKeyword() -> left
left.isNullKeyword() -> right
else -> null
}.safeAs<KtSimpleNameExpression>()?.takeIf { it.getType(bindingContext)?.isNullable() == true }
}?.safeAs<KtSimpleNameExpression>()?.takeIf { it.getType(bindingContext)?.isNullable() == true }
}
private fun KtExpression.sizeCheckedExpression(): KtSimpleNameExpression? {
@@ -131,8 +131,8 @@ class UseIsNullOrEmpty(config: Config = Config.empty) : Rule(config) {
private fun KtExpression?.isEmptyString() = this?.text == "\"\""
private fun KtExpression?.isCalling(fqNames: List<FqName>): Boolean {
val callExpression = safeAs()
?: safeAs<KtDotQualifiedExpression>()?.selectorExpression.safeAs<KtCallExpression>()
val callExpression = this?.safeAs()
?: safeAs<KtDotQualifiedExpression>()?.selectorExpression?.safeAs<KtCallExpression>()
?: return false
return callExpression.calleeExpression?.text in fqNames.map { it.shortName().asString() } &&
callExpression.getResolvedCall(bindingContext)?.resultingDescriptor?.fqNameOrNull() in fqNames