From 3e9d81292addd149c5f27a173e6232f1c06fb6a1 Mon Sep 17 00:00:00 2001
From: Sidney Beekhoven <903673+dizney@users.noreply.github.com>
Date: Wed, 12 Oct 2022 16:28:03 +0200
Subject: [PATCH] Report if/else as issue location instead of block

Report mandatory braces issues on the actual if and/or else keywords
instead of the then or else code blocks to prevent hiding potential
other issues in those code blocks.

Closes #5317
---
 .../style/optional/MandatoryBracesIfStatements.kt |  4 ++--
 .../optional/MandatoryBracesIfStatementsSpec.kt   | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/optional/MandatoryBracesIfStatements.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/optional/MandatoryBracesIfStatements.kt
index afa0a20aeec..c189217d140 100644
--- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/optional/MandatoryBracesIfStatements.kt
+++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/optional/MandatoryBracesIfStatements.kt
@@ -43,12 +43,12 @@ class MandatoryBracesIfStatements(config: Config = Config.empty) : Rule(config)
 
         val thenExpression = expression.then ?: return
         if (thenExpression !is KtBlockExpression && hasNewLineAfter(expression.rightParenthesis)) {
-            report(CodeSmell(issue, Entity.from(thenExpression), issue.description))
+            report(CodeSmell(issue, Entity.from(expression.ifKeyword), issue.description))
         }
 
         val elseExpression = expression.`else` ?: return
         if (mustBeOnSameLine(elseExpression) && hasNewLineAfter(expression.elseKeyword)) {
-            report(CodeSmell(issue, Entity.from(elseExpression), issue.description))
+            report(CodeSmell(issue, Entity.from(expression.elseKeyword ?: elseExpression), issue.description))
         }
     }
 
diff --git a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/optional/MandatoryBracesIfStatementsSpec.kt b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/optional/MandatoryBracesIfStatementsSpec.kt
index eac743c8ce0..8b47f72a371 100644
--- a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/optional/MandatoryBracesIfStatementsSpec.kt
+++ b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/optional/MandatoryBracesIfStatementsSpec.kt
@@ -24,7 +24,7 @@ class MandatoryBracesIfStatementsSpec {
             )
 
             assertThat(findings).hasSize(1)
-            assertThat(findings).hasTextLocations(32 to 41)
+            assertThat(findings).hasTextLocations(14 to 16)
         }
 
         @Test
@@ -54,6 +54,7 @@ class MandatoryBracesIfStatementsSpec {
             )
 
             assertThat(findings).hasSize(2)
+            assertThat(findings).hasTextLocations(11 to 13, 44 to 48)
         }
 
         @Test
@@ -70,7 +71,7 @@ class MandatoryBracesIfStatementsSpec {
             )
 
             assertThat(findings).hasSize(2)
-            assertThat(findings).hasTextLocations(32 to 41, 59 to 68)
+            assertThat(findings).hasTextLocations(14 to 16, 46 to 50)
         }
 
         @Test
@@ -89,7 +90,7 @@ class MandatoryBracesIfStatementsSpec {
             )
 
             assertThat(findings).hasSize(3)
-            assertThat(findings).hasTextLocations(32 to 41, 70 to 79, 97 to 106)
+            assertThat(findings).hasTextLocations(14 to 16, 51 to 53, 84 to 88)
         }
 
         @Test
@@ -106,7 +107,7 @@ class MandatoryBracesIfStatementsSpec {
             )
 
             assertThat(findings).hasSize(1)
-            assertThat(findings).hasTextLocations(63 to 72)
+            assertThat(findings).hasTextLocations(50 to 54)
         }
 
         @Test
@@ -124,7 +125,7 @@ class MandatoryBracesIfStatementsSpec {
             )
 
             assertThat(findings).hasSize(1)
-            assertThat(findings).hasTextLocations(32 to 41)
+            assertThat(findings).hasTextLocations(14 to 16)
         }
 
         @Test
@@ -139,7 +140,7 @@ class MandatoryBracesIfStatementsSpec {
             )
 
             assertThat(findings).hasSize(1)
-            assertThat(findings).hasTextLocations(24 to 33)
+            assertThat(findings).hasTextLocations(14 to 16)
         }
 
         @Test
@@ -154,7 +155,7 @@ class MandatoryBracesIfStatementsSpec {
             )
 
             assertThat(findings).hasSize(1)
-            assertThat(findings).hasTextLocations(47 to 56)
+            assertThat(findings).hasTextLocations(34 to 38)
         }
     }