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

Minor. Simplified getObsoletePackageParts() and similar functions.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2015-02-04 22:05:18 +03:00
parent 89f3d21ba4
commit 5b89f88447
5 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+1 -1
View File
@@ -344,7 +344,7 @@ public class KotlinToJVMBytecodeCompiler {
} }
else { else {
IncrementalCache incrementalCache = incrementalCacheProvider.getIncrementalCache(moduleId); IncrementalCache incrementalCache = incrementalCacheProvider.getIncrementalCache(moduleId);
packagesWithObsoleteParts = IncrementalPackage.getPackagesWithObsoleteParts(incrementalCache, environment.getSourceFiles()); packagesWithObsoleteParts = IncrementalPackage.getPackagesWithObsoleteParts(incrementalCache);
} }
BindingTraceContext diagnosticHolder = new BindingTraceContext(); BindingTraceContext diagnosticHolder = new BindingTraceContext();
GenerationState generationState = new GenerationState( GenerationState generationState = new GenerationState(
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalCacheUtil.kt
+2 -11
View File
@@ -17,20 +17,11 @@
package org.jetbrains.kotlin.load.kotlin.incremental package org.jetbrains.kotlin.load.kotlin.incremental
import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import java.util.HashMap
import java.io.File
import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
// TODO JetFiles are redundant public fun IncrementalCache.getPackagesWithObsoleteParts(): Collection<FqName> {
public fun IncrementalCache.getPackagesWithObsoleteParts(sourceFilesToCompile: Collection<JetFile>): Collection<FqName> { return getObsoletePackageParts().map { JvmClassName.byInternalName(it).getPackageFqName() }.toSet()
return getObsoletePackageParts(sourceFilesToCompile).map { it.getPackageFqName() }
}
public fun IncrementalCache.getObsoletePackageParts(sourceFilesToCompile: Collection<JetFile>): Collection<JvmClassName> {
return getObsoletePackageParts(sourceFilesToCompile.map { File(it.getVirtualFile()!!.getPath()) }).map { JvmClassName.byInternalName(it) }
} }
public fun IncrementalCache.getPackageData(fqName: FqName): ByteArray? { public fun IncrementalCache.getPackageData(fqName: FqName): ByteArray? {
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
+2 -2
View File
@@ -47,7 +47,7 @@ public class IncrementalPackageFragmentProvider(
val moduleId: String val moduleId: String
) : PackageFragmentProvider { ) : PackageFragmentProvider {
val obsoletePackageParts = incrementalCache.getObsoletePackageParts(sourceFiles).map { it.getInternalName() }.toSet() val obsoletePackageParts = incrementalCache.getObsoletePackageParts().toSet()
val fqNameToSubFqNames = MultiMap<FqName, FqName>() val fqNameToSubFqNames = MultiMap<FqName, FqName>()
val fqNameToPackageFragment = HashMap<FqName, PackageFragmentDescriptor>() val fqNameToPackageFragment = HashMap<FqName, PackageFragmentDescriptor>()
val fqNamesToLoad: Set<FqName> val fqNamesToLoad: Set<FqName>
@@ -67,7 +67,7 @@ public class IncrementalPackageFragmentProvider(
fqNameToPackageFragment[fqName] = IncrementalPackageFragment(fqName) fqNameToPackageFragment[fqName] = IncrementalPackageFragment(fqName)
} }
fqNamesToLoad = incrementalCache.getPackagesWithObsoleteParts(sourceFiles).toSet() fqNamesToLoad = obsoletePackageParts.map { JvmClassName.byInternalName(it).getPackageFqName() }.toSet()
fqNamesToLoad.forEach { createPackageFragment(it) } fqNamesToLoad.forEach { createPackageFragment(it) }
} }
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/cache/IncrementalCache.kt
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.load.kotlin.incremental.cache
import java.io.File import java.io.File
public trait IncrementalCache { public trait IncrementalCache {
public fun getObsoletePackageParts(sourceFilesToCompile: Collection<File>): Collection<String> public fun getObsoletePackageParts(): Collection<String>
public fun getPackageData(fqName: String): ByteArray? public fun getPackageData(fqName: String): ByteArray?
jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+1 -1
View File
@@ -187,7 +187,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen
dirtyOutputClassesMap.clear() dirtyOutputClassesMap.clear()
} }
public override fun getObsoletePackageParts(sourceFilesToCompile: Collection<File>): Collection<String> { public override fun getObsoletePackageParts(): Collection<String> {
return dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } return dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) }
} }