From 30e49c08793aa191bcf5ce4af01a2f2685860ea0 Mon Sep 17 00:00:00 2001 From: Evgenii Mazhukin Date: Thu, 14 Sep 2023 19:11:56 +0200 Subject: [PATCH] [IC] Refactoring - Remove obsolete forceExhaustiveWhen util --- .../incremental/IncrementalJvmCompilerRunner.kt | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt index 4f8d6868d1c..8665ff464b5 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt @@ -239,11 +239,11 @@ open class IncrementalJvmCompilerRunner( reporter.info { "Could not get classpath changes: ${changedAndImpactedSymbols.reason}" } return CompilationMode.Rebuild(changedAndImpactedSymbols.reason) } - is ChangesEither.Known -> Unit - }.forceExhaustiveWhen() - - dirtyFiles.addByDirtySymbols(changedAndImpactedSymbols.lookupSymbols) - dirtyFiles.addByDirtyClasses(changedAndImpactedSymbols.fqNames) + is ChangesEither.Known -> { + dirtyFiles.addByDirtySymbols(changedAndImpactedSymbols.lookupSymbols) + dirtyFiles.addByDirtyClasses(changedAndImpactedSymbols.fqNames) + } + } reporter.measure(GradleBuildTime.IC_ANALYZE_CHANGES_IN_JAVA_SOURCES) { if (!usePreciseJavaTracking) { @@ -295,13 +295,6 @@ open class IncrementalJvmCompilerRunner( ) } - /** - * Helper function to force exhaustive when for statements (see https://youtrack.jetbrains.com/issue/KT-47709). - * - * If the current IDE/Kotlin compiler already supports exhaustive when for statements, consider removing this function and its usages. - */ - private fun Any.forceExhaustiveWhen() = this - private fun processChangedJava(changedFiles: ChangedFiles.Known, caches: IncrementalJvmCachesManager): BuildAttribute? { val javaFiles = (changedFiles.modified + changedFiles.removed).filter(File::isJavaFile)