Return platform independent path in IncrementalCacheImpl::getClassFilePath

Fix ExperimentalIncrementalJpsTestGenerated.PureKotlin.testFunctionBecameInline on Windows.

Original commit: 93eb09a654
This commit is contained in:
Zalim Bashorov
2015-11-18 14:15:12 +03:00
parent 039c310c55
commit 663d0f2e7e
7 changed files with 31 additions and 1 deletions
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.jps.incremental
import com.google.protobuf.MessageLite
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName
import com.intellij.util.io.BooleanDataDescriptor
import com.intellij.util.io.EnumeratorStringDescriptor
import com.intellij.util.io.IOUtil
@@ -137,7 +138,7 @@ public class IncrementalCacheImpl(
}
override fun getClassFilePath(internalClassName: String): String {
return File(outputDir, "$internalClassName.class").canonicalPath
return toSystemIndependentName(File(outputDir, "$internalClassName.class").canonicalPath)
}
public fun saveCacheFormatVersion() {
@@ -347,6 +347,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
doTest(fileName);
}
@TestMetadata("inlinFunctionUsageAdded")
public void testInlinFunctionUsageAdded() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/");
doTest(fileName);
}
@TestMetadata("inlineFunctionRemoved")
public void testInlineFunctionRemoved() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/");
@@ -347,6 +347,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
doTest(fileName);
}
@TestMetadata("inlinFunctionUsageAdded")
public void testInlinFunctionUsageAdded() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/");
doTest(fileName);
}
@TestMetadata("inlineFunctionRemoved")
public void testInlineFunctionRemoved() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/");
@@ -0,0 +1,7 @@
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/UsageKt.class
End of files
Compiling files:
src/usage.kt
End of files
@@ -0,0 +1,5 @@
class A {
inline fun foo(f: () -> Unit) {
f()
}
}
@@ -0,0 +1,2 @@
fun usage() {
}
@@ -0,0 +1,3 @@
fun usage() {
A().foo {}
}