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

Support type aliases in incremental compilation

Browse Source 
#KT-12871 Fixed

Original commit: efe718602a
This commit is contained in:
Denis Zharkov
2016-06-28 13:00:35 +03:00
parent fc54e12f27
commit 993493dcc4
26 changed files with 335 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
+24
View File
@@ -205,6 +205,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
doTest(fileName);
}
@TestMetadata("addMemberTypeAlias")
public void testAddMemberTypeAlias() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/");
doTest(fileName);
}
@TestMetadata("addTopLevelTypeAlias")
public void testAddTopLevelTypeAlias() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/");
doTest(fileName);
}
@TestMetadata("allConstants")
public void testAllConstants() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/");
@@ -839,6 +851,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
doTest(fileName);
}
@TestMetadata("removeMemberTypeAlias")
public void testRemoveMemberTypeAlias() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/");
doTest(fileName);
}
@TestMetadata("removeTopLevelTypeAlias")
public void testRemoveTopLevelTypeAlias() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/");
doTest(fileName);
}
@TestMetadata("renameClass")
public void testRenameClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/");
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+24
View File
@@ -205,6 +205,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
doTest(fileName);
}
@TestMetadata("addMemberTypeAlias")
public void testAddMemberTypeAlias() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/");
doTest(fileName);
}
@TestMetadata("addTopLevelTypeAlias")
public void testAddTopLevelTypeAlias() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/");
doTest(fileName);
}
@TestMetadata("allConstants")
public void testAllConstants() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/");
@@ -839,6 +851,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
doTest(fileName);
}
@TestMetadata("removeMemberTypeAlias")
public void testRemoveMemberTypeAlias() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/");
doTest(fileName);
}
@TestMetadata("removeTopLevelTypeAlias")
public void testRemoveTopLevelTypeAlias() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/");
doTest(fileName);
}
@TestMetadata("renameClass")
public void testRenameClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/");
jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt
+8
View File
@@ -0,0 +1,8 @@
package a
class Outer {
inner class B(x: String)
fun A1(x: Any) = x
fun A2(x: Any) = x
}
jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new
+11
View File
@@ -0,0 +1,11 @@
package a
class Outer {
inner class B(x: String)
typealias A1 = B
private typealias A2 = B
fun A1(x: Any) = x
fun A2(x: Any) = x
}
jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt
+5
View File
@@ -0,0 +1,5 @@
package usage
fun bar() {
a.Outer().A1("")
}
jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt
+5
View File
@@ -0,0 +1,5 @@
package usage
fun baz() {
a.Outer().A2("")
}
jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log
+22
View File
@@ -0,0 +1,22 @@
================ Step #1 =================
Cleaning output files:
out/production/module/a/Outer$B.class
out/production/module/a/Outer.class
End of files
Compiling files:
src/a.kt
End of files
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/A1UsageKt.class
out/production/module/usage/A2UsageKt.class
End of files
Compiling files:
src/a1Usage.kt
src/a2Usage.kt
End of files
Exit code: OK
------------------------------------------
jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/experimental-ic-build.log
+22
View File
@@ -0,0 +1,22 @@
================ Step #1 =================
Cleaning output files:
out/production/module/a/Outer$B.class
out/production/module/a/Outer.class
End of files
Compiling files:
src/a.kt
End of files
Marked as dirty by Kotlin:
src/a1Usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/A1UsageKt.class
End of files
Compiling files:
src/a1Usage.kt
End of files
Exit code: OK
------------------------------------------
jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt
+6
View File
@@ -0,0 +1,6 @@
package a
class B(x: String)
fun A1(x: Any) = x
fun A2(x: Any) = x
jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new
+8
View File
@@ -0,0 +1,8 @@
package a
class B(x: String)
typealias A1 = B
private typealias A2 = B
fun A1(x: Any) = x
fun A2(x: Any) = x
jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt
+5
View File
@@ -0,0 +1,5 @@
package usage
fun bar() {
a.A1("")
}
jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt
+5
View File
@@ -0,0 +1,5 @@
package usage
fun baz() {
a.A2("")
}
jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log
+23
View File
@@ -0,0 +1,23 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/a/AKt.class
out/production/module/a/B.class
End of files
Compiling files:
src/a.kt
End of files
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/A1UsageKt.class
out/production/module/usage/A2UsageKt.class
End of files
Compiling files:
src/a1Usage.kt
src/a2Usage.kt
End of files
Exit code: OK
------------------------------------------
jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/experimental-ic-build.log
+23
View File
@@ -0,0 +1,23 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/a/AKt.class
out/production/module/a/B.class
End of files
Compiling files:
src/a.kt
End of files
Marked as dirty by Kotlin:
src/a1Usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/A1UsageKt.class
End of files
Compiling files:
src/a1Usage.kt
End of files
Exit code: OK
------------------------------------------
jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt
+11
View File
@@ -0,0 +1,11 @@
package a
class Outer {
inner class B(x: String)
typealias A1 = B
private typealias A2 = B
fun A1(x: Any) = x
fun A2(x: Any) = x
}
jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new
+8
View File
@@ -0,0 +1,8 @@
package a
class Outer {
inner class B(x: String)
fun A1(x: Any) = x
fun A2(x: Any) = x
}
jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt
+5
View File
@@ -0,0 +1,5 @@
package usage
fun bar() {
a.Outer().A1("")
}
jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt
+5
View File
@@ -0,0 +1,5 @@
package usage
fun baz() {
a.Outer().A2("")
}
jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log
+22
View File
@@ -0,0 +1,22 @@
================ Step #1 =================
Cleaning output files:
out/production/module/a/Outer$B.class
out/production/module/a/Outer.class
End of files
Compiling files:
src/a.kt
End of files
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/A1UsageKt.class
out/production/module/usage/A2UsageKt.class
End of files
Compiling files:
src/a1Usage.kt
src/a2Usage.kt
End of files
Exit code: OK
------------------------------------------
jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/experimental-ic-build.log
+22
View File
@@ -0,0 +1,22 @@
================ Step #1 =================
Cleaning output files:
out/production/module/a/Outer$B.class
out/production/module/a/Outer.class
End of files
Compiling files:
src/a.kt
End of files
Marked as dirty by Kotlin:
src/a1Usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/A1UsageKt.class
End of files
Compiling files:
src/a1Usage.kt
End of files
Exit code: OK
------------------------------------------
jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt
+9
View File
@@ -0,0 +1,9 @@
package a
class B(x: String)
typealias A1 = B
private typealias A2 = B
fun A1(x: Any) = x
fun A2(x: Any) = x
jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new
+6
View File
@@ -0,0 +1,6 @@
package a
class B(x: String)
fun A1(x: Any) = x
fun A2(x: Any) = x
jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt
+5
View File
@@ -0,0 +1,5 @@
package usage
fun bar() {
a.A1("")
}
jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt
+5
View File
@@ -0,0 +1,5 @@
package usage
fun baz() {
a.A2("")
}
jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log
+23
View File
@@ -0,0 +1,23 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/a/AKt.class
out/production/module/a/B.class
End of files
Compiling files:
src/a.kt
End of files
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/A1UsageKt.class
out/production/module/usage/A2UsageKt.class
End of files
Compiling files:
src/a1Usage.kt
src/a2Usage.kt
End of files
Exit code: OK
------------------------------------------
jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/experimental-ic-build.log
+23
View File
@@ -0,0 +1,23 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/a/AKt.class
out/production/module/a/B.class
End of files
Compiling files:
src/a.kt
End of files
Marked as dirty by Kotlin:
src/a1Usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/A1UsageKt.class
End of files
Compiling files:
src/a1Usage.kt
End of files
Exit code: OK
------------------------------------------