Also check USELESS_ELVIS in UnreachableCode

detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt

@@ -721,7 +721,7 @@ private val SAMPLE_ACTIVITY_USING_VIEW_BINDING = """
 
         override fun onCreate(savedInstanceState: Bundle?) {
             binding = ActivitySampleBinding.inflate(LayoutInflater.from(this))
-            binding.sampleView ?: return
+            binding.sampleView
             setContentView(binding.root)
         }
     }

detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/UnreachableCode.kt

@@ -43,7 +43,9 @@ class UnreachableCode(config: Config = Config.empty) : Rule(config) {
 
     override fun visitExpression(expression: KtExpression) {
         super.visitExpression(expression)
-        if (bindingContext.diagnostics.forElement(expression).any { it.factory == Errors.UNREACHABLE_CODE }) {
+        if (bindingContext.diagnostics.forElement(expression)
+                .any { it.factory == Errors.UNREACHABLE_CODE || it.factory == Errors.USELESS_ELVIS }
+        ) {
             report(
                 CodeSmell(
                     issue,

detekt-rules-errorprone/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/UnreachableCodeSpec.kt

@@ -169,4 +169,16 @@ class UnreachableCodeSpec(private val env: KotlinCoreEnvironment) {
         """.trimIndent()
         assertThat(subject.compileAndLintWithContext(env, code)).hasSize(1)
     }
+
+    @Test
+    fun `reports unreachable code after elvis`() {
+        val code = """
+            fun test() {
+                val a = 2 ?: run {
+                    3
+                }
+            }
+        """.trimIndent()
+        assertThat(subject.compileAndLintWithContext(env, code)).hasSize(1)
+    }
 }