Fixed incremental compilation, when removing all callables from file.

Original commit: 4e702e34f0

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<File, String>): Collection<String> {
+    public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map<File, String?>): Collection<String> {
         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<File, String>): Collection<String> {
+        public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map<File, String?>): Collection<String> {
             val result = HashSet<String>()
 
             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 (sourceFile in compiledSourceFilesToFqName) {
-                    if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) {
+                        if (compiledSourceFilesToFqName[sourceFile] != previousPackageFqName.asString()) {
-                        result.add(packagePartClassName)
+                            result.add(packagePartClassName)
+                        }
                     }
                 }
 

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/");

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java

@@ -0,0 +1,5 @@
+class Usage {
+    void usage() {
+        test.TestPackage.a();
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt

@@ -0,0 +1,4 @@
+package test
+
+fun a() {
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt

@@ -0,0 +1,4 @@
+package test
+
+fun b() {
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new

@@ -0,0 +1,2 @@
+package test
+

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