KT-45777: Move classpath diffing to incremental Kotlin compiler (1/2)

This commit only changes the files' paths, the next commit will update
the files' contents.

See the next commit for more context.

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/ChangedJavaSuperClass.java

@@ -0,0 +1,10 @@
+package com.example;
+
+public class ChangedJavaSuperClass {
+
+    public String changedField = "";
+
+    public String changedMethod() {
+        return "";
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/ChangedKotlinSuperClass.kt

@@ -0,0 +1,6 @@
+package com.example;
+
+open class ChangedKotlinSuperClass {
+    val changedProperty = ""
+    fun changedFunction() = ""
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/JavaSubClassOfJavaSuperClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class JavaSubClassOfJavaSuperClass extends ChangedJavaSuperClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/JavaSubClassOfKotlinSuperClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class JavaSubClassOfKotlinSuperClass extends ChangedKotlinSuperClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/KotlinSubClassOfJavaSuperClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+class KotlinSubClassOfJavaSuperClass : ChangedJavaSuperClass()

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/KotlinSubClassOfKotlinSuperClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+class KotlinSubClassOfKotlinSuperClass : ChangedKotlinSuperClass()

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/UnimpactedJavaClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class UnimpactedJavaClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/UnimpactedKotlinClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+class UnimpactedKotlinClass

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/ChangedJavaSuperClass.java

@@ -0,0 +1,9 @@
+package com.example;
+
+public class ChangedJavaSuperClass {
+
+    public int changedField = 0;
+
+    public void changedMethod() {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/ChangedKotlinSuperClass.kt

@@ -0,0 +1,6 @@
+package com.example;
+
+open class ChangedKotlinSuperClass {
+    val changedProperty = 0
+    fun changedFunction() {}
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/JavaSubClassOfJavaSuperClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class JavaSubClassOfJavaSuperClass extends ChangedJavaSuperClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/JavaSubClassOfKotlinSuperClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class JavaSubClassOfKotlinSuperClass extends ChangedKotlinSuperClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/KotlinSubClassOfJavaSuperClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+class KotlinSubClassOfJavaSuperClass : ChangedJavaSuperClass()

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/KotlinSubClassOfKotlinSuperClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+class KotlinSubClassOfKotlinSuperClass : ChangedKotlinSuperClass()

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/UnimpactedJavaClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class UnimpactedJavaClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/UnimpactedKotlinClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+class UnimpactedKotlinClass

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/java/current-classpath/0/com/example/ChangedSuperClass.java

@@ -0,0 +1,10 @@
+package com.example;
+
+public class ChangedSuperClass {
+
+    public String changedField = "";
+
+    public String changedMethod() {
+        return "";
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/java/current-classpath/0/com/example/SubClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class SubClass extends ChangedSuperClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/java/current-classpath/0/com/example/SubSubClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class SubSubClass extends SubClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/java/current-classpath/0/com/example/UnimpactedClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class UnimpactedClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/java/previous-classpath/0/com/example/ChangedSuperClass.java

@@ -0,0 +1,9 @@
+package com.example;
+
+public class ChangedSuperClass {
+
+    public int changedField = 0;
+
+    public void changedMethod() {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/java/previous-classpath/0/com/example/SubClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class SubClass extends ChangedSuperClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/java/previous-classpath/0/com/example/SubSubClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class SubSubClass extends SubClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/java/previous-classpath/0/com/example/UnimpactedClass.java

@@ -0,0 +1,4 @@
+package com.example;
+
+public class UnimpactedClass {
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/kotlin/current-classpath/0/com/example/ChangedSuperClass.kt

@@ -0,0 +1,6 @@
+package com.example;
+
+open class ChangedSuperClass {
+    val changedProperty = ""
+    fun changedFunction() = ""
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/kotlin/current-classpath/0/com/example/SubClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+open class SubClass : ChangedSuperClass()

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/kotlin/current-classpath/0/com/example/SubSubClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+class SubSubClass : SubClass()

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/kotlin/current-classpath/0/com/example/UnimpactedClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+class UnimpactedClass

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/kotlin/previous-classpath/0/com/example/ChangedSuperClass.kt

@@ -0,0 +1,6 @@
+package com.example;
+
+open class ChangedSuperClass {
+    val changedProperty = 0
+    fun changedFunction() {}
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/kotlin/previous-classpath/0/com/example/SubClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+open class SubClass : ChangedSuperClass()

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/kotlin/previous-classpath/0/com/example/SubSubClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+class SubSubClass : SubClass()

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOrJava/src/kotlin/previous-classpath/0/com/example/UnimpactedClass.kt

@@ -0,0 +1,3 @@
+package com.example
+
+class UnimpactedClass

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/java/current-classpath/0/com/example/AddedClass.java

@@ -0,0 +1,9 @@
+package com.example;
+
+public class AddedClass {
+
+    public int someField = 0;
+
+    public void someMethod() {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/java/current-classpath/0/com/example/ModifiedClassChangedMembers.java

@@ -0,0 +1,18 @@
+package com.example;
+
+public class ModifiedClassChangedMembers {
+
+    public int unchangedField = 0;
+    public String modifiedField = "";
+    public int addedField = 0;
+
+    public void unchangedMethod() {
+    }
+
+    public String modifiedMethod() {
+        return "";
+    }
+
+    public void addedMethod() {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/java/current-classpath/0/com/example/ModifiedClassUnchangedMembers.java

@@ -0,0 +1,10 @@
+package com.example;
+
+@Deprecated // Changed annotation
+public class ModifiedClassUnchangedMembers {
+
+    public int unchangedField = 0;
+
+    public void unchangedMethod() {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/java/current-classpath/0/com/example/UnchangedClass.java

@@ -0,0 +1,9 @@
+package com.example;
+
+public class UnchangedClass {
+
+    public int someField = 0;
+
+    public void someMethod() {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/java/previous-classpath/0/com/example/ModifiedClassChangedMembers.java

@@ -0,0 +1,17 @@
+package com.example;
+
+public class ModifiedClassChangedMembers {
+
+    public int unchangedField = 0;
+    public int modifiedField = 0;
+    public int removedField = 0;
+
+    public void unchangedMethod() {
+    }
+
+    public void modifiedMethod() {
+    }
+
+    public void removedMethod() {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/java/previous-classpath/0/com/example/ModifiedClassUnchangedMembers.java

@@ -0,0 +1,9 @@
+package com.example;
+
+public class ModifiedClassUnchangedMembers {
+
+    public int unchangedField = 0;
+
+    public void unchangedMethod() {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/java/previous-classpath/0/com/example/RemovedClass.java

@@ -0,0 +1,9 @@
+package com.example;
+
+public class RemovedClass {
+
+    public int someField = 0;
+
+    public void someMethod() {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/java/previous-classpath/0/com/example/UnchangedClass.java

@@ -0,0 +1,9 @@
+package com.example;
+
+public class UnchangedClass {
+
+    public int someField = 0;
+
+    public void someMethod() {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/current-classpath/0/com/example/AddedClass.kt

@@ -0,0 +1,6 @@
+package com.example
+
+class AddedClass {
+    val someProperty = 0
+    fun someFunction() {}
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/current-classpath/0/com/example/ModifiedClassChangedMembers.kt

@@ -0,0 +1,10 @@
+package com.example
+
+class ModifiedClassChangedMembers {
+    val unchangedProperty = 0
+    val modifiedProperty = ""
+    val addedProperty = 0
+    fun unchangedFunction() {}
+    fun modifiedFunction() = ""
+    fun addedFunction() {}
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/current-classpath/0/com/example/ModifiedClassUnchangedMembers.kt

@@ -0,0 +1,7 @@
+package com.example
+
+@java.lang.Deprecated // Changed annotation
+class ModifiedClassUnchangedMembers {
+    val unchangedProperty = 0
+    fun unchangedFunction() {}
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/current-classpath/0/com/example/UnchangedClass.kt

@@ -0,0 +1,6 @@
+package com.example
+
+class UnchangedClass {
+    val someProperty = 0
+    fun someFunction() {}
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/current-classpath/0/com/example/topLevelDeclarations.kt

@@ -0,0 +1,11 @@
+package com.example
+
+val unchangedTopLevelProperty = 0
+val modifiedTopLevelProperty = ""
+val addedTopLevelProperty = 0
+
+fun unchangedTopLevelFunction() {}
+fun modifiedTopLevelFunction() = ""
+fun addedTopLevelFunction() {}
+
+fun movedTopLevelFunction() {}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/current-classpath/0/com/example/topLevelDeclarations2.kt

@@ -0,0 +1,3 @@
+package com.example
+
+val movedTopLevelProperty = 0

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/previous-classpath/0/com/example/ModifiedClassChangedMembers.kt

@@ -0,0 +1,10 @@
+package com.example
+
+class ModifiedClassChangedMembers {
+    val unchangedProperty = 0
+    val modifiedProperty = 0
+    val removedProperty = 0
+    fun unchangedFunction() {}
+    fun modifiedFunction() {}
+    fun removedFunction() {}
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/previous-classpath/0/com/example/ModifiedClassUnchangedMembers.kt

@@ -0,0 +1,6 @@
+package com.example
+
+class ModifiedClassUnchangedMembers {
+    val unchangedProperty = 0
+    fun unchangedFunction() {}
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/previous-classpath/0/com/example/RemovedClass.kt

@@ -0,0 +1,6 @@
+package com.example
+
+class RemovedClass {
+    val someProperty = 0
+    fun someFunction() {}
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/previous-classpath/0/com/example/UnchangedClass.kt

@@ -0,0 +1,6 @@
+package com.example
+
+class UnchangedClass {
+    val someProperty = 0
+    fun someFunction() {}
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/previous-classpath/0/com/example/topLevelDeclarations.kt

@@ -0,0 +1,10 @@
+package com.example
+
+val unchangedTopLevelProperty = 0
+val modifiedTopLevelProperty = 0
+val removedTopLevelProperty = 0
+val movedTopLevelProperty = 0
+
+fun unchangedTopLevelFunction() {}
+fun modifiedTopLevelFunction() {}
+fun removedTopLevelFunction() {}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testVariousAbiChanges/src/kotlin/previous-classpath/0/com/example/topLevelDeclarations2.kt

@@ -0,0 +1,3 @@
+package com.example
+
+fun movedTopLevelFunction() {}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotTestCommon/expected-snapshot/java/com/example/JavaClassWithNestedClasses$InnerClass.json

@@ -0,0 +1,58 @@
+{
+  "classId": {
+    "packageFqName": {
+      "fqName": {
+        "fqName": "com.example"
+      }
+    },
+    "relativeClassName": {
+      "fqName": {
+        "fqName": "JavaClassWithNestedClasses.InnerClass"
+      }
+    },
+    "local": false
+  },
+  "supertypes": [
+    {
+      "internalName": "java/lang/Object"
+    }
+  ],
+  "classAbiExcludingMembers": {
+    "abiValue": "{\n  \"version\": 52,\n  \"access\": 33,\n  \"name\": \"com/example/JavaClassWithNestedClasses$InnerClass\",\n  \"superName\": \"java/lang/Object\",\n  \"interfaces\": [],\n  \"sourceFile\": \"JavaClassWithNestedClasses.java\",\n  \"innerClasses\": [\n    {\n      \"name\": \"com/example/JavaClassWithNestedClasses$InnerClass\",\n      \"outerName\": \"com/example/JavaClassWithNestedClasses\",\n      \"innerName\": \"InnerClass\",\n      \"access\": 1\n    },\n    {\n      \"name\": \"com/example/JavaClassWithNestedClasses$InnerClass$InnerClassWithinInnerClass\",\n      \"outerName\": \"com/example/JavaClassWithNestedClasses$InnerClass\",\n      \"innerName\": \"InnerClassWithinInnerClass\",\n      \"access\": 1\n    },\n    {\n      \"name\": \"com/example/JavaClassWithNestedClasses$InnerClass$1LocalClassWithinInnerClass\",\n      \"innerName\": \"LocalClassWithinInnerClass\",\n      \"access\": 0\n    }\n  ],\n  \"fields\": [],\n  \"methods\": [],\n  \"api\": 589824\n}",
+    "name": "com/example/JavaClassWithNestedClasses$InnerClass",
+    "abiHash": -5172784707052054073
+  },
+  "fieldsAbi": [
+    {
+      "abiValue": "{\n  \"access\": 1,\n  \"name\": \"publicField\",\n  \"desc\": \"I\",\n  \"api\": 589824\n}",
+      "name": "publicField",
+      "abiHash": -4066101678319939363
+    },
+    {
+      "abiValue": "{\n  \"access\": 4112,\n  \"name\": \"this$0\",\n  \"desc\": \"Lcom/example/JavaClassWithNestedClasses;\",\n  \"api\": 589824\n}",
+      "name": "this$0",
+      "abiHash": 3333476895593072424
+    }
+  ],
+  "methodsAbi": [
+    {
+      "abiValue": "{\n  \"access\": 1,\n  \"name\": \"\\u003cinit\\u003e\",\n  \"desc\": \"(Lcom/example/JavaClassWithNestedClasses;)V\",\n  \"exceptions\": [],\n  \"visibleAnnotableParameterCount\": 0,\n  \"invisibleAnnotableParameterCount\": 0,\n  \"instructions\": {\n    \"size\": 0\n  },\n  \"tryCatchBlocks\": [],\n  \"maxStack\": 0,\n  \"maxLocals\": 0,\n  \"localVariables\": [],\n  \"visited\": false,\n  \"api\": 589824\n}",
+      "name": "\u003cinit\u003e",
+      "abiHash": -4959881636706217659
+    },
+    {
+      "abiValue": "{\n  \"access\": 1,\n  \"name\": \"publicMethod\",\n  \"desc\": \"()V\",\n  \"exceptions\": [],\n  \"visibleAnnotableParameterCount\": 0,\n  \"invisibleAnnotableParameterCount\": 0,\n  \"instructions\": {\n    \"size\": 0\n  },\n  \"tryCatchBlocks\": [],\n  \"maxStack\": 0,\n  \"maxLocals\": 0,\n  \"localVariables\": [],\n  \"visited\": false,\n  \"api\": 589824\n}",
+      "name": "publicMethod",
+      "abiHash": -7202431168536137702
+    },
+    {
+      "abiValue": "{\n  \"access\": 1,\n  \"name\": \"someMethod\",\n  \"desc\": \"()V\",\n  \"exceptions\": [],\n  \"visibleAnnotableParameterCount\": 0,\n  \"invisibleAnnotableParameterCount\": 0,\n  \"instructions\": {\n    \"size\": 0\n  },\n  \"tryCatchBlocks\": [],\n  \"maxStack\": 0,\n  \"maxLocals\": 0,\n  \"localVariables\": [],\n  \"visited\": false,\n  \"api\": 589824\n}",
+      "name": "someMethod",
+      "abiHash": 8928076277544870062
+    }
+  ],
+  "className$delegate": {
+    "initializer": {},
+    "_value": {}
+  }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotTestCommon/expected-snapshot/java/com/example/SimpleJavaClass-protoBased=false.json

@@ -0,0 +1,48 @@
+{
+  "classId": {
+    "packageFqName": {
+      "fqName": {
+        "fqName": "com.example"
+      }
+    },
+    "relativeClassName": {
+      "fqName": {
+        "fqName": "SimpleJavaClass"
+      }
+    },
+    "local": false
+  },
+  "supertypes": [
+    {
+      "internalName": "java/lang/Object"
+    }
+  ],
+  "classAbiExcludingMembers": {
+    "abiValue": "{\n  \"version\": 52,\n  \"access\": 33,\n  \"name\": \"com/example/SimpleJavaClass\",\n  \"superName\": \"java/lang/Object\",\n  \"interfaces\": [],\n  \"sourceFile\": \"SimpleJavaClass.java\",\n  \"innerClasses\": [],\n  \"fields\": [],\n  \"methods\": [],\n  \"api\": 589824\n}",
+    "name": "com/example/SimpleJavaClass",
+    "abiHash": 4897366397927258364
+  },
+  "fieldsAbi": [
+    {
+      "abiValue": "{\n  \"access\": 1,\n  \"name\": \"publicField\",\n  \"desc\": \"I\",\n  \"api\": 589824\n}",
+      "name": "publicField",
+      "abiHash": -4066101678319939363
+    }
+  ],
+  "methodsAbi": [
+    {
+      "abiValue": "{\n  \"access\": 1,\n  \"name\": \"\\u003cinit\\u003e\",\n  \"desc\": \"()V\",\n  \"exceptions\": [],\n  \"visibleAnnotableParameterCount\": 0,\n  \"invisibleAnnotableParameterCount\": 0,\n  \"instructions\": {\n    \"size\": 0\n  },\n  \"tryCatchBlocks\": [],\n  \"maxStack\": 0,\n  \"maxLocals\": 0,\n  \"localVariables\": [],\n  \"visited\": false,\n  \"api\": 589824\n}",
+      "name": "\u003cinit\u003e",
+      "abiHash": 5725188035643409224
+    },
+    {
+      "abiValue": "{\n  \"access\": 1,\n  \"name\": \"publicMethod\",\n  \"desc\": \"()V\",\n  \"exceptions\": [],\n  \"visibleAnnotableParameterCount\": 0,\n  \"invisibleAnnotableParameterCount\": 0,\n  \"instructions\": {\n    \"size\": 0\n  },\n  \"tryCatchBlocks\": [],\n  \"maxStack\": 0,\n  \"maxLocals\": 0,\n  \"localVariables\": [],\n  \"visited\": false,\n  \"api\": 589824\n}",
+      "name": "publicMethod",
+      "abiHash": -7202431168536137702
+    }
+  ],
+  "className$delegate": {
+    "initializer": {},
+    "_value": {}
+  }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotTestCommon/expected-snapshot/kotlin/com/example/SimpleKotlinClass.json

@@ -0,0 +1,45 @@
+{
+  "classInfo": {
+    "classId": {
+      "packageFqName": {
+        "fqName": {
+          "fqName": "com.example"
+        }
+      },
+      "relativeClassName": {
+        "fqName": {
+          "fqName": "SimpleKotlinClass"
+        }
+      },
+      "local": false
+    },
+    "classKind": "CLASS",
+    "classHeaderData": [
+      "\u0000\u001a\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\b\n\u0002\b\u0004\n\u0002\u0010\u0002\n\u0000\u0018\u00002\u00020\u0001B\u0005¢\u0006\u0002\u0010\u0002J\b\u0010\b\u001a\u00020\tH\u0002J\u0006\u0010\n\u001a\u00020\tR\u000e\u0010\u0003\u001a\u00020\u0004X‚D¢\u0006\u0002\n\u0000R\u0014\u0010\u0005\u001a\u00020\u0004X†D¢\u0006\b\n\u0000\u001a\u0004\b\u0006\u0010\u0007"
+    ],
+    "classHeaderStrings": [
+      "Lcom/example/SimpleKotlinClass;",
+      "",
+      "()V",
+      "privateProperty",
+      "",
+      "publicProperty",
+      "getPublicProperty",
+      "()I",
+      "privateFunction",
+      "",
+      "publicFunction"
+    ],
+    "constantsMap": {},
+    "inlineFunctionsMap": {},
+    "className$delegate": {
+      "initializer": {},
+      "_value": {}
+    }
+  },
+  "supertypes": [
+    {
+      "internalName": "kotlin/Any"
+    }
+  ]
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotTestCommon/src/java/com/example/JavaClassWithNestedClasses.java

@@ -0,0 +1,55 @@
+package com.example;
+
+public class JavaClassWithNestedClasses {
+
+    public class InnerClass {
+
+        public int publicField = 0;
+
+        private int privateField = 0;
+
+        public void publicMethod() {
+            System.out.println("I'm in a public method");
+        }
+
+        private void privateMethod() {
+            System.out.println("I'm in a private method");
+        }
+
+        public class InnerClassWithinInnerClass {
+        }
+
+        public void someMethod() {
+
+            class LocalClassWithinInnerClass {
+            }
+        }
+    }
+
+    public static class StaticNestedClass {
+    }
+
+    public void someMethod() {
+
+        class LocalClass {
+
+            class InnerClassWithinLocalClass {
+            }
+        }
+
+        Runnable objectOfAnonymousLocalClass = new Runnable() {
+            @Override
+            public void run() {
+            }
+        };
+    }
+
+    private Runnable objectOfAnonymousNonLocalClass = new Runnable() {
+        @Override
+        public void run() {
+        }
+    };
+
+    public class InnerClassWith$Sign {
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotTestCommon/src/java/com/example/SimpleJavaClass.java

@@ -0,0 +1,16 @@
+package com.example;
+
+public class SimpleJavaClass {
+
+    public int publicField = 0;
+
+    private int privateField = 0;
+
+    public void publicMethod() {
+        System.out.println("I'm in a public method");
+    }
+
+    private void privateMethod() {
+        System.out.println("I'm in a private method");
+    }
+}

compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotTestCommon/src/kotlin/com/example/SimpleKotlinClass.kt

@@ -0,0 +1,16 @@
+package com.example
+
+class SimpleKotlinClass {
+
+    val publicProperty: Int = 0
+
+    private val privateProperty: Int = 0
+
+    fun publicFunction() {
+        println("I'm in a public function")
+    }
+
+    private fun privateFunction() {
+        println("I'm in a private function")
+    }
+}