Fix S6524 to comply with its description

SonarSource · Nov 22, 2024 · 12cd69f · 12cd69f
1 parent de3dbb4
commit 12cd69f
Show file tree

Hide file tree

Showing 7 changed files with 165 additions and 190 deletions.
diff --git a/its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java b/its/ruling/src/test/java/org/sonarsource/slang/SlangRulingTest.java
@@ -103,7 +103,7 @@ private static void addLanguagePlugins(OrchestratorBuilder builder) {
   }
 
   @Test
-  @EnabledIfEnvironmentVariable(named = "KOTLIN_COMPILER_IT_ENABLED", matches = "true")
+  //@EnabledIfEnvironmentVariable(named = "KOTLIN_COMPILER_IT_ENABLED", matches = "true")
   void test_kotlin_compiler() throws IOException {
     List<String> exclusions = List.of(
       "**/testData/**/*",

diff --git a/its/ruling/src/test/resources/expected/kotlin/corda/kotlin-S6524.json b/its/ruling/src/test/resources/expected/kotlin/corda/kotlin-S6524.json
@@ -0,0 +1,14 @@
+{
+"kotlin-corda-project:sources/kotlin/corda/experimental/behave/src/main/kotlin/net/corda/behave/file/LogSource.kt": [
+27
+],
+"kotlin-corda-project:sources/kotlin/corda/node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt": [
+170
+],
+"kotlin-corda-project:sources/kotlin/corda/node/src/test/kotlin/net/corda/node/utilities/PersistentMapTests.kt": [
+152
+],
+"kotlin-corda-project:sources/kotlin/corda/serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolvabilityTests.kt": [
+183
+]
+}
diff --git a/its/ruling/src/test/resources/expected/kotlin/kotlin-language-server/kotlin-S6524.json b/its/ruling/src/test/resources/expected/kotlin/kotlin-language-server/kotlin-S6524.json
@@ -0,0 +1,5 @@
+{
+"kotlin-kotlin-language-server-project:server/src/main/kotlin/org/javacs/kt/completion/RenderCompletionItem.kt": [
+96
+]
+}
diff --git a/kotlin-checks-test-sources/src/main/kotlin/checks/CollectionShouldBeImmutableCheckSample.kt b/kotlin-checks-test-sources/src/main/kotlin/checks/CollectionShouldBeImmutableCheckSample.kt
@@ -1,10 +1,28 @@
 package checks
 
+fun compliantScopedFunctions(
+    a: MutableList<Int>, // Compliant
+    b: MutableList<Int>, // Compliant
+    c: MutableList<Int>, // Compliant
+    d: MutableList<Int>, // Compliant
+    e: MutableList<Int>, // Compliant
+    f: MutableList<Int>, // Compliant
+    crazy: MutableList<Int>,
+): Unit { // Compliant
+    a.let { it.add(1) }
+    b.also { it.add(1) }
+    c.apply { add(1) }
+    d.run { add(1) }
+    with(e) { add(1) }
+    f.let { it.let { it.let { it.add(1) } } }
+    crazy.let { it.also { it.apply { it.run { with(this) { it.add(1) } } } } }
+}
+
 class CollectionShouldBeImmutableCheckSample {
-    fun MutableCollection<Int>.doSomething(): Unit {} // Noncompliant
+    fun MutableCollection<Int>.doSomething(): Unit {} // Don't report extension functions
 
     //let also apply run with
-    fun nonCompliant(
+    fun nonCompliantXYZ(
         x: MutableList<Int>, // Noncompliant {{Make this collection immutable.}}
         y: MutableSet<String>,  // Noncompliant
 //      ^^^^^^^^^^^^^^^^^^^^^
@@ -37,31 +55,15 @@ class CollectionShouldBeImmutableCheckSample {
     fun List<Int>.toList(): List<Int> = this // compliant
     fun baz(list : MutableList<Int>): Unit {} // Noncompliant
 
+
+    //Declared on immutable
     fun List<Int>.foo(): Unit {} // Compliant
     fun doNothing(a : List<Int>, b : Set<String>, c : Map<Int,Int>): Unit {}
     fun doNothing(a : List<Int>): List<Int> { return a } // Compliant
 
     fun <A>id(a : A): A = a // Compliant
 
-    fun compliantScopedFunctions(
-        a: MutableList<Int>, // Compliant
-        b: MutableList<Int>, // Compliant
-        c: MutableList<Int>, // Compliant
-        d: MutableList<Int>, // Compliant
-        e: MutableList<Int>, // Compliant
-        f: MutableList<Int>, // Compliant
-        crazy: MutableList<Int>,
-    ): Unit { // Compliant
-        a.let { it.add(1) }
-        b.also { it.add(1) }
-        c.apply { add(1) }
-        d.run { add(1) }
-        with(e) { add(1) }
-        f.let { it.let { it.let { it.add(1) } } }
-        crazy.let { it.also { it.apply { it.run { with(this) { it.add(1) } } } } }
-    }
-
-    fun MutableList<Int>.doSomething2(): MutableList<Int> { return this } // Noncompliant
+    fun MutableList<Int>.doSomething2(): MutableList<Int> { return this } // Don't report extension functions
 
     fun compliantFunctionsCalledOn(
         a: MutableList<Int>, // Compliant
@@ -163,8 +165,7 @@ class CollectionShouldBeImmutableCheckSample {
         if(add(1)) {}
     }
 
-    fun MutableList<Int>.noncompliantDelegate(): Int { // Noncompliant
-//      ^^^^^^^^^^^^^^^^
+    fun MutableList<Int>.noncompliantDelegate(): Int { // Don't report extension functions
         return reduce { acc, it -> acc + it}
     }
 
@@ -229,7 +230,7 @@ class CollectionShouldBeImmutableCheckSample {
 
     interface A {
         fun foo(list : MutableList<Int>): Unit // compliant
-        fun bar(list : MutableList<Int>): Int { // compliant
+        fun bar(list : MutableList<Int>): Int { // Noncompliant
             return list.reduce { acc, it -> acc + it}
         }
     }
@@ -253,3 +254,11 @@ private fun nonCompliantParameterOnFileLevel(list: MutableList<Int>): Int { // N
 
 // https://sonarsource.atlassian.net/browse/SONARKT-388
 private fun <T> intersectionType(t: T) = if (t is String) listOf(t) else emptyList()
+
+fun sum123(acc: List<Int>): Int {
+    val list = mutableListOf(1,2,3) // Noncompliant
+    val list2: List<Int> = mutableListOf(1,2,3) // Compliant, immutable type specified
+
+    list2.size
+    return list.reduce { acc, item -> acc + item}
+}
diff --git a/...-test-sources/src/main/kotlin/checks/CollectionShouldBeImmutableCheckSampleNoSemantics.kt b/...-test-sources/src/main/kotlin/checks/CollectionShouldBeImmutableCheckSampleNoSemantics.kt
@@ -1,8 +1,7 @@
 package checks
 
 class CollectionShouldBeImmutableCheckSampleNoSemantics {
-    fun MutableCollection<Int>.doSomething(): Unit {} // Noncompliant
-//      ^^^^^^^^^^^^^^^^^^^^^^
+    fun MutableCollection<Int>.doSomething(): Unit {} // Don't report extension functions
 
     //let also apply run with
     fun nonCompliant(
@@ -63,8 +62,7 @@ class CollectionShouldBeImmutableCheckSampleNoSemantics {
         crazy.let { it.also { it.apply { it.run { with(this) { it.add(1) } } } } }
     }
 
-    fun MutableList<Int>.doSomething2(): MutableList<Int> { return this } // Noncompliant
-//      ^^^^^^^^^^^^^^^^
+    fun MutableList<Int>.doSomething2(): MutableList<Int> { return this } // Don't report extension functions
 
     fun compliantFunctionsCalledOn(
         a: MutableList<Int>, // Compliant
@@ -219,4 +217,4 @@ class CollectionShouldBeImmutableCheckSampleNoSemantics {
     fun foo(configure: (MutableMap<String, Any?>) -> Unit): Unit { // compliant
     }
 
-}
+}
diff --git a/sonar-kotlin-api/src/main/java/org/sonarsource/kotlin/api/checks/ApiExtensions.kt b/sonar-kotlin-api/src/main/java/org/sonarsource/kotlin/api/checks/ApiExtensions.kt
@@ -522,7 +522,10 @@ fun KtProperty.determineTypeAsString(bindingContext: BindingContext, printTypeAr
     determineType(bindingContext)?.getKotlinTypeFqName(printTypeArguments)
 
 fun KtExpression.determineTypeAsString(bindingContext: BindingContext, printTypeArguments: Boolean = false) =
-    determineType(bindingContext)?.getKotlinTypeFqName(printTypeArguments)
+    determineType(bindingContext)?.let {
+        if (it.constructor.declarationDescriptor != null) it.getKotlinTypeFqName(printTypeArguments)
+        else null
+    }
 
 private fun KtParameter.determineType(bindingContext: BindingContext) =
     bindingContext[BindingContext.TYPE, typeReference]