diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtSymbolByFirBuilder.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtSymbolByFirBuilder.kt index 792d755c2df..7576b01936b 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtSymbolByFirBuilder.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtSymbolByFirBuilder.kt @@ -507,8 +507,7 @@ internal class KtSymbolByFirBuilder private constructor( val containingClass = getContainingClass(rootSession) ?: return null val originalDeclaration = originalForSubstitutionOverride ?: return null - @Suppress("RemoveExplicitTypeArguments") - val allowedTypeParameters = buildSet { + val allowedTypeParameters = buildSet { // declaration's own parameters originalDeclaration.typeParameters.mapTo(this) { it.symbol.toLookupTag() } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt index 643a61d7a22..8cf9db4ff17 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt @@ -31,7 +31,7 @@ abstract class AbstractCollectDiagnosticsTest : AbstractHLApiSingleFileTest() { analyseForTest(ktFile) { val diagnosticsInFile = ktFile.collectDiagnosticsForFile(KtDiagnosticCheckerFilter.EXTENDED_AND_COMMON_CHECKERS).map { it.getKey() }.sorted() - @Suppress("RemoveExplicitTypeArguments") val diagnosticsFromElements = buildList> { + val diagnosticsFromElements = buildList { ktFile.accept(object : KtTreeVisitorVoid() { override fun visitKtElement(element: KtElement) { for (diagnostic in element.getDiagnostics(KtDiagnosticCheckerFilter.EXTENDED_AND_COMMON_CHECKERS)) { diff --git a/compiler/backend.common.jvm/src/org/jetbrains/kotlin/types/AbstractTypeMapper.kt b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/types/AbstractTypeMapper.kt index 417919c8341..61373fe461e 100644 --- a/compiler/backend.common.jvm/src/org/jetbrains/kotlin/types/AbstractTypeMapper.kt +++ b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/types/AbstractTypeMapper.kt @@ -58,8 +58,7 @@ object AbstractTypeMapper { val argumentsCount = type.argumentsCount() val argumentsList = type.asArgumentList() - @Suppress("RemoveExplicitTypeArguments") // Workaround for KT-42175 - val arguments = buildList { + val arguments = buildList { for (i in 0 until (argumentsCount - 1)) { this += argumentsList[i].adjustedType() } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/TailCallOptimization.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/TailCallOptimization.kt index 64fddcc7fd1..e63dbee14f6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/TailCallOptimization.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/TailCallOptimization.kt @@ -203,12 +203,11 @@ internal class MethodNodeExaminer( for (index in insns.indices.reversed()) { if (insns[index].opcode == Opcodes.ARETURN) continue - @Suppress("RemoveExplicitTypeArguments") val newResult = controlFlowGraph .getSuccessorsIndices(index).plus(index) .map(reachableReturnsIndices::get) - .fold?, Set?>(mutableSetOf()) { acc, successorsResult -> + .fold?, Set?>(mutableSetOf()) { acc, successorsResult -> if (acc != null && successorsResult != null) acc + successorsResult else null } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolver.kt index 93851c6f036..d7b1f52b829 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolver.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolver.kt @@ -125,7 +125,6 @@ class FirStatusResolver( return emptyList() } - @Suppress("RemoveExplicitTypeArguments") // Workaround for KT-42175 return buildList { val scope = containingClass.unsubstitutedScope(session, scopeSession, withForcedTypeCalculator = false) val symbol = function.symbol diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt index cfb6f519a61..36af9418021 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt @@ -36,16 +36,15 @@ fun F.runTypeResolvePhaseForLocalClass( useSiteFile: FirFile, containingDeclarations: List, ): F { - @Suppress("RemoveExplicitTypeArguments") val transformer = FirTypeResolveTransformer( session, scopeSession, currentScopeList, initialCurrentFile = useSiteFile, - classDeclarationsStack = containingDeclarations.filterIsInstanceTo>(ArrayDeque()) + classDeclarationsStack = containingDeclarations.filterIsInstanceTo(ArrayDeque()) ) - return this.transform(transformer, null) + return this.transform(transformer, null) } open class FirTypeResolveTransformer( diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ResolveInlineCalls.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ResolveInlineCalls.kt index ff3a59d7874..36429327752 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ResolveInlineCalls.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ResolveInlineCalls.kt @@ -24,7 +24,6 @@ import org.jetbrains.kotlin.ir.util.parentAsClass import org.jetbrains.kotlin.ir.util.resolveFakeOverride import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid -@Suppress("RemoveExplicitTypeArguments") internal val resolveInlineCallsPhase = makeIrModulePhase( ::ResolveInlineCalls, name = "ResolveInlineCalls", diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt index 7d16b13aeee..028b505e4e2 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/directives/LanguageSettingsDirectives.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.config.ExplicitApiMode import org.jetbrains.kotlin.config.JvmDefaultMode import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer -@Suppress("RemoveExplicitTypeArguments") object LanguageSettingsDirectives : SimpleDirectivesContainer() { val LANGUAGE by stringDirective( description = """ @@ -20,7 +19,6 @@ object LanguageSettingsDirectives : SimpleDirectivesContainer() { """.trimIndent() ) - @Suppress("RemoveExplicitTypeArguments") val API_VERSION by valueDirective( description = "Version of Kotlin API", parser = this::parseApiVersion @@ -43,7 +41,7 @@ object LanguageSettingsDirectives : SimpleDirectivesContainer() { description = "Allow using Result in return type position" ) - val EXPLICIT_API_MODE by enumDirective( + val EXPLICIT_API_MODE by enumDirective( "Configures explicit API mode (AnalysisFlags.explicitApiMode)", additionalParser = ExplicitApiMode.Companion::fromString ) @@ -54,7 +52,7 @@ object LanguageSettingsDirectives : SimpleDirectivesContainer() { // --------------------- Jvm Analysis Flags --------------------- - val JVM_DEFAULT_MODE by enumDirective( + val JVM_DEFAULT_MODE by enumDirective( description = "Configures corresponding analysis flag (JvmAnalysisFlags.jvmDefaultMode)", additionalParser = JvmDefaultMode.Companion::fromStringOrNull ) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt index abe416e79ff..aa7f53f82ea 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/ForeignAnnotationsDirectives.kt @@ -11,14 +11,13 @@ import org.jetbrains.kotlin.test.services.configuration.JavaForeignAnnotationTyp import org.jetbrains.kotlin.load.java.ReportLevel import org.jetbrains.kotlin.name.FqName -@Suppress("RemoveExplicitTypeArguments") object ForeignAnnotationsDirectives : SimpleDirectivesContainer() { - val JSR305_GLOBAL_REPORT by enumDirective( + val JSR305_GLOBAL_REPORT by enumDirective( description = "Global report level", additionalParser = ReportLevel.Companion::findByDescription ) - val JSR305_MIGRATION_REPORT by enumDirective( + val JSR305_MIGRATION_REPORT by enumDirective( description = "Migration report level", additionalParser = ReportLevel.Companion::findByDescription ) @@ -27,7 +26,7 @@ object ForeignAnnotationsDirectives : SimpleDirectivesContainer() { description = "Report level for specific annotations" ) - val JSPECIFY_STATE by enumDirective( + val JSPECIFY_STATE by enumDirective( description = "Report level for jSpecify annotations", additionalParser = ReportLevel.Companion::findByDescription ) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JvmEnvironmentConfigurationDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JvmEnvironmentConfigurationDirectives.kt index e77d9f7f8d0..36c0c25d753 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JvmEnvironmentConfigurationDirectives.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/JvmEnvironmentConfigurationDirectives.kt @@ -12,8 +12,7 @@ import org.jetbrains.kotlin.test.directives.model.DirectiveApplicability import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer object JvmEnvironmentConfigurationDirectives : SimpleDirectivesContainer() { - @Suppress("RemoveExplicitTypeArguments") - val JVM_TARGET by enumDirective( + val JVM_TARGET by enumDirective( description = "Target bytecode version", additionalParser = JvmTarget.Companion::fromString ) @@ -50,14 +49,12 @@ object JvmEnvironmentConfigurationDirectives : SimpleDirectivesContainer() { applicability = DirectiveApplicability.Global ) - @Suppress("RemoveExplicitTypeArguments") - val STRING_CONCAT by enumDirective( + val STRING_CONCAT by enumDirective( description = "Configure mode of string concatenation", additionalParser = JvmStringConcat.Companion::fromString ) - @Suppress("RemoveExplicitTypeArguments") - val ASSERTIONS_MODE by enumDirective( + val ASSERTIONS_MODE by enumDirective( description = "Configure jvm assertions mode", additionalParser = JVMAssertionsMode.Companion::fromString ) diff --git a/compiler/tests/org/jetbrains/kotlin/cli/serviceLoaderLite/ServiceLoaderLiteTestWithClassLoader.kt b/compiler/tests/org/jetbrains/kotlin/cli/serviceLoaderLite/ServiceLoaderLiteTestWithClassLoader.kt index 6d5978d676b..904e3ab2e7c 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/serviceLoaderLite/ServiceLoaderLiteTestWithClassLoader.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/serviceLoaderLite/ServiceLoaderLiteTestWithClassLoader.kt @@ -21,8 +21,7 @@ class ServiceLoaderLiteTestWithClassLoader : AbstractServiceLoaderLiteTest() { inner class InnerComponent : Intf fun testClassloader1() { - @Suppress("RemoveExplicitTypeArguments") - val entries = arrayOf(impls(Component1::class, Component2::class), clazz(), clazz()) + val entries = arrayOf(impls(Component1::class, Component2::class), clazz(), clazz()) classLoaderTest("test", *entries) { classLoader -> val impls = ServiceLoaderLite.loadImplementations(classLoader) @@ -62,8 +61,7 @@ class ServiceLoaderLiteTestWithClassLoader : AbstractServiceLoaderLiteTest() { } fun testInterface() { - @Suppress("RemoveExplicitTypeArguments") - classLoaderTest("test", impls(Intf::class), clazz()) { classLoader -> + classLoaderTest("test", impls(Intf::class), clazz()) { classLoader -> assertThrows { ServiceLoaderLite.loadImplementations(classLoader) } diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptIdeConfiguration.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptIdeConfiguration.kt index 414a65dd397..f1757a7bbe0 100644 --- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptIdeConfiguration.kt +++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptIdeConfiguration.kt @@ -29,9 +29,8 @@ val ScriptCompilationConfigurationKeys.ide val IdeScriptCompilationConfigurationKeys.dependenciesSources by PropertiesCollection.key>() -@Suppress("RemoveExplicitTypeArguments") val IdeScriptCompilationConfigurationKeys.acceptedLocations - by PropertiesCollection.key>( + by PropertiesCollection.key( listOf( ScriptAcceptedLocation.Sources, ScriptAcceptedLocation.Tests diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt index 0f9fe48f999..8fa89acfde0 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt @@ -13,9 +13,7 @@ internal data class NameAndSafeValue(val name: String, val safeValue: String) internal object SafeEnvVars : Iterable { private val environment: List by lazy { - // See KT-49925 - @Suppress("RemoveExplicitTypeArguments") - buildList { + buildList { System.getenv().forEach { (name, value) -> val safeValue = if (isSafeEnvVar(name)) doEscape(value) else HIDDEN_VALUE this += NameAndSafeValue(name, safeValue)