SONARKT-286 Add issue suppression mappings for S6619 (#394)

SonarSource · Nov 28, 2023 · 3e82ecd · 3e82ecd
1 parent 54506e1
commit 3e82ecd
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 4 deletions.
diff --git a/kotlin-checks-test-sources/src/main/kotlin/sample/IssueSuppressionSample.kt b/kotlin-checks-test-sources/src/main/kotlin/sample/IssueSuppressionSample.kt
@@ -80,3 +80,19 @@ private fun S1479(values: List<Int>): List<String> {
         }
     }
 }
+
+private fun UselessNullChecks(foo: String) {
+    @Suppress("kotlin:S6619")
+    foo ?: "bar"
+
+    @Suppress("UNNECESSARY_SAFE_CALL")
+    foo?.plus("bar")
+
+    @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
+    foo != null
+
+    @Suppress("USELESS_ELVIS")
+    foo ?: "bar"
+
+    foo ?: "bar" // Noncompliant
+}
diff --git a/sonar-kotlin-metrics/src/main/java/org/sonarsource/kotlin/metrics/IssueSuppressionVisitor.kt b/sonar-kotlin-metrics/src/main/java/org/sonarsource/kotlin/metrics/IssueSuppressionVisitor.kt
@@ -49,6 +49,10 @@ private val COMPILER_KEY_TO_SONAR_KEYS = mapOf(
     "ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE" to sequenceOf("kotlin:S6615"),
     "UNUSED_VALUE" to sequenceOf("kotlin:S6615"),
     "UNUSED_CHANGED_VALUE" to sequenceOf("kotlin:S6615"),
+    "UNNECESSARY_SAFE_CALL" to sequenceOf("kotlin:S6619"),
+    "UNNECESSARY_NOT_NULL_ASSERTION" to sequenceOf("kotlin:S6619"),
+    "USELESS_ELVIS" to sequenceOf("kotlin:S6619"),
+    "USELESS_NULLABLE_CHECK" to sequenceOf("kotlin:S6619"),
 )
 
 class IssueSuppressionVisitor : KotlinFileVisitor() {

diff --git a/...otlin-metrics/src/test/java/org/sonarsource/kotlin/metrics/IssueSuppressionVisitorTest.kt b/...otlin-metrics/src/test/java/org/sonarsource/kotlin/metrics/IssueSuppressionVisitorTest.kt
@@ -33,6 +33,7 @@ import org.sonarsource.kotlin.checks.BadFunctionNameCheck
 import org.sonarsource.kotlin.checks.DeprecatedCodeUsedCheck
 import org.sonarsource.kotlin.checks.TooManyCasesCheck
 import org.sonarsource.kotlin.checks.UnusedLocalVariableCheck
+import org.sonarsource.kotlin.checks.UselessNullCheckCheck
 import org.sonarsource.kotlin.checks.VariableAndParameterNameCheck
 import org.sonarsource.kotlin.testapi.DEFAULT_KOTLIN_CLASSPATH
 import org.sonarsource.kotlin.testapi.KOTLIN_BASE_DIR
@@ -54,16 +55,36 @@ class IssueSuppressionVisitorTest {
     }
 
     private fun scanWithSuppression(path: Path) =
-        scanFile(path, true, BadClassNameCheck(), BadFunctionNameCheck(), VariableAndParameterNameCheck(), UnusedLocalVariableCheck(), TooManyCasesCheck(), DeprecatedCodeUsedCheck())
+        scanFile(
+            path,
+            true,
+            BadClassNameCheck(),
+            BadFunctionNameCheck(),
+            VariableAndParameterNameCheck(),
+            UnusedLocalVariableCheck(),
+            TooManyCasesCheck(),
+            DeprecatedCodeUsedCheck(),
+            UselessNullCheckCheck(),
+        )
 
     private fun scanWithoutSuppression(path: Path) =
-        scanFile(path, false, BadClassNameCheck(), BadFunctionNameCheck(), VariableAndParameterNameCheck(), UnusedLocalVariableCheck(), TooManyCasesCheck(), DeprecatedCodeUsedCheck())
+        scanFile(
+            path,
+            false,
+            BadClassNameCheck(),
+            BadFunctionNameCheck(),
+            VariableAndParameterNameCheck(),
+            UnusedLocalVariableCheck(),
+            TooManyCasesCheck(),
+            DeprecatedCodeUsedCheck(),
+            UselessNullCheckCheck(),
+        )
 
     private fun scanFile(path: Path, suppress: Boolean, check: AbstractCheck, vararg checks: AbstractCheck): SingleFileVerifier {
-        val env = Environment(DEFAULT_KOTLIN_CLASSPATH, LanguageVersion.LATEST_STABLE)
+        val env = Environment(System.getProperty("java.class.path").split(System.getProperty("path.separator")) + DEFAULT_KOTLIN_CLASSPATH, LanguageVersion.LATEST_STABLE)
         val verifier = SingleFileVerifier.create(path, StandardCharsets.UTF_8)
         val testFileContent = String(Files.readAllBytes(path), StandardCharsets.UTF_8)
-        val inputFile = TestInputFileBuilder("moduleKey",  "src/org/foo/kotlin.kt")
+        val inputFile = TestInputFileBuilder("moduleKey", "src/org/foo/kotlin.kt")
             .setCharset(StandardCharsets.UTF_8)
             .initMetadata(testFileContent)
             .build()