From c2f4ed810c6cf4c6bce07d49ed33fc2c99e32a68 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 9 Dec 2014 19:36:41 +0300 Subject: [PATCH] Fixed incremental compilation, when removing all callables from file. Original commit: 4e702e34f0d225309d27281f2fb7b16c12430a4b --- .../jps/incremental/IncrementalCacheImpl.kt | 11 +++++----- .../build/IncrementalJpsTestGenerated.java | 6 ++++++ .../Usage.java | 5 +++++ .../onlyTopLevelFunctionInFileRemoved/a.kt | 4 ++++ .../onlyTopLevelFunctionInFileRemoved/b.kt | 4 ++++ .../b.kt.new | 2 ++ .../build.log | 21 +++++++++++++++++++ 7 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 2de26c8d59a..2215ebfad89 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -146,7 +146,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } } - public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map): Collection { + public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map): Collection { return packagePartMap.getRemovedPackageParts(sourceFilesToCompileAndFqNames) } @@ -451,7 +451,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC storage.remove(sourceFile.getAbsolutePath()) } - public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { + public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { val result = HashSet() storage.processKeysWithExistingMapping { key -> @@ -463,9 +463,10 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } else { val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() - val currentPackageFqName = compiledSourceFilesToFqName[sourceFile] - if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) { - result.add(packagePartClassName) + if (sourceFile in compiledSourceFilesToFqName) { + if (compiledSourceFilesToFqName[sourceFile] != previousPackageFqName.asString()) { + result.add(packagePartClassName) + } } } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index da301120372..c3ad4afd5b4 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -493,6 +493,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("onlyTopLevelFunctionInFileRemoved") + public void testOnlyTopLevelFunctionInFileRemoved() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/"); + doTest(fileName); + } + @TestMetadata("propertyRenamed") public void testPropertyRenamed() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java new file mode 100644 index 00000000000..d1dcba0d6fa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java @@ -0,0 +1,5 @@ +class Usage { + void usage() { + test.TestPackage.a(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt new file mode 100644 index 00000000000..eeaf99f195c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt @@ -0,0 +1,4 @@ +package test + +fun a() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt new file mode 100644 index 00000000000..783ac74aae8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt @@ -0,0 +1,4 @@ +package test + +fun b() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new new file mode 100644 index 00000000000..a6bea40cf77 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new @@ -0,0 +1,2 @@ +package test + diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log new file mode 100644 index 00000000000..f4c46b3facf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -0,0 +1,21 @@ +Cleaning output files: +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/b.kt +End of files +Compiling files: +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/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files +Compiling files: +src/Usage.java +End of files \ No newline at end of file