From 5e6442b475fbc86aa687f4b26f7a26be4c0ab31a Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Tue, 17 Aug 2021 14:40:45 +0200 Subject: [PATCH] [FIR IDE] Suppress warnings to build project with warnings-as-errors mode --- .../jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt | 2 +- .../idea/fir/low/level/api/file/builder/LockProvider.kt | 4 ++-- .../level/api/lazy/resolve/FirLazyDeclarationResolveToType.kt | 1 + .../low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt index 63f23b46018..c96f9dc231d 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirPhaseRunner.kt @@ -13,7 +13,7 @@ internal class FirPhaseRunner { * We temporary disable multi-locks to fix deadlocks problem * @see org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.LockProvider */ - inline fun runPhaseWithCustomResolve(phase: FirResolvePhase, crossinline resolve: () -> Unit) = + inline fun runPhaseWithCustomResolve(@Suppress("UNUSED_PARAMETER") phase: FirResolvePhase, crossinline resolve: () -> Unit) = runPhaseWithCustomResolveWithoutLock(resolve) private inline fun runPhaseWithCustomResolveWithoutLock(crossinline resolve: () -> Unit) { diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/LockProvider.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/LockProvider.kt index 68f9d2cc8c9..7f368c74a02 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/LockProvider.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/file/builder/LockProvider.kt @@ -19,11 +19,11 @@ internal class LockProvider { val globalLock = ReentrantLock() @OptIn(PrivateForInline::class) - inline fun withWriteLock(key: KEY, action: () -> R): R = + inline fun withWriteLock(@Suppress("UNUSED_PARAMETER") key: KEY, action: () -> R): R = globalLock.withLock(action) @OptIn(PrivateForInline::class) - inline fun withWriteLockPCECheck(key: KEY, lockingIntervalMs: Long, action: () -> R): R = + inline fun withWriteLockPCECheck(@Suppress("UNUSED_PARAMETER") key: KEY, lockingIntervalMs: Long, action: () -> R): R = globalLock.lockWithPCECheck(lockingIntervalMs, action) //We temporary disable multi-locks to fix deadlocks problem } diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolveToType.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolveToType.kt index a06b5cedfc0..f036112c947 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolveToType.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolveToType.kt @@ -62,6 +62,7 @@ internal fun FirLazyDeclarationResolver.lazyResolveDeclarat } check(currentDeclaration.returnTypeRef is FirResolvedTypeRef) + @Suppress("UNCHECKED_CAST") currentDeclaration as D } ResolveType.BodyResolveWithChildren, ResolveType.CallableBodyResolve -> { diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt index b85f205d083..01fa8daff58 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt @@ -312,6 +312,7 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui check(realPsi != null) { "Cannot remap element without PSI" } + @Suppress("UNCHECKED_CAST") val firDeclaration = FirElementFinder.findElementIn(firContainer) { it.realPsi == realPsi } as? D