(WIP) fix wrong merge conflict resolution

SonarSource · Nov 27, 2024 · 6c4600d · 6c4600d
1 parent 265f61b
commit 6c4600d
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 11 deletions.
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
diff --git a/sonar-kotlin-api/src/test/java/org/sonarsource/kotlin/api/frontend/K2Test.kt b/sonar-kotlin-api/src/test/java/org/sonarsource/kotlin/api/frontend/K2Test.kt
@@ -34,7 +34,6 @@ class K2Test {
             System.getProperty("java.class.path").split(File.pathSeparatorChar),
             LanguageVersion.LATEST_STABLE,
             JvmTarget.JVM_1_8,
-            0
         )
         val analysisSession = createK2AnalysisSession(
             disposable,

diff --git a/...in-checks/src/main/java/org/sonarsource/kotlin/checks/CollectionShouldBeImmutableCheck.kt b/...in-checks/src/main/java/org/sonarsource/kotlin/checks/CollectionShouldBeImmutableCheck.kt
@@ -26,11 +26,6 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
 import org.jetbrains.kotlin.js.descriptorUtils.getKotlinTypeFqName
-import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
-import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.sonar.check.Rule
 import org.sonarsource.kotlin.api.checks.*
 import org.sonarsource.kotlin.api.frontend.KotlinFileContext