SwallowedException: fix false positive when exception is used as a re…

…ceiver (#7288)
detekt · May 12, 2024 · 5746604 · 5746604
1 parent b553d95
commit 5746604
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/...ptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/SwallowedException.kt b/...ptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/SwallowedException.kt
@@ -105,11 +105,11 @@ class SwallowedException(config: Config) : Rule(
 
     private fun isExceptionSwallowed(catchClause: KtCatchClause): Boolean {
         val parameterName = catchClause.catchParameter?.name
-        val catchBody = catchClause.catchBody
-        return catchBody?.anyDescendantOfType<KtThrowExpression> { throwExpr ->
-            val parameterReferences = throwExpr.parameterReferences(parameterName, catchBody)
-            parameterReferences.isNotEmpty() && parameterReferences.all { it is KtDotQualifiedExpression }
-        } == true
+        val catchBody = catchClause.catchBody ?: return false
+        return catchBody.anyDescendantOfType<KtThrowExpression> { throwExpr ->
+            val refs = throwExpr.parameterReferences(parameterName, catchBody)
+            refs.isNotEmpty() && refs.all { it is KtDotQualifiedExpression && it.parent !is KtThrowExpression }
+        }
     }
 
     private fun KtThrowExpression.parameterReferences(

diff --git a/...ns/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/SwallowedExceptionSpec.kt b/...ns/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/SwallowedExceptionSpec.kt
@@ -266,6 +266,23 @@ class SwallowedExceptionSpec {
         assertThat(subject.compileAndLint(code)).isEmpty()
     }
 
+    @Test
+    fun `does not report when an exception is used as a receiver and the return value is thrown`() {
+        val code = """
+            fun Exception.transformException(): Exception {
+               return this
+            }
+            
+            fun test() {
+               try {
+               } catch (e: Exception) {
+                  throw e.transformException()
+               }
+            }
+        """.trimIndent()
+        assertThat(subject.compileAndLint(code)).isEmpty()
+    }
+
     @ParameterizedTest(name = "ignores {0} in the catch clause by default")
     @MethodSource("io.gitlab.arturbosch.detekt.rules.exceptions.SwallowedException#getEXCEPTIONS_IGNORED_BY_DEFAULT")
     fun `ignores $exceptionName in the catch clause by default`(exceptionName: String) {