From 1893a6e15bcece200c8b5a6cbb98e5bd968deddb Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 8 Feb 2016 16:26:50 +0300 Subject: [PATCH] Remove getting lookups with generated classes fq-names KT-8487 --- .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 1a1e4c72668..72f3ee42a5a 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -255,13 +255,6 @@ open class KotlinCompile() : AbstractKotlinCompile() { innerClasses.flatMap { it.findLookupSymbols() } } - fun dirtyLookupSymbolsFromRemovedKotlinFiles(): List { - val removedKotlinFiles = removed.filter { it.isKotlinFile() } - return if (removedKotlinFiles.isNotEmpty()) - targets.flatMap { getIncrementalCache(it).classesBySources(removedKotlinFiles).map { LookupSymbol(it.fqNameForClassNameWithoutDollars.shortName().toString(), it.packageFqName.toString()) } } - else listOf() - } - fun dirtyLookupSymbolsFromModifiedJavaFiles(): List { val modifiedJavaFiles = modified.filter { it.isJavaFile() } return (if (modifiedJavaFiles.any()) { @@ -282,9 +275,7 @@ open class KotlinCompile() : AbstractKotlinCompile() { fun dirtyKotlinSourcesFromGradle(): Set { // TODO: handle classpath changes similarly - compare with cashed version (likely a big change, may be costly, some heuristics could be considered) val modifiedKotlinFiles = modified.filter { it.isKotlinFile() }.toMutableSet() - val lookupSymbols = - dirtyLookupSymbolsFromModifiedJavaFiles() + - dirtyLookupSymbolsFromRemovedKotlinFiles() + val lookupSymbols = dirtyLookupSymbolsFromModifiedJavaFiles() // TODO: add dirty lookups from modified kotlin files to reduce number of steps needed if (lookupSymbols.any()) { @@ -362,6 +353,7 @@ open class KotlinCompile() : AbstractKotlinCompile() { it.markOutputClassesDirty(removedKotlinFiles) it.removeClassfilesBySources(removedKotlinFiles) }} + return Pair(dirtyFiles, true) }