Remove getting lookups with generated classes fq-names

KT-8487
This commit is contained in:
Alexey Tsvetkov
2016-02-08 16:26:50 +03:00
parent c955a399a3
commit 1893a6e15b
@@ -255,13 +255,6 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
innerClasses.flatMap { it.findLookupSymbols() }
}
fun dirtyLookupSymbolsFromRemovedKotlinFiles(): List<LookupSymbol> {
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<LookupSymbol> {
val modifiedJavaFiles = modified.filter { it.isJavaFile() }
return (if (modifiedJavaFiles.any()) {
@@ -282,9 +275,7 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
fun dirtyKotlinSourcesFromGradle(): Set<File> {
// 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<K2JVMCompilerArguments>() {
it.markOutputClassesDirty(removedKotlinFiles)
it.removeClassfilesBySources(removedKotlinFiles)
}}
return Pair(dirtyFiles, true)
}