azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove getting lookups with generated classes fq-names

Browse Source 
KT-8487
This commit is contained in:
Alexey Tsvetkov
2016-02-08 16:26:50 +03:00
parent c955a399a3
commit 1893a6e15b
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+2 -10
View File
@@ -255,13 +255,6 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
innerClasses.flatMap { it.findLookupSymbols() } 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> { fun dirtyLookupSymbolsFromModifiedJavaFiles(): List<LookupSymbol> {
val modifiedJavaFiles = modified.filter { it.isJavaFile() } val modifiedJavaFiles = modified.filter { it.isJavaFile() }
return (if (modifiedJavaFiles.any()) { return (if (modifiedJavaFiles.any()) {
@@ -282,9 +275,7 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
fun dirtyKotlinSourcesFromGradle(): Set<File> { 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) // 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 modifiedKotlinFiles = modified.filter { it.isKotlinFile() }.toMutableSet()
val lookupSymbols = val lookupSymbols = dirtyLookupSymbolsFromModifiedJavaFiles()
dirtyLookupSymbolsFromModifiedJavaFiles() +
dirtyLookupSymbolsFromRemovedKotlinFiles()
// TODO: add dirty lookups from modified kotlin files to reduce number of steps needed // TODO: add dirty lookups from modified kotlin files to reduce number of steps needed
if (lookupSymbols.any()) { if (lookupSymbols.any()) {
@@ -362,6 +353,7 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
it.markOutputClassesDirty(removedKotlinFiles) it.markOutputClassesDirty(removedKotlinFiles)
it.removeClassfilesBySources(removedKotlinFiles) it.removeClassfilesBySources(removedKotlinFiles)
}} }}
return Pair(dirtyFiles, true) return Pair(dirtyFiles, true)
} }