Cleanup RC deprecations in compiler and plugin.

Original commit: 744a7a83f7
This commit is contained in:
Ilya Gorbunov
2016-01-26 21:53:07 +03:00
parent 7ea3a50848
commit 97d529d786
5 changed files with 8 additions and 6 deletions
@@ -830,7 +830,7 @@ private fun withSubtypes(
typeFqName: FqName, typeFqName: FqName,
caches: Sequence<IncrementalCacheImpl<*>> caches: Sequence<IncrementalCacheImpl<*>>
): Set<FqName> { ): Set<FqName> {
val types = linkedListOf(typeFqName) val types = LinkedList(listOf(typeFqName))
val subtypes = hashSetOf<FqName>() val subtypes = hashSetOf<FqName>()
while (types.isNotEmpty()) { while (types.isNotEmpty()) {
@@ -81,7 +81,7 @@ class JpsIncrementalCacheImpl(
private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap<Collection<String>>(storageFile, StringCollectionExternalizer) { private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap<Collection<String>>(storageFile, StringCollectionExternalizer) {
fun getEntries(): Map<JvmClassName, Collection<String>> = fun getEntries(): Map<JvmClassName, Collection<String>> =
storage.keys.toMapBy(JvmClassName::byInternalName) { storage[it]!! } storage.keys.associateBy(JvmClassName::byInternalName) { storage[it]!! }
fun put(className: JvmClassName, changedFunctions: List<String>) { fun put(className: JvmClassName, changedFunctions: List<String>) {
storage[className.internalName] = changedFunctions storage[className.internalName] = changedFunctions
@@ -53,7 +53,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest(
fail("File $actualFile unexpectedly contains multiline comments. In range ${matchResult.range} found: ${matchResult.value} in $text") fail("File $actualFile unexpectedly contains multiline comments. In range ${matchResult.range} found: ${matchResult.value} in $text")
} }
val lines = text.lines().toArrayList() val lines = text.lines().toMutableList()
for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.position.line }) { for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.position.line }) {
val columnToLookups = lookupsFromLine.groupBy { it.position.column }.toList().sortedBy { it.first } val columnToLookups = lookupsFromLine.groupBy { it.position.column }.toList().sortedBy { it.first }
@@ -36,6 +36,8 @@ import java.io.File
import java.io.PrintWriter import java.io.PrintWriter
import java.io.StringWriter import java.io.StringWriter
import java.util.* import java.util.*
import kotlin.comparisons.*
// Set this to true if you want to dump all bytecode (test will fail in this case) // Set this to true if you want to dump all bytecode (test will fail in this case)
val DUMP_ALL = System.getProperty("comparison.dump.all") == "true" val DUMP_ALL = System.getProperty("comparison.dump.all") == "true"
@@ -53,7 +55,7 @@ fun getDirectoryString(dir: File, interestingPaths: List<String>): String {
val listFiles = dir.listFiles() val listFiles = dir.listFiles()
assertNotNull(listFiles) assertNotNull(listFiles)
val children = listFiles!!.sortedWith(compareBy ({ it.isDirectory }, { it.name } )) val children = listFiles!!.sortedWith(compareBy({ it.isDirectory }, { it.name }))
for (child in children) { for (child in children) {
if (child.isDirectory) { if (child.isDirectory) {
p.println(child.name) p.println(child.name)
@@ -37,8 +37,8 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() {
val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old") val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old")
val newClassFiles = compileFileAndGetClasses(testDataPath, testDir, "new") val newClassFiles = compileFileAndGetClasses(testDataPath, testDir, "new")
val oldClassMap = oldClassFiles.toMapBy { it.name } val oldClassMap = oldClassFiles.associateBy { it.name }
val newClassMap = newClassFiles.toMapBy { it.name } val newClassMap = newClassFiles.associateBy { it.name }
val sb = StringBuilder() val sb = StringBuilder()
val p = Printer(sb) val p = Printer(sb)