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

Include package part name to top level closure names

Browse Source 
#KT-4234 Fixed
 #KT-4496 Fixed

Original commit: c30aa7db84
This commit is contained in:
Alexander Udalov
2014-09-19 19:27:22 +04:00
parent 9c8ee4eae6
commit 1a02eb4c6c
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt
+9 -6
View File
@@ -33,6 +33,7 @@ import kotlin.test.fail
import java.util.HashMap import java.util.HashMap
import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jet.utils.keysToMap
import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.BuildMessage
import java.util.regex.Pattern
public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
private var testDataDir: File by Delegates.notNull() private var testDataDir: File by Delegates.notNull()
@@ -239,19 +240,21 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
override fun isEnabled(): Boolean = true override fun isEnabled(): Boolean = true
override fun logLine(message: String?) { override fun logLine(message: String?) {
fun String.replaceHashWithStar(): String { fun String.replaceHashWithStar(): String {
if (this contains "Package$") { val matcher = STRIP_PACKAGE_PART_HASH_PATTERN.matcher(this)
val lastDollar = this.lastIndexOf('$') if (matcher.find()) {
if (lastDollar != -1 && substring(lastDollar + 1).matches("[0-9a-f]{1,8}\\.class")) { return matcher.replaceAll("\\$*")
return substring(0, lastDollar) + "$*.class"
}
} }
return this return this
} }
logBuf.append(message!!.trimLeading(rootPath + "/").replaceHashWithStar()).append('\n') logBuf.append(message!!.trimLeading(rootPath + "/").replaceHashWithStar()).append('\n')
} }
class object {
// We suspect sequences of several consecutive hexadecimal digits to be a package part hash code
val STRIP_PACKAGE_PART_HASH_PATTERN = Pattern.compile("\\$([0-9a-f]{5,8})")
}
} }
private abstract class Modification(val path: String) { private abstract class Modification(val path: String) {
jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log
+2 -2
View File
@@ -1,6 +1,6 @@
Cleaning output files: Cleaning output files:
out/production/module/outer/nested/NestedPackage$main$1.class out/production/module/outer/nested/NestedPackage$nested$*$main$1.class
out/production/module/outer/nested/NestedPackage-nested-*.class out/production/module/outer/nested/NestedPackage$nested$*.class
out/production/module/outer/nested/NestedPackage.class out/production/module/outer/nested/NestedPackage.class
End of files End of files
Compiling files: Compiling files: