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

Invalidate usages of removed classes before round

Browse Source 
#KT-23165 fixed
This commit is contained in:
Alexey Tsvetkov
2018-03-27 16:29:09 +03:00
parent 8cd0f13f2b
commit 3eb968807e
43 changed files with 610 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
open class A {
}
open class X {
open fun f() {}
}
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt.new
Vendored
+6
View File
@@ -0,0 +1,6 @@
open class A {
open class X {
open fun g() {}
}
}
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/B.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
open class B : A() {
open inner class Y : X()
}
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
open class C : B() {
open inner class Z : Y() {
override fun f() {}
}
}
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt.new
Vendored
+5
View File
@@ -0,0 +1,5 @@
open class C : B() {
open inner class Z : Y() {
override fun g() {}
}
}
jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log
Vendored
+21
View File
@@ -0,0 +1,21 @@
================ Step #1 =================
Marked as dirty by Kotlin:
src/A.kt
src/B.kt
src/C.kt
Cleaning output files:
out/production/module/A.class
out/production/module/B$Y.class
out/production/module/B.class
out/production/module/C$Z.class
out/production/module/C.class
out/production/module/X.class
End of files
Compiling files:
src/A.kt
src/B.kt
src/C.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log
Vendored
+22 -21
View File
@@ -3,16 +3,35 @@
Cleaning output files:
out/production/module/foo/A.class
End of files
Marked as dirty by Kotlin:
src/B.kt
src/C.kt
src/createA.kt
src/createB.kt
src/createC.kt
src/useAfoo.kt
src/useBbar.kt
src/useCbaz.kt
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/B.class
out/production/module/foo/C.class
out/production/module/use/CreateAKt.class
out/production/module/use/CreateBKt.class
out/production/module/use/CreateCKt.class
out/production/module/use/UseAfooKt.class
out/production/module/use/UseBbarKt.class
out/production/module/use/UseCbazKt.class
End of files
Compiling files:
src/B.kt
src/C.kt
src/createA.kt
src/createB.kt
src/createC.kt
src/useAfoo.kt
src/useBbar.kt
src/useCbaz.kt
End of files
Exit code: ABORT
------------------------------------------
@@ -24,30 +43,12 @@ Unresolved reference: A
Compiling files:
src/B.kt
src/C.kt
src/createA.kt
src/createB.kt
src/createC.kt
src/funA.kt
src/useAfoo.kt
End of files
Marked as dirty by Kotlin:
src/C.kt
src/createB.kt
src/createC.kt
src/useBbar.kt
src/useCbaz.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/C.class
out/production/module/use/CreateBKt.class
out/production/module/use/CreateCKt.class
out/production/module/use/UseBbarKt.class
out/production/module/use/UseCbazKt.class
End of files
Compiling files:
src/C.kt
src/createB.kt
src/createC.kt
src/useBbar.kt
src/useCbaz.kt
End of files
jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log
Vendored
+12
View File
@@ -3,16 +3,26 @@
Cleaning output files:
out/production/module/foo/A.class
End of files
Marked as dirty by Kotlin:
src/B.kt
src/createA.kt
src/createB.kt
src/useAfoo.kt
src/useBbar.kt
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/B.class
out/production/module/use/CreateAKt.class
out/production/module/use/CreateBKt.class
out/production/module/use/UseAfooKt.class
out/production/module/use/UseBbarKt.class
End of files
Compiling files:
src/B.kt
src/createA.kt
src/createB.kt
src/useAfoo.kt
src/useBbar.kt
End of files
Exit code: ABORT
------------------------------------------
@@ -26,7 +36,9 @@ Compiling files:
src/A.kt
src/B.kt
src/createA.kt
src/createB.kt
src/useAfoo.kt
src/useBbar.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log
Vendored
+13 -16
View File
@@ -1,28 +1,19 @@
================ Step #1 =================
Cleaning output files:
out/production/module/A$Companion.class
out/production/module/A.class
End of files
Compiling files:
src/A.kt
End of files
Marked as dirty by Kotlin:
src/companionExtension.kt
src/companionReferenceExplicit.kt
src/companionReferenceImplicit.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/A$Companion.class
out/production/module/A.class
out/production/module/CompanionExtensionKt.class
out/production/module/CompanionReferenceExplicitKt.class
out/production/module/CompanionReferenceImplicitKt.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/A.kt
src/companionExtension.kt
src/companionReferenceExplicit.kt
src/companionReferenceImplicit.kt
End of files
Exit code: ABORT
------------------------------------------
@@ -32,14 +23,20 @@ Unresolved reference: Companion
================ Step #2 =================
Cleaning output files:
out/production/module/A$AA.class
out/production/module/A.class
End of files
Compiling files:
src/A.kt
src/companionExtension.kt
src/companionReferenceExplicit.kt
End of files
Marked as dirty by Kotlin:
src/companionReferenceImplicit.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/CompanionReferenceImplicitKt.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/companionReferenceImplicit.kt
End of files
Exit code: OK
jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/gradle-build.log
Vendored
-22
View File
@@ -1,22 +0,0 @@
================ Step #1 =================
Compiling files:
src/A.kt
src/companionExtension.kt
src/companionReferenceExplicit.kt
src/companionReferenceImplicit.kt
End of files
Exit code: ABORT
------------------------------------------
COMPILATION FAILED
Unresolved reference: Companion
Unresolved reference: Companion
================ Step #2 =================
Compiling files:
src/companionExtension.kt
src/companionReferenceExplicit.kt
src/companionReferenceImplicit.kt
End of files
Exit code: OK
jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/js-build.log
Vendored
+20
View File
@@ -0,0 +1,20 @@
================ Step #1 =================
Compiling files:
src/Enum.kt
src/use.kt
End of files
Exit code: ABORT
------------------------------------------
COMPILATION FAILED
Unresolved reference: C
================ Step #2 =================
Compiling files:
src/Enum.kt
src/getRandomEnumEntry.kt
src/use.kt
src/useEnumImplicitly.kt
End of files
Exit code: OK
jps-plugin/testData/incremental/multiModule/classRemoved/build.log
Vendored
+11 -13
View File
@@ -7,16 +7,26 @@ Cleaning output files:
out/production/module2/foo/A.class
End of files
Building module2
Marked as dirty by Kotlin:
module2/src/B.kt
module2/src/createA.kt
module2/src/createB.kt
module2/src/useAfoo.kt
module2/src/useBbar.kt
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/B.class
out/production/module2/use/CreateAKt.class
out/production/module2/use/CreateBKt.class
out/production/module2/use/UseAfooKt.class
out/production/module2/use/UseBbarKt.class
End of files
Compiling files:
module2/src/B.kt
module2/src/createA.kt
module2/src/createB.kt
module2/src/useAfoo.kt
module2/src/useBbar.kt
End of files
Exit code: ABORT
------------------------------------------
@@ -32,20 +42,8 @@ Building module2
Compiling files:
module2/src/B.kt
module2/src/createA.kt
module2/src/createB.kt
module2/src/useAfoo.kt
End of files
Marked as dirty by Kotlin:
module2/src/createB.kt
module2/src/useBbar.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/use/CreateBKt.class
out/production/module2/use/UseBbarKt.class
End of files
Compiling files:
module2/src/createB.kt
module2/src/useBbar.kt
End of files
Exit code: OK
jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log
Vendored
+2
View File
@@ -17,6 +17,8 @@ Cleaning output files:
out/production/module2/b/BKt.class
End of files
Building module2
Marked as dirty by Kotlin:
module2/src/useClassB.kt
Cleaning output files:
out/production/module2/usage/UseClassBKt.class
out/production/module2/usage/UseFunBKt.class
jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log
Vendored
+2
View File
@@ -1,6 +1,8 @@
================ Step #1 =================
Building module1
Marked as dirty by Kotlin:
module1/src/a.kt
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/a/A.class
jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log
Vendored
+3
View File
@@ -1,5 +1,8 @@
================ Step #1 =================
Marked as dirty by Kotlin:
src/other.kt
src/usage.kt
Cleaning output files:
out/production/module/B.class
out/production/module/META-INF/module.kotlin_module
jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log
Vendored
+2
View File
@@ -5,6 +5,8 @@ Cleaning output files:
out/production/module/foo/AKt.class
out/production/module/foo/Foo.class
End of files
Marked as dirty by Kotlin:
src/useClass.kt
Cleaning output files:
out/production/module/baz/UseClassKt.class
out/production/module/baz/UseFunKt.class
jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log
Vendored
+3 -12
View File
@@ -1,12 +1,5 @@
================ Step #1 =================
Cleaning output files:
out/production/module/foo/A$Companion.class
out/production/module/foo/A.class
End of files
Compiling files:
src/A.kt
End of files
Marked as dirty by Kotlin:
src/getACompanion.kt
src/getACompanionShort.kt
@@ -14,10 +7,10 @@ Marked as dirty by Kotlin:
src/useACompanionShortImplicitly.kt
src/useAbarWithImplicitReceiver.kt
src/useAfooWithImplicitReceiver.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A$Companion.class
out/production/module/foo/A.class
out/production/module/use/GetACompanionKt.class
out/production/module/use/GetACompanionShortKt.class
out/production/module/use/UseACompanionImplicitlyKt.class
@@ -26,6 +19,7 @@ Cleaning output files:
out/production/module/use/UseAfooWithImplicitReceiverKt.class
End of files
Compiling files:
src/A.kt
src/getACompanion.kt
src/getACompanionShort.kt
src/useACompanionImplicitly.kt
@@ -41,9 +35,6 @@ Classifier 'A' does not have a companion object, and thus must be initialized he
================ Step #2 =================
Cleaning output files:
out/production/module/foo/A.class
End of files
Compiling files:
src/A.kt
src/getACompanion.kt
jps-plugin/testData/incremental/pureKotlin/removeClass/build.log
Vendored
+3 -9
View File
@@ -3,23 +3,17 @@
Cleaning output files:
out/production/module/foo/A.class
End of files
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/use/UseAKt.class
End of files
Compiling files:
src/useA.kt
End of files
Marked as dirty by Kotlin:
src/funA.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
src/useA.kt
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/FunAKt.class
out/production/module/use/UseAKt.class
End of files
Compiling files:
src/funA.kt
src/useA.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log
Vendored
+5 -11
View File
@@ -3,23 +3,17 @@
Cleaning output files:
out/production/module/A.class
End of files
Marked as dirty by Kotlin:
src/funA.kt
src/useA.kt
Cleaning output files:
out/production/module/FunAKt.class
out/production/module/META-INF/module.kotlin_module
out/production/module/UseAKt.class
End of files
Compiling files:
src/funA.kt
src/useA.kt
End of files
Marked as dirty by Kotlin:
src/funA.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/FunAKt.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/funA.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/renameClass/build.log
Vendored
+9 -6
View File
@@ -1,26 +1,29 @@
================ Step #1 =================
Marked as dirty by Kotlin:
src/A.kt
src/funs.kt
src/useA.kt
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
out/production/module/foo/FunsKt.class
out/production/module/use/UseAKt.class
End of files
Compiling files:
src/A.kt
End of files
Marked as dirty by Kotlin:
src/funs.kt
src/useA.kt
End of files
Marked as dirty by Kotlin:
src/useB.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/FunsKt.class
out/production/module/use/UseAKt.class
out/production/module/use/UseBKt.class
End of files
Compiling files:
src/funs.kt
src/useA.kt
src/useB.kt
End of files
Exit code: OK
jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log
Vendored
+2
View File
@@ -19,6 +19,8 @@ Exit code: OK
Cleaning output files:
out/production/module/Foo.class
End of files
Marked as dirty by Kotlin:
src/usage.kt
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/UsageKt.class
jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
Vendored
+2
View File
@@ -3,6 +3,8 @@
Cleaning output files:
out/production/module/TheClass.class
End of files
Marked as dirty by Kotlin:
src/usageInKotlin.kt
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/Usage.class
jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log
Vendored
+13 -13
View File
@@ -4,22 +4,34 @@ Cleaning output files:
out/production/module/A$Companion.class
out/production/module/A.class
End of files
Marked as dirty by Kotlin:
src/AChild.kt
src/getA.kt
src/getAChild.kt
src/useF.kt
src/useG.kt
src/useH.kt
src/useJ.kt
Cleaning output files:
out/production/module/AChild.class
out/production/module/GetAChildKt.class
out/production/module/GetAKt.class
out/production/module/META-INF/module.kotlin_module
out/production/module/UseFKt.class
out/production/module/UseGKt.class
out/production/module/UseHKt.class
out/production/module/UseJKt.class
End of files
Compiling files:
src/AChild.kt
src/APartF.kt
src/APartG.kt
src/getA.kt
src/getAChild.kt
src/useF.kt
src/useG.kt
src/useH.kt
src/useJ.kt
End of files
Exit code: ABORT
------------------------------------------
@@ -35,21 +47,9 @@ Compiling files:
src/AChild.kt
src/APartF.kt
src/APartG.kt
src/getAChild.kt
src/useF.kt
src/useG.kt
End of files
Marked as dirty by Kotlin:
src/getAChild.kt
src/useJ.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/GetAChildKt.class
out/production/module/META-INF/module.kotlin_module
out/production/module/UseJKt.class
End of files
Compiling files:
src/getAChild.kt
src/useJ.kt
End of files
Exit code: OK
jps-plugin/testData/incremental/withJava/other/classToPackageFacade/gradle-build.log
Vendored
-32
View File
@@ -1,32 +0,0 @@
================ Step #1 =================
Compiling files:
src/AChild.kt
src/APartF.kt
src/APartG.kt
src/getA.kt
src/getAChild.kt
src/useF.kt
src/useG.kt
src/useH.kt
src/useJ.kt
End of files
Exit code: ABORT
------------------------------------------
COMPILATION FAILED
Unresolved reference: A
Unresolved reference: A
Unresolved reference: A
Unresolved reference: A
================ Step #2 =================
Compiling files:
src/AChild.kt
src/getAChild.kt
src/useF.kt
src/useG.kt
src/useJ.kt
End of files
Exit code: OK