From 6c4600d9cfd11edc36283777fd3e3764979001c2 Mon Sep 17 00:00:00 2001 From: Evgeny Mandrikov Date: Wed, 27 Nov 2024 16:34:56 +0100 Subject: [PATCH] (WIP) fix wrong merge conflict resolution --- .../expected/kotlin/kotlin-language-server/kotlin-S6524.json | 5 ----- .../test/java/org/sonarsource/kotlin/api/frontend/K2Test.kt | 1 - .../kotlin/checks/CollectionShouldBeImmutableCheck.kt | 5 ----- 3 files changed, 11 deletions(-) delete mode 100644 its/ruling/src/test/resources/expected/kotlin/kotlin-language-server/kotlin-S6524.json 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 deleted file mode 100644 index ff86170d0..000000000 --- a/its/ruling/src/test/resources/expected/kotlin/kotlin-language-server/kotlin-S6524.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"kotlin-kotlin-language-server-project:server/src/main/kotlin/org/javacs/kt/completion/RenderCompletionItem.kt": [ -96 -] -} 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 index 5b24d9c7d..b3efbdcef 100644 --- 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/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/CollectionShouldBeImmutableCheck.kt b/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/CollectionShouldBeImmutableCheck.kt index 8ab586ad1..5d2cf7414 100644 --- a/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/CollectionShouldBeImmutableCheck.kt +++ b/sonar-kotlin-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