diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 2c46a29b403..92823c69b89 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -209,6 +209,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("compilationErrorThenFixedWithPhantomPart3") + public void testCompilationErrorThenFixedWithPhantomPart3() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/"); + doTest(fileName); + } + @TestMetadata("conflictingPlatformDeclarations") public void testConflictingPlatformDeclarations() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log b/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log index 5811eb1266c..4515d41dc9c 100644 --- a/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log +++ b/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class -out/production/module/test/TestPackage$b$*.class +out/production/module/test/A.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log b/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log index dcc343c872e..6a64cdced63 100644 --- a/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log +++ b/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/other/OtherPackage$other$*.class +out/production/module/other/Other.class out/production/module/other/OtherPackage.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class End of files Compiling files: src/a.kt diff --git a/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log b/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log index ec0b0e5da7c..d171334035e 100644 --- a/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log +++ b/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log b/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log index 4cf233bbc00..7f88bf9c5a4 100644 --- a/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log +++ b/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage$foo$*.class +out/production/module/Foo.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log b/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log index 4cf233bbc00..7f88bf9c5a4 100644 --- a/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log +++ b/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage$foo$*.class +out/production/module/Foo.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index d51f6f61402..fdc98eb8730 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module1/test/TestPackage$module1_a$*.class +out/production/module1/test/Module1_a.class out/production/module1/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index 03390944246..ffac776c374 100644 --- a/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -1,15 +1,15 @@ Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt End of files Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 3d42c783058..12e559d1298 100644 --- a/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module1/test/TestPackage$module1_const$*.class +out/production/module1/test/Module1_const.class out/production/module1/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log index 54958ea07a8..3e4fd010efb 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log @@ -1,21 +1,21 @@ Cleaning output files: -out/production/module1/inline/InlinePackage$module1_inline$*.class out/production/module1/inline/InlinePackage.class +out/production/module1/inline/Module1_inline.class End of files Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: -out/production/module1/inline/InlinePackage$module1_inline$*.class -out/production/module1/inline/InlinePackage$module1_other$*.class out/production/module1/inline/InlinePackage.class +out/production/module1/inline/Module1_inline.class +out/production/module1/inline/Module1_other.class End of files Compiling files: module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/usage/UsagePackage$module2_usage$*.class +out/production/module2/usage/Module2_usage.class out/production/module2/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index 54958ea07a8..3e4fd010efb 100644 --- a/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -1,21 +1,21 @@ Cleaning output files: -out/production/module1/inline/InlinePackage$module1_inline$*.class out/production/module1/inline/InlinePackage.class +out/production/module1/inline/Module1_inline.class End of files Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: -out/production/module1/inline/InlinePackage$module1_inline$*.class -out/production/module1/inline/InlinePackage$module1_other$*.class out/production/module1/inline/InlinePackage.class +out/production/module1/inline/Module1_inline.class +out/production/module1/inline/Module1_other.class End of files Compiling files: module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/usage/UsagePackage$module2_usage$*.class +out/production/module2/usage/Module2_usage.class out/production/module2/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index ec0b0e5da7c..d171334035e 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index 490a4ad2f8a..dab8c472205 100644 --- a/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -1,8 +1,8 @@ Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index ec0b0e5da7c..d171334035e 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 4a046b83b59..6733bf955d1 100644 --- a/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -1,29 +1,29 @@ Cleaning output files: -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module1/a/APackage$module1_a$*.class -out/production/module1/a/APackage$module1_other$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_other.class End of files Compiling files: module1/src/module1_a.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt End of files Cleaning output files: -out/production/module3/c/CPackage$module3_c$*.class out/production/module3/c/CPackage.class +out/production/module3/c/Module3_c.class End of files Compiling files: module3/src/module3_c.kt diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index 0bcfc0ab0e0..c5045143b2a 100644 --- a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module3/c/CPackage$module3_c$*.class out/production/module3/c/CPackage.class +out/production/module3/c/Module3_c.class End of files Compiling files: module3/src/module3_c.kt End of files Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log b/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log index 6fabb2be215..4b8f2ce15de 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$bar$*.class +out/production/module/test/Bar.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index 38c3e40467d..3231a7e0e4f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class -out/production/module/test/TestPackage$usage$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/b.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index 38c3e40467d..3231a7e0e4f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class -out/production/module/test/TestPackage$usage$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/b.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index aec0fb80c88..8b44b97716e 100644 --- a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$const$*.class +out/production/module/test/Const.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/TestPackage$const$*.class +out/production/module/test/Const.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 830fd9d2ae7..7d0f02c00a4 100644 --- a/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$other$*.class +out/production/module/test/Other.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index c56d69d0001..0f0bb774f44 100644 --- a/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/a/APackage$a$*$foo$1.class -out/production/module/a/APackage$a$*.class +out/production/module/a/A$foo$1.class +out/production/module/a/A.class out/production/module/a/APackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index eafec833b17..5ea037dc95a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -6,7 +6,7 @@ src/inline.kt End of files Cleaning output files: out/production/module/inline/Klass.class -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/Usage.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index e3cde4f577a..b3ac0aae802 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -4,7 +4,7 @@ End of files Compiling files: End of files Cleaning output files: -out/production/module/test/TestPackage$other$*.class +out/production/module/test/Other.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -16,7 +16,7 @@ Compiling files: src/A.kt End of files Cleaning output files: -out/production/module/test/TestPackage$other$*.class +out/production/module/test/Other.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 22a85136d38..4ab778caaff 100644 --- a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -5,8 +5,8 @@ Compiling files: src/class.kt End of files Cleaning output files: -out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index 65aedde795b..bd1fda0f4ea 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/Usage.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index 1e9444f5d38..24a112c76b4 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -10,7 +10,7 @@ Expecting an expression Cleaning output files: -out/production/module/_DefaultPackage$fun$*.class +out/production/module/Fun.class End of files Compiling files: src/fun.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index a6026278652..b328af8e3a5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/_DefaultPackage$other$*.class +out/production/module/Other.class out/production/module/_DefaultPackage.class End of files Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class End of files Compiling files: src/usage.kt @@ -13,7 +13,7 @@ Expecting an expression Cleaning output files: -out/production/module/_DefaultPackage$fun$*.class +out/production/module/Fun.class End of files Compiling files: src/fun.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index f9cd95a4773..ed7c4295733 100644 --- a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/_DefaultPackage$other$*.class -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Other.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -12,7 +12,19 @@ Expecting an expression Cleaning output files: -out/production/module/_DefaultPackage$fun$*.class +out/production/module/Fun.class +End of files +Compiling files: +src/fun.kt +src/other.kt +src/usage.kt +End of files +Cleaning output files: +out/production/module/Fun.class +out/production/module/Usage.class +out/production/module/_DefaultPackage.class +out/production/module/new/NewPackage.class +out/production/module/new/Other.class End of files Compiling files: src/fun.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log new file mode 100644 index 00000000000..35b980c31f6 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -0,0 +1,29 @@ +Cleaning output files: +out/production/module/B.class +out/production/module/Usage.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/other.kt +src/usage.kt +End of files +COMPILATION FAILED +Expecting an expression + + +Compiling files: +src/other.kt +src/usage.kt +End of files +Cleaning output files: +out/production/module/A.class +out/production/module/Usage.class +out/production/module/_DefaultPackage.class +out/production/module/new/LikePart.class +out/production/module/new/NewPackage.class +End of files +Compiling files: +src/fun.kt +src/likePart.kt +src/usage.kt +End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt new file mode 100644 index 00000000000..3788dbbcbc2 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt @@ -0,0 +1,4 @@ +class A { + fun f() { + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt new file mode 100644 index 00000000000..b6b9ec3ee76 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt @@ -0,0 +1,5 @@ +package new + +fun f() { + +} diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt new file mode 100644 index 00000000000..6633b42e5b8 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt @@ -0,0 +1,5 @@ +class B { + fun f() { + + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1 new file mode 100644 index 00000000000..25a4443267c --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1 @@ -0,0 +1,7 @@ +package new + +class B { + fun f() { + + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt new file mode 100644 index 00000000000..214714c7c0e --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt @@ -0,0 +1,6 @@ +import new.* + +fun main(args: Array) { + A().f() + B().f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1 b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1 new file mode 100644 index 00000000000..5379a61c3e8 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1 @@ -0,0 +1,6 @@ +import new.* + +fun main(args: Array) { + B().f( + A().f( +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2 b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2 new file mode 100644 index 00000000000..0ccf0889261 --- /dev/null +++ b/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2 @@ -0,0 +1,5 @@ +import new.* +fun main(args: Array) { + A().f() + B().f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index da0ddacad97..5613d7fe110 100644 --- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun2$*.class +out/production/module/test/Fun2.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log index 8cdfe7c6de1..659c2dbb504 100644 --- a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$const$*.class +out/production/module/test/Const.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 9e65adcda6c..225764441db 100644 --- a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,7 +1,7 @@ Cleaning output files: +out/production/module/test/Const.class out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class -out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 74e194ec93c..9104d731416 100644 --- a/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage$a$*.class +out/production/module/A.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 4e18829e5c5..0ad6529ee73 100644 --- a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log index f7973c4cece..d65d2dd1b90 100644 --- a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/test/TestPackage$const$*.class +out/production/module/test/Const.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/Usage.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index e7e60e954c6..d2714d00b68 100644 --- a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/Usage.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index 288ef01ba57..a61ed9b58f5 100644 --- a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/bar/BarPackage$c$*.class out/production/module/bar/BarPackage.class -out/production/module/foo/FooPackage$b$*.class +out/production/module/bar/C.class +out/production/module/foo/B.class out/production/module/foo/FooPackage.class End of files Compiling files: @@ -9,9 +9,14 @@ src/b.kt src/c.kt End of files Cleaning output files: -out/production/module/foo/FooPackage$a$*.class +out/production/module/bar/B.class +out/production/module/bar/BarPackage.class +out/production/module/foo/A.class +out/production/module/foo/C.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt +src/b.kt +src/c.kt End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 64909e968ed..397ce32b0a9 100644 --- a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun2$*.class +out/production/module/test/Fun2.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 3e5f9e4f172..39f5f52c58e 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 624837de297..8c8a8c204d6 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/test/TestPackage$a$*.class -out/production/module/test/TestPackage$b$*.class +out/production/module/test/A.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index 31233b36691..496646cc7ba 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log index 38fe179639a..9b19bca18bb 100644 --- a/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*$foo$X.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A$foo$X.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index c7370bec287..10ae55fd3fc 100644 --- a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -1,14 +1,14 @@ Cleaning output files: -out/production/module/b/BPackage$b2$*.class +out/production/module/b/B2.class out/production/module/b/BPackage.class End of files Compiling files: src/a2.kt End of files Cleaning output files: -out/production/module/a/APackage$a1$*.class +out/production/module/a/A1.class out/production/module/a/APackage.class -out/production/module/b/BPackage$b1$*.class +out/production/module/b/B1.class out/production/module/b/BPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log index 830fd9d2ae7..7d0f02c00a4 100644 --- a/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$other$*.class +out/production/module/test/Other.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index 6d8c334b1ef..b66392a883c 100644 --- a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -9,7 +9,7 @@ End of files Cleaning output files: out/production/module/klass/Klass.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index 7cb5f4c6a48..e43a40c534a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$const$*.class +out/production/module/test/Const.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 88792b62b39..1cae0774d42 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -2,7 +2,7 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index c6c913124c1..1d91a602d06 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,14 +1,17 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/newName/B.class +out/production/module/newName/NewNamePackage.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt +src/b.kt End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index df9c0c9e3f5..7b94d3dff7d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,13 +8,13 @@ End of files Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index e6ae4266a50..106bcb3840d 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/other/OtherPackage$other$*.class +out/production/module/other/Other.class out/production/module/other/OtherPackage.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,7 +17,7 @@ End of files Cleaning output files: -out/production/module/other/OtherPackage$other$*.class +out/production/module/other/Other.class out/production/module/other/OtherPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index e9168f05540..3cb42f701db 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,7 +17,7 @@ End of files Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index edacd856bb9..4c1244a1678 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log index 1d578c6afff..d12f6912c76 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log @@ -1,14 +1,14 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/Usage.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index edacd856bb9..4c1244a1678 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index 510015c0156..e265035bf65 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index fc781a99d2d..0b5d2a4a551 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,17 +1,24 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files +Cleaning output files: +out/production/module/test2/A.class +out/production/module/test2/Test2Package.class +End of files +Compiling files: +src/a.kt +End of files Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test2/Test2Package$a$*.class +out/production/module/test2/A.class out/production/module/test2/Test2Package.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index 449c2b5fdd7..14a46382a5e 100644 --- a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class End of files Compiling files: End of files diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index b605f561a83..e96c01ed671 100644 --- a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$prop2$*.class +out/production/module/test/Prop2.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 4b0a58ace9a..55a4a60b263 100644 --- a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt End of files Cleaning output files: -out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 74244f566b2..4148bf5ec4f 100644 --- a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,7 +1,14 @@ Cleaning output files: -out/production/module/foo/FooPackage$a$*.class +out/production/module/foo/A.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt End of files +Cleaning output files: +out/production/module/bar/A.class +out/production/module/bar/BarPackage.class +End of files +Compiling files: +src/a.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index d6788707583..cd0fd87d4e0 100644 --- a/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/outer/nested/NestedPackage$nested$*$main$1.class -out/production/module/outer/nested/NestedPackage$nested$*.class +out/production/module/outer/nested/Nested$main$1.class +out/production/module/outer/nested/Nested.class out/production/module/outer/nested/NestedPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index 560795823cd..bee7dcaa35e 100644 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 4e18829e5c5..0ad6529ee73 100644 --- a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index 314bb5ebad4..8fdaf9f5191 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -6,11 +6,11 @@ src/TheClass.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/_DefaultPackage$usage$*.class +out/production/module/UsageInKotlin.class out/production/module/_DefaultPackage.class End of files Compiling files: -src/usage.kt +src/usageInKotlin.kt End of files Compiling files: src/Usage.java diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt similarity index 100% rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt rename to jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index 392e88adfbd..f0ef53e7b51 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -2,7 +2,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -10,7 +10,7 @@ src/Foo.kt src/usage.kt End of files Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -22,7 +22,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index 7d8a70153b1..83446a96350 100644 --- a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -8,11 +8,11 @@ src/TheClass.java End of files Cleaning output files: out/production/module/Usage.class -out/production/module/_DefaultPackage$usage$*.class +out/production/module/UsageInKotlin.class out/production/module/_DefaultPackage.class End of files Compiling files: -src/usage.kt +src/usageInKotlin.kt End of files Compiling files: src/Usage.java diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt b/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt similarity index 100% rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt rename to jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log index 38e5605bee9..088504b2487 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log @@ -5,7 +5,7 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log index 3a58b62b68c..dcda0f53cf0 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/JavaClass.class -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index ab1f7d8e3de..00ecbd8664a 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -5,9 +5,9 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: -out/production/module/_DefaultPackage$willBeResolvedToOther$*$willBeResolvedToOther$1.class -out/production/module/_DefaultPackage$willBeResolvedToOther$*.class -out/production/module/_DefaultPackage$willBeUnresolved$*.class +out/production/module/WillBeResolvedToOther$willBeResolvedToOther$1.class +out/production/module/WillBeResolvedToOther.class +out/production/module/WillBeUnresolved.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index d46aaad630c..a0a8e61a9e3 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -5,11 +5,11 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: +out/production/module/UsageWithFunctionExpression$usageWithFunctionExpression$a$1.class +out/production/module/UsageWithFunctionExpression.class +out/production/module/UsageWithFunctionLiteral$usageWithFunctionLiteral$1.class +out/production/module/UsageWithFunctionLiteral.class out/production/module/_DefaultPackage$sam$SamInterface$*.class -out/production/module/_DefaultPackage$usageWithFunctionExpression$*$usageWithFunctionExpression$a$1.class -out/production/module/_DefaultPackage$usageWithFunctionExpression$*.class -out/production/module/_DefaultPackage$usageWithFunctionLiteral$*$usageWithFunctionLiteral$1.class -out/production/module/_DefaultPackage$usageWithFunctionLiteral$*.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log index f708754c847..93ab0f079cd 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log @@ -5,11 +5,11 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: +out/production/module/UsageWithFunctionExpression$usageWithFunctionExpression$a$1.class +out/production/module/UsageWithFunctionExpression.class +out/production/module/UsageWithFunctionLiteral$usageWithFunctionLiteral$1.class +out/production/module/UsageWithFunctionLiteral.class out/production/module/_DefaultPackage$sam$SamInterface$*.class -out/production/module/_DefaultPackage$usageWithFunctionExpression$*$usageWithFunctionExpression$a$1.class -out/production/module/_DefaultPackage$usageWithFunctionExpression$*.class -out/production/module/_DefaultPackage$usageWithFunctionLiteral$*$usageWithFunctionLiteral$1.class -out/production/module/_DefaultPackage$usageWithFunctionLiteral$*.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log index 2a0d68e2bd0..f3d10e07203 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,7 +7,7 @@ src/fun.kt End of files Cleaning output files: out/production/module/JavaUsage.class -out/production/module/test/TestPackage$other$*.class +out/production/module/test/Other.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log index 560795823cd..bee7dcaa35e 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index 0433af7364a..1870e29e800 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index 6c968a3fcb7..916d6b88043 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log index 560795823cd..bee7dcaa35e 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index 69cdf6584ff..94afef94da4 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,7 +7,7 @@ src/b.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log index 6fd8bf35799..2b2f8cd5369 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -9,7 +9,7 @@ src/Usage.java End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index d1da86a26ea..8e7f8310761 100644 --- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$prop$*.class +out/production/module/test/Prop.class out/production/module/test/TestPackage.class End of files Compiling files: